Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -463,6 +463,10 @@
         :orderFeesList="orderFeesList"
         :disabled="detailData.status == 1"
         feeUrl="/blade-purchase-sales/orderfees/update"
+        optionType="CK"
+        itemType="报价"
+        @beforeFinance="beforeFinance"
+        :corpId="form.corpId"
       />
     </div>
     <el-dialog
@@ -1911,6 +1915,16 @@ export default {
       }
       return sums;
     },
+    //费用明细回调
+    beforeFinance(feesData, callback) {
+      this.advantageProjectData = feesData;
+      let params = {};
+      //暂时默认通过  之后优化
+      params.valid = true;
+      params.parentId = this.form.id;
+      params.srcOrderno = this.form.orderNo;
+      callback(params);
+    },
     openEdit() {
       const data = {
         moduleName: "bj",

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -144,7 +144,7 @@
                 size="small"
                 type="text"
                 @click="rePick(row, index)"
-                :disabled="disabled||detailData.status == 1"
+                :disabled="disabled || detailData.status == 1"
                 class="picker"
                 style="padding:4px 10px;float:left"
                 >选择</el-button
@@ -203,7 +203,7 @@
                 icon="el-icon-edit"
                 type="text"
                 @click="rowCell(row, index)"
-                :disabled="disabled||detailData.status == 1"
+                :disabled="disabled || detailData.status == 1"
                 >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
               >
               <el-button
@@ -224,6 +224,10 @@
         :orderFeesList="orderFeesList"
         :disabled="detailData.status == 1"
         feeUrl="/trade-purchase/purchase-order/removeByFees"
+        optionType="CK"
+        itemType="采购"
+        @beforeFinance="beforeFinance"
+        :corpId="form.corpId"
       />
       <upload-file
         ref="uploadFile"
@@ -1137,6 +1141,16 @@ export default {
         }
       });
     },
+    //费用明细回调
+    beforeFinance(feesData, callback) {
+      this.advantageProjectData = feesData;
+      let params = {};
+      //暂时默认通过  之后优化
+      params.valid = true;
+      params.parentId = this.form.id;
+      params.srcOrderno = this.form.orderNo;
+      callback(params);
+    },
     openEdit() {
       this.detailData.status = 2;
       this.option = this.$options.data().option;

src/views/exportTrade/salesContract/detailsPage.vue

@@ -490,6 +490,10 @@
         :orderFeesList="orderFeesList"
         :disabled="detailData.status == 1"
         feeUrl="/blade-purchase-sales/orderfees/update"
+        optionType="CK"
+        itemType="销售"
+        @beforeFinance="beforeFinance"
+        :corpId="form.corpId"
       />
       <upload-file
         ref="uploadFile"
@@ -2114,6 +2118,16 @@ export default {
         }
       });
     },
+    //费用明细回调
+    beforeFinance(feesData, callback) {
+      this.advantageProjectData = feesData;
+      let params = {};
+      //暂时默认通过  之后优化
+      params.valid = true;
+      params.parentId = this.form.id;
+      params.srcOrderno = this.form.orderNo;
+      callback(params);
+    },
     openEdit() {
       const data = {
         moduleName: "xs",