bug

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

@@ -1748,7 +1748,10 @@
             requireSourceType: info.sourceType,
             requireSourceTypeName: info.sourceTypeName
           },
-          productList: info.detailList || []
+          productList: info.detailList.map(item=>{
+            item['customerExpectDeliveryDeadline']=item.expectReceiveDate
+            return item
+          }) || []
         };
         this.setValue(form);
         // await this.getLinkInfo(cusInfo.base.id)

src/views/financialManage/feeManage/feeApplication/detailDialog.vue

@@ -8,6 +8,8 @@
     width="60%"
     :maxable="true"
     :resizable="true"
+    @close="cancel"
+
   >
     <div class="switch_left">
       <ul>

src/views/saleManage/contact/components/certificateManagement/components/detail-dialog.vue

@@ -37,6 +37,10 @@
         <template slot="label"> 有效期至 </template>
         {{ form.validityStartTime + ' — ' + form.validityEndTime }}
       </el-descriptions-item>
+      <el-descriptions-item >
+        <template slot="label"> 等级 </template>
+        {{ levelOptions.find(item=>item.value==form.level)?.label }}
+      </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 状态 </template>
         {{ getDictValue('规则状态', form.status) }}
@@ -92,6 +96,20 @@
     //注册组件
     data() {
       return {
+        levelOptions: [
+          {
+            label: '初级',
+            value: '1'
+          },
+          {
+            label: '中级',
+            value: '2'
+          },
+          {
+            label: '高级',
+            value: '3'
+          }
+        ],
         dialogVisible: false,
         form: {},
         activeComp: 'main',

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

@@ -28,6 +28,7 @@
               clearable
               v-model="form.saleType"
               :listFormatte="listFormatte"
+              @change="saleTypeChange"
             >
             </DictSelection>
           </el-form-item>
@@ -394,7 +395,7 @@
       <el-row style="margin-top: 20px">
         <el-col :span="12">
           <el-form-item label="收货人信息" prop="receivePerson">
-            <el-input  clearable v-model="form.receivePerson" />
+            <el-input clearable v-model="form.receivePerson" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -462,7 +463,8 @@
     UpdateInformation,
     addInformation,
     submit,
-    getByRepeatBomAttribute,saveOrderBomList
+    getByRepeatBomAttribute,
+    saveOrderBomList
   } from '@/api/saleManage/saleorder';
   import { getcontactlink } from '@/api/saleManage/businessFollow';
   import headList from '@/BIZComponents/user-select/user-select.vue';
@@ -632,7 +634,11 @@
         let isRequired = this.isRequired;
         return {
           settlementMode: [
-            { required: true, message: '请选择结算方式', trigger: 'change' }
+            {
+              required: this.getSaleTypeName(this.form.saleType) ? false : true,
+              message: '请选择结算方式',
+              trigger: 'change'
+            }
           ],
 
           saleType: [
@@ -959,6 +965,26 @@
           });
         }
       },
+
+      saleTypeChange() {
+        if (this.getSaleTypeName()) {
+          this.$set(this.form, 'settlementMode', '');
+        }
+      },
+      getSaleTypeName() {
+        let saleTypeName =
+          this.getDictValue('销售类型', this.form.saleType) || '';
+        if (
+          saleTypeName.indexOf('技改') != '-1' ||
+          saleTypeName.indexOf('三包') != '-1' ||
+          saleTypeName.indexOf('补发') != '-1'
+        ) {
+          return true;
+        } else {
+          return false;
+        }
+      },
+
       //选择合同回调
       changeContract(obj) {
         this.form = Object.assign({}, this.form, {
@@ -1045,7 +1071,7 @@
 
       //打开新增编辑弹框
       async open(type, row, contactCategoryId) {
-        this.businessId=''
+        this.businessId = '';
         this.title = type === 'add' ? '新增' : '修改';
         this.row = row;
         if (this.enterprisePage.length == 0) {