From 92f2177d06cc67b2055bac0331a85780a086df0b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:51:47 +0800
Subject: [PATCH] feat(order): 优化订单管理功能并增加设备绑定支持 - 修改生产日期字段支持清除和显示默认值 - 在标准库中增加设备绑定功能,支持模板与设备关联 - 新增价格字段用于检验项目定价管理 - 增强模板绑定界面,支持多选和设备分配操作

---
 src/views/business/productOrder/components/addOrder.vue |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index f70fb79..7376ef4 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -126,7 +126,7 @@
             <el-col :span="6">
               <el-form-item label="鐢熶骇鏃ユ湡">
                 <el-date-picker v-model="addObj.productionDate" type="date" value-format="yyyy-MM-dd"
-                                :disabled="active>1" size="small"/>
+                                :disabled="active>1" clearable placeholder="涓嶉�夋嫨鏃舵姤鍛婃樉绀�/" size="small"/>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -853,6 +853,8 @@
         quarterItemId: '',
         sampleView: '', // 鏍峰搧鍚嶇О锛堟姤鍛婂睍绀哄瓧娈碉級
         sampleViewEn: '', // 鏍峰搧鍚嶇О鑻辨枃锛堟姤鍛婂睍绀哄瓧娈碉級
+        productionDate: null,
+        sampleDate: null,
       },
       addObjRules: { // 琛ㄥ崟鏍¢獙瑙勫垯
         orderType: [
@@ -1567,9 +1569,15 @@
     },
     saveData(sampleList) {
       this.saveLoad = true
+      const insOrder = {
+        ...this.addObj,
+        productionDate: this.addObj.productionDate === '/' || !this.addObj.productionDate
+          ? null : this.addObj.productionDate,
+        typeSource: -1,
+      }
       if (this.tabIndex == 4 && this.active == 2) {
         // 閫�鍥炲悗鎻愪氦
-        updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
+        updateInsOrder({insOrder, sampleProduct: sampleList}).then(res => {
           this.saveLoad = false
           this.$message.success('宸叉彁浜�')
           this.bsm3Dia = false;
@@ -1579,7 +1587,7 @@
         })
       } else {
         // 甯歌鎻愪氦
-        const newJuOrder = {...this.addObj, typeSource: -1}
+        const newJuOrder = {...insOrder}
         delete newJuOrder.temperature
         delete newJuOrder.humidity
         const payload = this.addObj.standardTreeId
@@ -1589,7 +1597,7 @@
             sampleCode: this.sampleCode,
             templateList: this.boundTemplateList.map((item, index) => ({templateId: item.templateId, sort: index}))
           }
-          : {insOrder: {...this.addObj, typeSource: -1}, sampleList: sampleList}
+          : {insOrder, sampleList: sampleList}
         addInsOrder(payload).then(res => {
           this.saveLoad = false
           this.$message.success('宸叉彁浜�')

--
Gitblit v1.9.3