From 3c6724b5f2b92dc8454b0de8c17a31fd938c3767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Fri, 7 Mar 2025 09:10:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E5=90=8C=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bst/order/edit/components/orderProdList.vue | 3 +++
 src/views/bst/order/edit/edit.vue                     | 2 +-
 src/views/bst/order/view/view.vue                     | 2 +-
 src/views/bst/orderProd/components/ProdTable.vue      | 1 +
 src/views/bst/orderProd/index.vue                     | 8 ++++++++
 src/views/bst/prodProcess/index.vue                   | 1 -
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/bst/order/edit/components/orderProdList.vue b/src/views/bst/order/edit/components/orderProdList.vue
index 804afcd..a14b515 100644
--- a/src/views/bst/order/edit/components/orderProdList.vue
+++ b/src/views/bst/order/edit/components/orderProdList.vue
@@ -29,6 +29,9 @@
       <table-form-col label="加工商" prop-prefix="prodList" prop="workName" :rules="rules.workName" >
         <el-input slot-scope="d" v-if="d.row.workType === ProdWorkType.BUY" v-model="d.row.workName" placeholder="请输入加工商"/>
       </table-form-col>
+      <table-form-col label="合同单号" prop-prefix="prodList" prop="contractNo" :rules="rules.contractNo" >
+        <el-input slot-scope="d" v-model="d.row.contractNo" placeholder="请输入合同单号"/>
+      </table-form-col>
       <table-form-col label="序号" prop-prefix="prodList" prop="no" :rules="rules.no" width="50" >
         <el-input slot-scope="d" v-model="d.row.no" placeholder="请输入序号"/>
       </table-form-col>
diff --git a/src/views/bst/order/edit/edit.vue b/src/views/bst/order/edit/edit.vue
index 7a19526..5467ec9 100644
--- a/src/views/bst/order/edit/edit.vue
+++ b/src/views/bst/order/edit/edit.vue
@@ -139,7 +139,7 @@ export default {
   methods: {
     // 下载导入模板
     downloadTemplate() {
-      window.open('https://api.ccttiot.com/伟旺-生产订单导入模板-1740733089263.xlsx', '_blank');
+      window.open('https://api.ccttiot.com/伟旺-生产订单导入模板-1741308962476.xlsx', '_blank');
     },
     handleImportSuccess(data) {
       let head = data.head;
diff --git a/src/views/bst/order/view/view.vue b/src/views/bst/order/view/view.vue
index d13d53d..ee7f8fc 100644
--- a/src/views/bst/order/view/view.vue
+++ b/src/views/bst/order/view/view.vue
@@ -84,7 +84,7 @@
               </el-col>
               <el-col :span="12" class="stat-item">
                 <div class="stat-label">未完成数</div>
-                <div class="stat-value uncompleted">{{ detail.totalNum - detail.reportNum  | dv }}</div>
+                <div class="stat-value uncompleted">{{ detail.totalNum - detail.reportNum - detail.num  | dv }}</div>
               </el-col>
             </el-row>
           </div>
diff --git a/src/views/bst/orderProd/components/ProdTable.vue b/src/views/bst/orderProd/components/ProdTable.vue
index aa17238..6ba79b9 100644
--- a/src/views/bst/orderProd/components/ProdTable.vue
+++ b/src/views/bst/orderProd/components/ProdTable.vue
@@ -95,6 +95,7 @@ export default {
         {key: 'picture', visible: true, label: '图片', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"},
         {key: 'name', visible: true, label: '产品名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'workType', visible: true, label: '加工商', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'contractNo', visible: true, label: '合同单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'materialNo', visible: true, label: '物料编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
         {key: 'isEnd', visible: true, label: '成品', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
diff --git a/src/views/bst/orderProd/index.vue b/src/views/bst/orderProd/index.vue
index 195de74..4b8cb13 100644
--- a/src/views/bst/orderProd/index.vue
+++ b/src/views/bst/orderProd/index.vue
@@ -19,6 +19,14 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="合同单号" prop="contractNo" v-if="isShow('contractNo')">
+        <el-input
+          v-model="queryParams.contractNo"
+          placeholder="请输入合同单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="是否成品" prop="isEnd" v-if="isShow('isEnd')">
         <el-radio-group v-model="queryParams.isEnd" @change="handleQuery">
           <el-radio :label="null">全部</el-radio>
diff --git a/src/views/bst/prodProcess/index.vue b/src/views/bst/prodProcess/index.vue
index b56cfee..33941e7 100644
--- a/src/views/bst/prodProcess/index.vue
+++ b/src/views/bst/prodProcess/index.vue
@@ -128,7 +128,6 @@
             :sum="sum"
             @view="handleView"
             @selection-change="handleSelectionChange"
-            @sort-change="onSortChange"
           />
         </template>
       </el-table-column>