bug

src/views/contractManage/contractBook/components/addDialog.vue

@@ -477,7 +477,6 @@
             :isSalesRecord="form.type"
             :cacheKeyUrl="cacheKeyUrl"
             :isGoods="form.type == '1'"
-            
           ></inventoryTable1>
         </el-tab-pane>
         <el-tab-pane
@@ -635,6 +634,10 @@
   import { listCode, getCode } from '@/components/addDoc/api/index.js';
   export default {
     props: {
+      isRequired: {
+        type: Boolean,
+        default: true
+      },
       categoryTreeList: Array,
       contactData: {
         type: Object,
@@ -795,7 +798,31 @@
         // removeLinkList: [],
         tableBankData: [],
         tableLinkData: [],
-        rules: {
+
+        enterprise: {
+          address: '',
+          unifiedSocialCreditCode: '',
+          tel: '',
+          name: ''
+        },
+        // 提交状态
+        loading: false,
+        // 是否是修改
+        isUpdate: false,
+
+        enterprisePage: [],
+        create: false,
+        source: '',
+        businessId: '',
+        groupTreeData: [],
+        // 组织机构平铺数据
+        groupData: []
+      };
+    },
+    computed: {
+      rules() {
+        let isRequired = this.isRequired;
+        return {
           type: [
             { required: true, message: '请选择合同类型', trigger: 'change' }
           ],
@@ -819,14 +846,14 @@
             { required: true, message: '请选择甲方名称', trigger: 'change' }
           ],
           partaLinkName: [
-            { required: true, message: '请选择甲方联系人', trigger: 'change' }
+            { required: isRequired, message: '请选择甲方联系人', trigger: 'change' }
           ],
           acceptUnpack: [
             { required: true, message: '请选择是否接受', trigger: 'change' }
           ],
           partaTel: [
             {
-              required: true,
+              required: isRequired,
               pattern: telReg,
               message: '请输入甲方联系电话',
               trigger: 'blur'
@@ -840,11 +867,11 @@
             { required: true, message: '请输入乙方名称', trigger: 'change' }
           ],
           partbLinkName: [
-            { required: true, message: '请输入乙方联系人', trigger: 'change' }
+            { required: isRequired, message: '请输入乙方联系人', trigger: 'change' }
           ],
           partbTel: [
             {
-              required: true,
+              required: isRequired,
               pattern: telReg,
               message: '请输入乙方联系电话',
               trigger: 'blur'
@@ -859,26 +886,8 @@
           contractEndDate: [
             { validator: this.validateEndDate, trigger: 'blur' }
           ]
-        },
-        enterprise: {
-          address: '',
-          unifiedSocialCreditCode: '',
-          tel: '',
-          name: ''
-        },
-        // 提交状态
-        loading: false,
-        // 是否是修改
-        isUpdate: false,
-
-        enterprisePage: [],
-        create: false,
-        source: '',
-        businessId: '',
-        groupTreeData: [],
-        // 组织机构平铺数据
-        groupData: []
-      };
+        };
+      }
     },
     created() {
       this.getGroupAll();

src/views/contractManage/contractBook/index.vue

@@ -156,6 +156,7 @@
       :contactData="contactData"
       :businessOpportunityData="businessOpportunityData"
       :curNodeData="curNodeData"
+      :isRequired="isRequired"
     ></add-dialog>
     <detail-dialog ref="contactDetailDialogRef"></detail-dialog>
     <!-- 多选删除弹窗 -->
@@ -217,6 +218,9 @@
   import autogenerateDialog from '@/BIZComponents/autogenerateDialog.vue';
   import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
   import addInvoiceManage from '@/views/financialManage/invoiceManage/components/addOrEditDialog.vue';
+
+  import { parameterGetByCode } from '@/api/main/index.js';
+
   export default {
     mixins: [dictMixins, tabMixins],
     components: {
@@ -438,13 +442,21 @@
           }
         ],
         cacheKeyUrl: 'eos-2310d377-contract-contractBook',
-        curNodeData: {}
+        curNodeData: {},
+        isRequired: true,
       };
     },
     computed: {},
     created() {
       this.requestDict('客户状态');
       this.getTreeData();
+
+      parameterGetByCode({
+        code: 'order_person_info'
+      }).then((res) => {
+        this.isRequired = Boolean(res.value);
+      });
+
       if (this.$route.query.isView) {
         this.$nextTick(() => {
           this.openDetail({
@@ -469,20 +481,20 @@
         this.reload({ categoryId: data.id });
       },
       /* 表格数据源 */
-     async datasource({ page, limit, where, order }) {
+      async datasource({ page, limit, where, order }) {
         if (this.businessOpportunityData.id) {
           where['opportunityId'] = this.businessOpportunityData.id;
         }
         if (this.contactData.id) {
           where['contactId'] = this.contactData.id;
         }
-       const data= await getTableList({
+        const data = await getTableList({
           pageNum: page,
           size: limit,
           ...where
-        })
+        });
         this.extInfo = data.extInfo;
-        return data
+        return data;
       },
 
       //获取左边分类
@@ -628,12 +640,12 @@
       margin-left: 10px;
     }
   }
-  .flex-end{
+  .flex-end {
     display: flex;
     align-items: center;
-    .title{
+    .title {
       font-size: 14px;
-      flex:1;
+      flex: 1;
       display: flex;
       padding-right: 20px;
       justify-content: flex-end;

src/views/purchasingManage/purchaseOrder/components/addDialog.vue

@@ -508,6 +508,12 @@
 
   export default {
     mixins: [dictMixins],
+    props: {
+      isRequired: {
+        type: Boolean,
+        default: true
+      }
+    },
     components: {
       inquiryList,
       purchaseNeedList,
@@ -616,7 +622,7 @@
         // 是否是修改
         isUpdate: false,
         businessId: '',
-        winnerSuppleIds: ''
+        winnerSuppleIds: '',
       };
     },
     computed: {
@@ -624,6 +630,9 @@
         return this.$store.state.order.allcountAmount;
       },
       rules() {
+        let isRequired=this.isRequired
+        // console.log(this.isRequired);
+        
         return {
           deliveryDate: [
             { required: true, message: '请选择交货日期', trigger: 'change' }
@@ -656,10 +665,14 @@
             { required: true, message: '请选择结算方式', trigger: 'change' }
           ],
           partaName: [
-            { required: true, message: '请选择供应商名称', trigger: 'change' }
+            {
+              required: true,
+              message: '请选择供应商名称',
+              trigger: 'change'
+            }
           ],
           partaLinkName: [
-            { required: true, message: '请选择供应商联系人', trigger: 'change' }
+            { required: isRequired, message: '请选择供应商联系人', trigger: 'change' }
           ],
           acceptUnpack: [
             { required: true, message: '请选择是否接受', trigger: 'change' }
@@ -673,7 +686,7 @@
           ],
           partaTel: [
             {
-              required: true,
+              required: isRequired,
               pattern: telReg,
               message: '请输入供应商联系电话',
               trigger: 'blur'
@@ -685,14 +698,14 @@
           ],
           partbLinkName: [
             {
-              required: true,
+              required: isRequired,
               message: '请输入供采购方联系人',
               trigger: 'change'
             }
           ],
           partbTel: [
             {
-              required: true,
+              required: isRequired,
               pattern: telReg,
               message: '请输入供采购方联系电话',
               trigger: 'blur'
@@ -705,6 +718,8 @@
       }
     },
     created() {
+      console.log(this);
+      
       this.getGroupAll();
       this.getEnterprisePage();
       this.changePersonel();
@@ -849,11 +864,11 @@
         });
         info['rawDetailList'] = info.rawList;
         info['outputDetailList'] = info.outputList;
-  
-        info.productList.forEach(item=>{
-           item['discountSinglePrice']=item.singlePrice
-           item['discountTotalPrice']=item.totalPrice
-        })
+
+        info.productList.forEach((item) => {
+          item['discountSinglePrice'] = item.singlePrice;
+          item['discountTotalPrice'] = item.totalPrice;
+        });
         if (info.productList.lenght > 1) {
           this.$refs.planTableListRef.open(info);
         } else {

src/views/purchasingManage/purchaseOrder/index.vue

@@ -187,7 +187,7 @@
       </div>
     </el-card>
 
-    <add-dialog ref="addDialogRef" @done="reload"></add-dialog>
+    <add-dialog ref="addDialogRef" @done="reload" :isRequired="isRequired"></add-dialog>
     <add-invoice-dialog
       ref="invoiceDialogRef"
       @done="reload"
@@ -262,6 +262,7 @@
   import tabMixins from '@/mixins/tableColumnsMixin';
   import importDialog from '@/components/upload/import-dialog.vue';
   import exportButton from '@/components/upload/exportButton.vue';
+  import { parameterGetByCode } from '@/api/main/index.js';
 
   export default {
     mixins: [dictMixins, tabMixins],
@@ -476,12 +477,18 @@
             fixed: 'right'
           }
         ],
-        cacheKeyUrl: 'eos-5f2ac512-purchaseOrder-saleorder'
+        cacheKeyUrl: 'eos-5f2ac512-purchaseOrder-saleorder',
+        isRequired: true
       };
     },
     computed: {},
     created() {
       this.requestDict('客户状态');
+      parameterGetByCode({
+        code: 'order_person_info'
+      }).then((res) => {
+        this.isRequired = Boolean(res.value);
+      });
     },
     methods: {
       //更多菜单

src/views/saleManage/contact/components/addContactDialog.vue

@@ -259,6 +259,7 @@
                   ref="address"
                   style="width: 35%"
                   placeholder="请选择省市区/县"
+                  @change="changeAddress1"
                 ></el-cascader>
                 <el-input
                   placeholder="请输入详细地址"
@@ -280,6 +281,7 @@
             <el-col :span="24">
               <el-form-item label="联系地址" prop="addressId">
                 <el-cascader
+                  @change="changeAddress2"
                   clearable
                   v-model="otherForm.addressId"
                   :options="options.cityData"
@@ -1834,6 +1836,21 @@
       changeParent(obj) {
         this.$set(this.form, 'parentId', obj.id);
         this.$set(this.form, 'parentName', obj.name);
+      },
+      changeAddress1(e) {
+        if (e.length) {
+          this.form.address = '/';
+          return;
+        }
+        this.form.address = '';
+      },
+      changeAddress2(e) {
+        if (e.length) {
+          this.otherForm.address = '/';
+          return;
+        }
+        this.otherForm.address = '';
+        console.log(e);
       }
     }
   };

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -472,6 +472,10 @@
         default: () => {
           return {};
         }
+      },
+      isRequired: {
+        type: Boolean,
+        default: true
       }
     },
     data() {
@@ -534,7 +538,67 @@
         // 组织机构树形结构数据
         groupTreeData: [],
         groupData: [],
-        rules: {
+        // rules: {
+        //   settlementMode: [
+        //     { required: true, message: '请选择结算方式', trigger: 'change' }
+        //   ],
+
+        //   saleType: [
+        //     { required: true, message: '请选择销售类型', trigger: 'change' }
+        //   ],
+
+        //   partaName: [
+        //     { required: true, message: '请选择客户名称', trigger: 'change' }
+        //   ],
+        //   partaLinkName: [
+        //     { required: true, message: '请选择客户联系人', trigger: 'change' }
+        //   ],
+        //   acceptUnpack: [
+        //     { required: true, message: '请选择是否接受', trigger: 'change' }
+        //   ],
+        //   partaTel: [
+        //     {
+        //       required: true,
+        //       pattern: telReg,
+        //       message: '请输入客户联系电话',
+        //       trigger: 'blur'
+        //     }
+        //   ],
+
+        //   partbName: [
+        //     { required: true, message: '请输入售出方名称', trigger: 'change' }
+        //   ],
+        //   partbLinkName: [
+        //     { required: true, message: '请输入售出方联系人', trigger: 'change' }
+        //   ],
+        //   partbTel: [
+        //     {
+        //       required: true,
+        //       pattern: telReg,
+        //       message: '请输入售出方联系电话',
+        //       trigger: 'blur'
+        //     }
+        //   ],
+        //   partaEmail: [
+        //     { pattern: emailReg, message: '邮箱格式不正确', trigger: 'blur' }
+        //   ],
+        //   payAmount: [{ required: true, message: '请输入', trigger: 'blur' }]
+        // },
+        // 提交状态
+        loading: false,
+        // 是否是修改
+        isUpdate: false,
+        enterprisePage: [],
+        businessId: ''
+      };
+    },
+    computed: {
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
+      },
+      rules() {
+        let isRequired=this.isRequired
+        return {
           settlementMode: [
             { required: true, message: '请选择结算方式', trigger: 'change' }
           ],
@@ -547,14 +611,14 @@
             { required: true, message: '请选择客户名称', trigger: 'change' }
           ],
           partaLinkName: [
-            { required: true, message: '请选择客户联系人', trigger: 'change' }
+            { required: isRequired, message: '请选择客户联系人', trigger: 'change' }
           ],
           acceptUnpack: [
             { required: true, message: '请选择是否接受', trigger: 'change' }
           ],
           partaTel: [
             {
-              required: true,
+              required: isRequired,
               pattern: telReg,
               message: '请输入客户联系电话',
               trigger: 'blur'
@@ -565,11 +629,11 @@
             { required: true, message: '请输入售出方名称', trigger: 'change' }
           ],
           partbLinkName: [
-            { required: true, message: '请输入售出方联系人', trigger: 'change' }
+            { required: isRequired, message: '请输入售出方联系人', trigger: 'change' }
           ],
           partbTel: [
             {
-              required: true,
+              required: isRequired,
               pattern: telReg,
               message: '请输入售出方联系电话',
               trigger: 'blur'
@@ -579,18 +643,7 @@
             { pattern: emailReg, message: '邮箱格式不正确', trigger: 'blur' }
           ],
           payAmount: [{ required: true, message: '请输入', trigger: 'blur' }]
-        },
-        // 提交状态
-        loading: false,
-        // 是否是修改
-        isUpdate: false,
-        enterprisePage: [],
-        businessId: ''
-      };
-    },
-    computed: {
-      clientEnvironmentId() {
-        return this.$store.state.user.info.clientEnvironmentId;
+        };
       }
     },
     created() {
@@ -860,17 +913,11 @@
 
       //清除合同
       clearContrcat(type) {
-        if(type=='project'&&!this.form.projectId){
-          return
+        if (type == 'project' && !this.form.projectId) {
+          return;
         }
         this.clearing = true;
-        let {
-          id,
-          saleType,
-          saleTypeName,
-          orderFiles,
-          remark
-        } = this.form;
+        let { id, saleType, saleTypeName, orderFiles, remark } = this.form;
         this.form = Object.assign({}, copyObj(this.formDef), {
           id,
           saleType,
@@ -882,7 +929,8 @@
         this.projectData = {};
 
         this.$store.commit('order/setContractId', '');
-        this.$refs.inventoryTable&&this.$refs.inventoryTable.putTableValue([]);
+        this.$refs.inventoryTable &&
+          this.$refs.inventoryTable.putTableValue([]);
 
         setTimeout(() => {
           this.clearing = false;

src/views/saleManage/saleOrder/index.vue

@@ -219,10 +219,12 @@
     </el-card>
 
     <add-dialog
+      :isRequired="isRequired"
       ref="addDialogRef"
       @done="reload"
       :contactData="contactData"
     ></add-dialog>
+
     <add-invoice-dialog
       ref="invoiceDialogRef"
       @done="reload"
@@ -304,6 +306,8 @@
   import tabMixins from '@/mixins/tableColumnsMixin';
   import importDialog from '@/components/upload/import-dialog.vue';
   import exportButton from '@/components/upload/exportButton.vue';
+  import { parameterGetByCode } from '@/api/main/index.js';
+
   export default {
     mixins: [dictMixins, tabMixins],
     components: {
@@ -359,12 +363,21 @@
         addOrEditDialogFlag1: false,
         params: {},
 
-        cacheKeyUrl: 'eos-c2e9664a-saleManage-saleOrder'
+        cacheKeyUrl: 'eos-c2e9664a-saleManage-saleOrder',
+        isRequired: true
       };
     },
 
     created() {
       this.requestDict('客户状态');
+      parameterGetByCode({
+        code: 'order_person_info'
+      }).then((res) => {
+        console.log(res);
+        
+        this.isRequired = Boolean(0);
+      });
+
       // if (!('Notification' in window)) {
       //   console.log('此浏览器不支持桌面通知');
       // } else if (Notification.permission === 'granted') {
@@ -668,7 +681,7 @@
         if (new Set(saleTypeS).size != 1) {
           return this.$message.warning('请选择相同销售类型的订单！');
         }
-        
+
         if (
           this.selection.filter((item) => item.needProduce == 4)?.length &&
           this.selection.filter((item) => item.needProduce == 4)?.length !=