富文本

src/views/contract/ContractPurPng/components/createForm.vue

@@ -110,7 +110,7 @@
           <h4>上载点</h4>
           <a-button type="primary" style="margin-bottom: 10px;margin-right: 10px;" @click="addUpLoad" v-if="!isDisable">新增</a-button>
           <a-button type="primary" @click="deleteUpLoad" v-if="!isDisable">删除</a-button>
-          <div v-for="(item, idx) in dataListPoint">
+          <div v-for="(item, idx) in dataListPoint" class="tbStyle">
             <a-row>
               <a-col :span="8">
                 <a-form-item name="pointUpName">
@@ -303,10 +303,7 @@
       () => props.disabled,
       (val) => {
         isDisable.value = val
-        if (val) {
-          let idx = columns.value.findIndex(v =>v.dataIndex == 'operation')
-          idx>-1 && columns.value.splice(idx, 1)
-        }
+        
       },
       {
         immediate: true
@@ -352,10 +349,8 @@
         v.dateFrom = v.dateFrom ? dayjs(v.dateFrom) : null
         v.dateTo = v.dateTo ? dayjs(v.dateTo) : null
       });
-
-      dataListPoint.value.forEach(v => {
-        let a = (v.lngContractPurPngPointSalesList || []).map(i =>i.pointDelyName)
-        v.pointDelyName = a.join(',')
+      dataListAppro.value.forEach(v => {
+        v.approId = v.id
       })
 
       } catch (error) {
@@ -530,7 +525,7 @@
         await formRef.value.validateFields();
         let arr =  contractQty.value.getQtyList()
         for(let i=0; i<arr.length; i++) {
-          let isFlag = !arr[i].dateFrom || !arr[i].dateTo || !arr[i].baseInc || arr[i].rateM3Gj == null || arr[i].rateM3Gj == '' || arr[i].qtyGjMonth == null || arr[i].qtyGjMonth == ''|| arr[i].qtyM3Month == null || arr[i].qtyM3Month == ''
+          let isFlag = !arr[i].dateFrom || !arr[i].dateTo || !arr[i].baseInc || arr[i].qtyGjMonth == null || arr[i].qtyGjMonth === ''|| arr[i].qtyM3Month == null || arr[i].qtyM3Month === ''
           if (isFlag) {
             message.warn('请完善合同约定必选项')
             return
@@ -648,5 +643,10 @@
       color: rgba(0, 0, 0, 0.45);
       // top: 0;
     }
+    .tbStyle {
+      border: 1px dashed #d9d9d9;
+      padding: 10px;
+      margin-bottom: 10px;
+    }
     
 </style>