From 4f94a66bc8ad9a57295f161de9195d5528b1d181 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 08 四月 2025 11:55:16 +0800
Subject: [PATCH] 基础数据维护+原辅材下单修改

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

diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 4c9dd8c..d0506ed 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -136,6 +136,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item class="addObj-form-item" label="杞﹂棿鍚嶇О:">
+              <el-input v-model="addObj.workShopName" class="addObj-info" clearable disabled size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="addObj-form-item" label="澶囨敞:">
               <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2 }" :disabled="active > 1"
                 :placeholder="active > 1 ? '' : '璇疯緭鍏�'" clearable size="small" type="textarea"></el-input>
@@ -168,7 +173,7 @@
                 闄勪欢鏌ョ湅
               </el-button>
               <el-dialog :visible.sync="fileDialogVisible" title="闄勪欢鏌ョ湅" width="80%">
-                <fileList :currentNo="partNo" v-if="fileDialogVisible" />
+                <fileList :currentNo="addObj.workShopId" v-if="fileDialogVisible" />
               </el-dialog>
             </el-form-item>
           </el-form>
@@ -419,7 +424,7 @@
   selectStandardProductList,
   selectStandardTreeListByPartNo
 } from "@/api/business/rawMaterialOrder";
-import fileList from "./commom/fileList.vue"
+import fileList from "../../structural/capabilityAndLaboratory/workshop/components/fileList.vue"
 import limsTable from "@/components/Table/lims-table.vue";
 
 export default {
@@ -477,6 +482,8 @@
         typeSource: 1,
         ifsInventoryId: '',
         sampleStatus: 'In good condition',
+        workShopName: '',//杞﹂棿鍚嶇О
+        workShopId: '',//杞﹂棿ID
       },
       addObjRules: { // 琛ㄥ崟鏍¢獙瑙勫垯
         testQuantity: [
@@ -560,7 +567,7 @@
           value: 0
         },
         {
-          label: '瀛e害妫�楠�',
+          label: '鍙潬鎬ф楠�',
           value: 1
         },
       ],
@@ -632,7 +639,6 @@
   methods: {
     handleFileDialog() {
       this.fileDialogVisible = true
-      this.currentNo = addObj.partNo || customsInspection.partNo;
     },
     save1() {
       if (this.bsm1DiaList.length > 0) {
@@ -749,6 +755,8 @@
             this.$set(this.addObj, 'buyUnitMeas', this.customsInspection.buyUnitMeas)
             this.$set(this.addObj, 'updateBatchNo', this.customsInspection.updateBatchNo)
             this.$set(this.addObj, 'partDetail', this.customsInspection.partDesc)
+            this.$set(this.addObj, 'workShopName', res.data.workShopName)
+            this.$set(this.addObj, 'workShopId', res.data.workShopId)
             if (this.orderType == 1) {
               this.$set(this.addObj, 'orderType', 'Quarterly inspection')
             }

--
Gitblit v1.9.3