From 28c36a0fa33955174d87510353ff06cbecaa7a89 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 03 十一月 2026 18:08:18 +0800
Subject: [PATCH] 成品下单支持批量下单,检验委托单按批次合并展示/编辑/删除/导出

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

diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index aeae70a..1895bc9 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -225,6 +225,34 @@
             </el-col>
           </el-row>
         </el-form>
+        <div v-if="batchOrderMode" class="batch-sample">
+          <div class="batch-sample__header">
+            <div>
+              <div class="batch-sample__title">鎵归噺鏍峰搧</div>
+              <div class="batch-sample__tip">鍏堝湪涓婃柟濉啓涓�涓牱鍝佺殑妫�娴嬩緷鎹�佹牱鍝佸悕绉般�佹牱鍝佺紪鍙枫�佹牱鍝佹暟閲忋�佹牱鍝佸瑙傦紝鐐瑰嚮鈥滄坊鍔犳牱鍝佲�濆姞鍏ュ垪琛紱鎻愪氦鍚庢瘡涓牱鍝佺敓鎴愪竴寮犲鎵樺崟锛屾楠屽鎵樺崟涓悎骞朵负涓�寮犲鎵樹功銆�</div>
+            </div>
+            <el-button type="primary" plain size="small" @click="addBatchSample">娣诲姞鏍峰搧</el-button>
+          </div>
+          <el-table :data="batchSampleList" size="small" border class="batch-sample__table"
+                    empty-text="鏆傛湭娣诲姞鏍峰搧銆傛湭娣诲姞鏃舵寜涓婃柟鍗曚釜鏍峰搧淇℃伅涓嬪崟">
+            <el-table-column type="index" label="搴忓彿" width="60" align="center"/>
+            <el-table-column prop="sampleView" label="鏍峰搧鍚嶇О" min-width="120" show-overflow-tooltip/>
+            <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="120" show-overflow-tooltip/>
+            <el-table-column label="妫�娴嬩緷鎹�" min-width="160" show-overflow-tooltip>
+              <template #default="scope">{{ scope.row.sample }}</template>
+            </el-table-column>
+            <el-table-column prop="testQuantity" label="鏍峰搧鏁伴噺" width="110" align="center"/>
+            <el-table-column prop="sampleStatus" label="鏍峰搧澶栬" min-width="110" show-overflow-tooltip/>
+            <el-table-column label="鍘熷璁板綍妯℃澘" min-width="180" show-overflow-tooltip>
+              <template #default="scope">{{ batchTemplateNames(scope.row) }}</template>
+            </el-table-column>
+            <el-table-column label="鎿嶄綔" width="80" align="center">
+              <template #default="scope">
+                <el-button link type="danger" size="small" @click="removeBatchSample(scope.$index)">鍒犻櫎</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
         <el-form v-if="false" ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px"
                  label-position="right">
           <el-row>
@@ -837,6 +865,7 @@
   selectStandardTreeList2, getFileList, delFile
 } from "@/api/business/rawMaterialOrder";
 import {
+  addBatchNewJuInsOrder,
   addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
   getQuarterOnOrder, judgeNotSpotCheckOrder, selectInsOrderTemplateById,
   updateInsOrder,
@@ -876,6 +905,10 @@
     newJuLaboratoryList() {
       return (this.dict.type.sys_sub_lab || []).filter(item => item.label === '鏂拌仛')
     },
+    // 浠呮柊澧炲鎵樺崟鏃舵敮鎸佹壒閲忔牱鍝侊紝缂栬緫/鏌ョ湅鍘嗗彶鍗曚粛鎸夊崟鏍峰搧澶勭悊
+    batchOrderMode() {
+      return this.active == 1 && !this.isEdit
+    },
   },
   dicts: ['check_type1', 'urgency_level', 'form_type', 'sample_status_list', 'sys_sub_lab'],
   data() {
@@ -890,6 +923,7 @@
       fileList: [],
       deleteFileIds: [],
       boundTemplateList: [],
+      batchSampleList: [],
       templateBindingLoading: false,
       sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
       editTable: [],
@@ -1152,7 +1186,7 @@
       this.orderLoadVersion++
       const defaults = this.$options.data.call(this)
       const fields = ['addObj', 'sample', 'sampleCode', 'fileList', 'deleteFileIds',
-        'boundTemplateList', 'sampleSelectionList', 'editTable', 'sampleList',
+        'boundTemplateList', 'batchSampleList', 'sampleSelectionList', 'editTable', 'sampleList',
         'productList', 'productList0', 'productIds', 'sampleIds', 'selectTree',
         'selectTreeNode', 'selectiveEcho', 'specialStandardMethod', 'model',
         'standardMethodListId', 'template', 'templates', 'addObj1', 'totalArr',
@@ -1470,6 +1504,10 @@
         this.$refs.newJuOrder.validateField('sampleDate');
         return;
       }
+      if (this.batchOrderMode && this.batchSampleList.length > 0) {
+        this.saveBatchOrder()
+        return
+      }
       if (this.addObj.standardTreeId) {
         if (!this.addObj.sample || !this.addObj.company || !this.addObj.orderType || !this.addObj.testQuantity) {
           this.$message.error('璇峰~鍐欐娴嬩緷鎹�佸鎵樺崟浣嶃�佹楠岀被鍒拰鏍峰搧鏁伴噺');
@@ -1767,6 +1805,123 @@
           this.saveLoad = false
         })
       }
+    },
+    addBatchSample() {
+      if (!this.addObj.standardTreeId) {
+        this.$message.error('璇烽�夋嫨妫�娴嬩緷鎹�')
+        return
+      }
+      if (this.templateBindingLoading) {
+        this.$message.warning('鍘熷璁板綍妯℃澘鍔犺浇涓紝璇风◢鍊�')
+        return
+      }
+      if (this.boundTemplateList.length === 0) {
+        this.$message.error('鎵�閫夋娴嬩緷鎹湭缁戝畾鍘熷璁板綍妯℃澘')
+        return
+      }
+      const sampleCode = (this.sampleCode || '').trim()
+      if (sampleCode.length < 2) {
+        this.$message.error('璇峰~鍐欐牱鍝佺紪鍙凤紙鑷冲皯2浣嶏級')
+        return
+      }
+      if (!this.addObj.testQuantity) {
+        this.$message.error('璇峰~鍐欐牱鍝佹暟閲�')
+        return
+      }
+      if (this.batchSampleList.some(item => item.sampleCode === sampleCode)) {
+        this.$message.error('璇ユ牱鍝佺紪鍙峰凡鍦ㄦ壒閲忓垪琛ㄤ腑')
+        return
+      }
+      this.batchSampleList.push({
+        sampleCode,
+        sampleView: this.addObj.sampleView || this.addObj.sample || '',
+        testQuantity: this.addObj.testQuantity,
+        sampleStatus: this.addObj.sampleStatus,
+        sample: this.addObj.sample,
+        standardTreeId: this.addObj.standardTreeId,
+        templateList: this.boundTemplateList.map((item, index) => ({
+          templateId: item.templateId,
+          name: item.name,
+          sort: index
+        }))
+      })
+      // 娓呯┖褰撳墠鏍峰搧淇℃伅锛屾柟渚跨户缁綍鍏ヤ笅涓�涓牱鍝�
+      this.sampleCode = ''
+      this.addObj.sample = null
+      this.addObj.sampleView = ''
+      this.addObj.standardTreeId = null
+      this.addObj.testQuantity = ''
+      this.addObj.sampleStatus = ''
+      this.boundTemplateList = []
+      this.selectTreeNode = null
+      this.selectTree = null
+    },
+    removeBatchSample(index) {
+      this.batchSampleList.splice(index, 1)
+    },
+    batchTemplateNames(row) {
+      return (row.templateList || []).map(item => item.name).join('銆�')
+    },
+    saveBatchOrder() {
+      if (this.addObj.standardTreeId || (this.sampleCode || '').trim()) {
+        this.$message.error('涓婃柟杩樻湁鏈姞鍏ュ垪琛ㄧ殑鏍峰搧锛岃鍏堢偣鍑烩�滄坊鍔犳牱鍝佲�濇垨娓呯┖鍚庡啀鎻愪氦')
+        return
+      }
+      if (!this.addObj.company || !this.addObj.orderType) {
+        this.$message.error('璇峰~鍐欏鎵樺崟浣嶅拰妫�楠岀被鍒�')
+        return
+      }
+      if (this.addObj.subcontractType == null || this.addObj.sampleDisposal == null
+        || this.addObj.resultEvaluation == null || this.addObj.reportDelivery == null) {
+        this.$message.error('璇烽�夋嫨鍒嗗寘鍐呭銆佹牱鍝佸缃�佸缁撴灉璇勪环鍜屾姤鍛婁氦浠樻柟寮�')
+        return
+      }
+      if (this.addObj.subcontractType === 1 && !this.addObj.subcontractCompany) {
+        this.$message.error('鍒嗗寘鍐呭涓烘湁鏃讹紝璇峰~鍐欏垎鍖呭崟浣嶄俊鎭�')
+        return
+      }
+      if (this.addObj.reportDelivery === 2 && (!this.addObj.reportAddress || !this.addObj.reportReceiver)) {
+        this.$message.error('鎶ュ憡浜や粯鏂瑰紡涓哄揩閫掓椂锛岃濉啓鎶ュ憡瀵勯�佸湴鍧�鍜屾敹浠朵汉鍙婄數璇�')
+        return
+      }
+      const emptyTemplateRow = this.batchSampleList.find(item => !item.templateList || item.templateList.length === 0)
+      if (emptyTemplateRow) {
+        this.$message.error(`鏍峰搧 ${emptyTemplateRow.sampleCode} 娌℃湁鍘熷璁板綍妯℃澘锛岃鍒犻櫎鍚庨噸鏂版坊鍔燻)
+        return
+      }
+      this.saveLoad = true
+      const insOrder = {
+        ...this.addObj,
+        productionDate: this.addObj.productionDate === '/' || !this.addObj.productionDate
+          ? null : this.addObj.productionDate,
+        typeSource: -1,
+      }
+      delete insOrder.createTime
+      delete insOrder.temperature
+      delete insOrder.humidity
+      const payload = {
+        insOrder,
+        sampleList: this.batchSampleList.map(item => ({
+          sampleCode: item.sampleCode,
+          sampleView: item.sampleView,
+          testQuantity: item.testQuantity,
+          sampleStatus: item.sampleStatus,
+          standardTreeId: item.standardTreeId,
+          templateList: item.templateList.map((tpl, index) => ({templateId: tpl.templateId, sort: index}))
+        }))
+      }
+      addBatchNewJuInsOrder(payload).then(async res => {
+        const fileSuccess = await this.saveOrderFiles(res.data)
+        this.saveLoad = false
+        if (!fileSuccess) {
+          this.$message.warning('璁㈠崟宸蹭繚瀛橈紝閮ㄥ垎闄勪欢澶勭悊澶辫触锛岃鍒板鎵樺崟璇︽儏閲嶆柊涓婁紶')
+        } else {
+          this.$message.success('宸叉彁浜�')
+        }
+        this.closeOpenPage()
+      }).catch(e => {
+        this.saveLoad = false
+      })
     },
     handleFileChange(file, fileList) {
       if (file.size > 200 * 1024 * 1024) {
@@ -2808,6 +2963,38 @@
   color: var(--lims-text-3);
 }
 
+/* 鎵归噺鏍峰搧锛氳〃鍗曚笅鏂圭殑寰呮彁浜ゆ牱鍝佸垪琛� */
+.batch-sample {
+  margin-top: 4px;
+  padding-top: 16px;
+  border-top: 1px dashed var(--el-border-color);
+}
+
+.batch-sample__header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 12px;
+}
+
+.batch-sample__title {
+  font-size: 14px;
+  font-weight: bold;
+  color: var(--lims-text);
+}
+
+.batch-sample__tip {
+  margin-top: 4px;
+  font-size: 12px;
+  color: var(--lims-text-3);
+  line-height: 1.5;
+}
+
+.batch-sample__table {
+  margin-bottom: 16px;
+}
+
 /* 濮旀墭鍗曚俊鎭細椤堕儴鎿嶄綔鏍� */
 .order-header {
   display: flex;

--
Gitblit v1.9.3