ソースを参照

fix(客户管理): 客户审查通过参数配置,新增销售订单嘉实不需要默认收货地址

liujt 6 ヶ月 前
コミット
8e97a0ce05

+ 18 - 7
src/views/saleManage/contact/components/addContactDialog.vue

@@ -243,7 +243,7 @@
                 </DictSelection>
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="form.type != 2">
+            <!-- <el-col :span="8" v-if="form.type != 2">
               <el-form-item label="客户审查" prop="qualificationCensorship">
                 <el-radio v-model="form.qualificationCensorship" label="1"
                   >启用</el-radio
@@ -252,7 +252,7 @@
                   >不启用</el-radio
                 >
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="24">
               <el-form-item label="注册地址" prop="addressId">
                 <el-cascader
@@ -848,7 +848,7 @@
   // import fileMain from '@/components/addDoc/index.vue';
   import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
   import certificateManagement from '@/views/saleManage/contact/components/certificateManagement/index.vue';
-
+  import { parameterGetByCode } from '@/api/main/index.js';
   export default {
     props: {
       categoryTreeList: Array
@@ -919,6 +919,7 @@
         senderPhone: ''
       };
       return {
+        enableStatus: '2',
         fullscreen: false,
         visible: false,
         certificateQualificationsDialogFlag: false,
@@ -1065,9 +1066,9 @@
           // addressId: [
           //   { required: true, message: '请选择地址', trigger: 'change' }
           // ],
-          qualificationCensorship: [
-            { required: true, message: '请选择', trigger: 'change' }
-          ]
+          // qualificationCensorship: [
+          //   { required: true, message: '请选择', trigger: 'change' }
+          // ]
         },
         otherRules: {
           // settlementMode: [
@@ -1098,6 +1099,15 @@
     created() {
       this.getGroupAll();
       this.requestDict('生产类型');
+      
+      // 客户审查 //2不启用 1启用
+      parameterGetByCode({
+        code: 'eom_saleManage_contact_qualificationCensorship'
+      }).then((res) => {
+        this.form.qualificationCensorship = res.value;
+        this.enableStatus = res.value
+        console.log(this.enableStatus, 'this.enableStatus~~~~~~~~');
+      });
     },
     computed: {
       clientEnvironmentId() {
@@ -1658,6 +1668,7 @@
           }
           this.form.type =
             this.form.type != 1 ? (this.getLabel == '供货列表' ? '2' : '3') : 1;
+            console.log(this.form, 'this.form~~~~~~~~');
           const data = {
             base: this.form,
             other: this.otherForm,
@@ -1739,7 +1750,7 @@
 
         // this.tableCertificateDataAdd({});
         this.form.qualificationCensorship =
-          this.form.qualificationCensorship || '2';
+          this.form.qualificationCensorship || this.enableStatus || '2';
 
         // if (data.base.businessLicenseFile && data.base.businessLicenseFile.uid) {
         //   this.$set(this.form, 'businessLicenseFiles', [

+ 2 - 2
src/views/saleManage/saleOrder/components/addDialog.vue

@@ -1207,7 +1207,7 @@
                 partbUnifiedSocialCreditCode,
                 totalAmount: totalPrice,
                 payAmount: discountTotalPrice || totalPrice,
-                receiveAddress: partaAddress,
+                receiveAddress: this.clientEnvironmentId == 5 ? '' : partaAddress,
                 settlementMode,
                 settlementModeName,
                 contractNo,
@@ -1380,7 +1380,7 @@
           partaTel: '',
           partaUnifiedSocialCreditCode: base?.unifiedSocialCreditCode,
           customerMark: base?.serialNo,
-          receiveAddress: other?.addressName + other?.address,
+          receiveAddress: this.clientEnvironmentId == 5 ? '' :  other?.addressName + other?.address,
           receivePerson: defaultReceived?.linkName
         });
         this.changePersonel(userInfo?.id ? userInfo : '');