From b4fffb6670099841c59bc22e8703e96badcf5614 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 22 十二月 2023 15:13:01 +0800
Subject: [PATCH] 报价单，销售明细单页面必填参数修改

---
 src/views/sales/quotation/AddQuotationDialog.vue       |    5 +++--
 src/views/sales/salesDetails/AddSalesDetailsDialog.vue |   11 ++++++-----
 src/components/makepager/mixin/codeMixin.js            |    6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/makepager/mixin/codeMixin.js b/src/components/makepager/mixin/codeMixin.js
index fd1876c..5d31dbc 100644
--- a/src/components/makepager/mixin/codeMixin.js
+++ b/src/components/makepager/mixin/codeMixin.js
@@ -19,9 +19,9 @@
       codeRule: {},
       codeLength: 0,
       autoCodeHeadersObj:{
-        xsjh:'',
-        bjd:'',
-        ywjh:'',
+        Xsjh:'',
+        Bjd:'',
+        Ywjh:'',
       }
     }
   },
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 268f5f1..13d58bf 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -166,7 +166,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="閿�鍞満浼�" prop="sale_chance_name"
-                :rules="[{ required: autoCodeHeadersObj.xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
+                :rules="[{ required: autoCodeHeadersObj.Xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
                   <div class="custom-name">
                     <el-autocomplete
                       v-model="editConfig.infomation.sale_chance_name"
@@ -433,6 +433,7 @@
         this.objCode.codeStandID = this.editConfig.infomation.codeStandID
       }
       this.getRCodeStandardList()
+      this.getUseSystemSet({modeType:'bjd'})
     },
     getCommonData() {
       getAllData()
@@ -712,7 +713,7 @@
       if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
         callback()
       } else {
-        if(this.autoCodeHeadersObj.xsjh=='yes'){
+        if(this.autoCodeHeadersObj.Xsjh=='yes'){
           callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
         }else{
           callback()
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index c729843..42e0793 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -92,7 +92,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="閿�鍞満浼�" prop="sale_chance_name"
-                :rules="[{ required: autoCodeHeadersObj.ywjh=='yes'?true:false, message: '璇烽�夋嫨閿�鍞満浼�', trigger: 'change' }]">
+                :rules="[{ required: autoCodeHeadersObj.Ywjh=='yes'?true:false, message: '璇烽�夋嫨閿�鍞満浼�', trigger: 'change' }]">
                   <div class="custom-name">
                     <el-autocomplete
                       style="width: 100%"
@@ -162,7 +162,7 @@
               </el-col> -->
               <el-col :span="12">
                 <el-form-item label="閿�鍞姤浠峰崟" prop="quotation_number"
-                :rules="[{ required: autoCodeHeadersObj.bjd=='yes'?true:false, message: '璇烽�夋嫨閿�鍞姤浠峰崟', trigger: 'change' }]">
+                :rules="[{ required: autoCodeHeadersObj.Bjd=='yes'?true:false, message: '璇烽�夋嫨閿�鍞姤浠峰崟', trigger: 'change' }]">
                   <div class="custom-name">
                     <el-autocomplete
                       v-model="editConfig.infomation.quotation_number"
@@ -409,8 +409,8 @@
               :selectBox="false"
               :show-summary="showSummary"
               pageName="quotation"
-              :isOperate="((autoCodeHeadersObj.bjd=='yes'&&editConfig.infomation.quotation_number)||autoCodeHeadersObj.bjd!='yes')?true:false"
-              :quotationNumber="autoCodeHeadersObj.bjd=='yes'?editConfig.infomation.quotation_number:''"
+              :isOperate="((autoCodeHeadersObj.Bjd=='yes'&&editConfig.infomation.quotation_number)||autoCodeHeadersObj.Bjd!='yes')?true:false"
+              :quotationNumber="autoCodeHeadersObj.Bjd=='yes'?editConfig.infomation.quotation_number:''"
               :product-table-list="productTableList"
               @inputContent="inputContent"
               @addProductClick="addProductClick"
@@ -634,6 +634,7 @@
         this.objCode.codeStandID = this.editConfig.infomation.codeStandID
       }
       this.getRCodeStandardList()
+      this.getUseSystemSet({modeType:'xsmx'})
     },
     getCommonData() {
       getAllData()
@@ -964,7 +965,7 @@
       }
       // let productData = this.quotationList.products
       let isBjdRequird=false
-      if(this.autoCodeHeadersObj.bjd=='yes'){
+      if(this.autoCodeHeadersObj.Bjd=='yes'){
         isBjdRequird=true
       }
       this.productTableList = {

--
Gitblit v1.8.0