From d756b7ada5365f761a660920ed7c1a23ee536452 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Sun, 20 Oct 2024 10:11:57 +0800
Subject: [PATCH] 2024-10-20

---
 .../com_projectInfo-add-or-update.vue          | 18 +++++++++---------
 .../quotation/sellForQuotation/quoteDetail.vue | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index a45a027..7646f0d 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -624,15 +624,15 @@
           }
         }
         // 查询不刷新选择值
-        if (arr && arr.length > 0){
-          for (let i = 0; i < this.userRoleList.length; i++) {
-            let row = arr[i]
-            if (arr[i].username !== this.$store.state.user.name){
-              row = arr.find(item => item.username === arr[i].username)
-            }
-            this.$set(this.userRoleList, i, row)
-          }
-        }
+        // if (arr && arr.length > 0){
+        //   for (let i = 0; i < this.userRoleList.length; i++) {
+        //     let row = arr[i]
+        //     if (arr[i].username !== this.$store.state.user.name){
+        //       row = arr.find(item => item.username === arr[i].username)
+        //     }
+        //     this.$set(this.userRoleList, i, row)
+        //   }
+        // }
         if (val === 'none'){
           this.userRoleFlag=true
         }
diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
index e2c6210..a826358 100644
--- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
@@ -132,7 +132,7 @@ export default {
           columnProp: 'quotationDetailQuantity',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '报价数量',
+          columnLabel: 'MOQ',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -676,7 +676,7 @@ export default {
         site: this.$store.state.user.site,// 工厂编号
         productNo: undefined,//产品编码
         productDesc: undefined,//产品名称
-        quotationDetailQuantity: 1,//报价数量
+        quotationDetailQuantity: 1,//MOQ
         internalInquiryNo: undefined,//内部询价单号
         itemNo:0,//序号
         quotationDetailStatus: "草稿",//报价状态
@@ -693,7 +693,7 @@ export default {
       // 报价明细 参数列表
       quotationDetailColumns: [
         {label: "productDesc", value: "产品名称"},
-        {label: "quotationDetailQuantity", value: "报价数量"},
+        {label: "quotationDetailQuantity", value: "MOQ"},
         {label: "internalInquiryNo", value: "内部询价单号"},
         {label: "quotationDetailStatus", value: "报价状态"},
         {label: "itemNo", value: "序号"},
@@ -797,7 +797,7 @@ export default {
         site: this.$store.state.user.site,// 工厂编号
         productNo: undefined,//产品编码
         productDesc: undefined,//产品名称
-        quotationDetailQuantity: 1,//报价数量
+        quotationDetailQuantity: 1,//MOQ
         internalInquiryNo: undefined,//内部询价单号
         itemNo:0,//序号
         quotationDetailStatus: "草稿",//报价状态
@@ -1196,7 +1196,7 @@ export default {
       </el-row>
       <el-row :gutter="10">
         <el-col :span="10">
-          <el-form-item label="报价数量" prop="quotationDetailQuantity">
+          <el-form-item label="MOQ" prop="quotationDetailQuantity">
             <el-input-number :min="1" v-model="quotationDetail.quotationDetailQuantity" :controls="false"></el-input-number>
           </el-form-item>
         </el-col>
@@ -1240,7 +1240,7 @@ export default {
       <el-form-item label="产品名称" prop="productDesc">
         <el-input clearable disabled style="width: 240px" v-model="quotationDetail.productDesc"/>
       </el-form-item>
-      <el-form-item label="报价数量" prop="quotationDetailQuantity">
+      <el-form-item label="MOQ" prop="quotationDetailQuantity">
         <el-input-number disabled style="width: 100%;margin-top: -5px;" :min="1" v-model="quotationDetail.quotationDetailQuantity" :controls="false"></el-input-number>
       </el-form-item>
       <el-form-item label="备注" style="display: block;min-height: 90px;width: 63%">