From 61a4363b9b270c230bdd3b719d0d960c81a0de53 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 15 Mar 2024 09:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=BD=AD=E5=87=BA=E5=BA=93=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                             |  8 ++-----
 src/views/basic/destiny/skProject.vue       |  1 +
 src/views/thirdSys/invOrder/thrInvOrder.vue | 24 ++++++++++++++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.env.production b/.env.production
index f6b8c4df..b4b4d009 100644
--- a/.env.production
+++ b/.env.production
@@ -6,12 +6,6 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
 
-
-#林纪裕cd
-# VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
-# VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
-
-
 # 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/'
 # 吴雨泽
@@ -76,6 +70,8 @@ VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 # 测试NIGINX
 # VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/'
 
+# VUE_APP_BASE_API = 'http://192.168.0.45:9150/UDI_WMS_MC/'
+
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
diff --git a/src/views/basic/destiny/skProject.vue b/src/views/basic/destiny/skProject.vue
index 0cfe2b93..8278ebfa 100644
--- a/src/views/basic/destiny/skProject.vue
+++ b/src/views/basic/destiny/skProject.vue
@@ -31,6 +31,7 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="项目编码" prop="code" width="140"></el-table-column>
         <el-table-column label="项目名称" prop="name" width="160"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
         <el-table-column label="备注" prop="remark" width="180"></el-table-column>
         <!--        <el-table-column label="创建人" prop="createByName" width="140"></el-table-column>-->
         <el-table-column label="更新时间" prop="createTime" width="160"></el-table-column>
diff --git a/src/views/thirdSys/invOrder/thrInvOrder.vue b/src/views/thirdSys/invOrder/thrInvOrder.vue
index d4cf088c..9f993416 100644
--- a/src/views/thirdSys/invOrder/thrInvOrder.vue
+++ b/src/views/thirdSys/invOrder/thrInvOrder.vue
@@ -166,6 +166,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <pagination
+        v-show="subTotal>0"
+        :total="subTotal"
+        :page.sync="subFilterQuery.page"
+        :limit.sync="subFilterQuery.limit"
+        @pagination="getSubList"
+      />
     </el-card>
 
     <el-dialog
@@ -219,8 +226,14 @@ export default {
         limit: 10,
         // corpName: null,
       },
+      subFilterQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10,
+      },
       thrInvOrderGenerateVisible: false,
       total: 0,
+      subTotal: 0,
       thirdSys: [],
       thirdSysDetail: null,
       busTypes: [],
@@ -323,11 +336,17 @@ export default {
     handleDetail(row) {
       if (row == null) return;
       this.jumpSkProject = row.skProject;
-      let query = {orderIdFk: row.billNo};
-      getThrInvOrderDetails(query)
+      this.subFilterQuery.orderIdFk = row.billNo;
+      this.getSubList()
+    },
+
+
+    getSubList() {
+      getThrInvOrderDetails(this.subFilterQuery)
         .then((response) => {
           if (response.code == 20000) {
             this.detailList = response.data.list || [];
+            this.subTotal = response.data.total
           } else {
             this.$message.error(response.message);
           }
@@ -336,7 +355,6 @@ export default {
         .catch(() => {
           this.loading = false;
         });
-
     },
     generateBill(row) {
       this.thisData = row;