qukaidi пре 3 година
родитељ
комит
ca7c6a7949

+ 8 - 0
src/api/feeInfo/fee-info.js

@@ -10,4 +10,12 @@ export function delItem(data, url) {
       id: data
     }
   })
+}
+//费用删除
+export function delItem2(data, url) {
+  return request({
+    url: '/api'+url,
+    method: 'post',
+    data:data
+  })
 }

+ 29 - 8
src/components/fee-info/main.vue

@@ -122,7 +122,7 @@
 import feeOption from "./config/feeInfo.json";
 import option from "./config/feeList.json";
 import { getDeptLazyTree, customerList } from "@/api/basicData/basicFeesDesc";
-import { delItem } from "@/api/feeInfo/fee-info";
+import { delItem,delItem2 } from "@/api/feeInfo/fee-info";
 import { isPercentage, micrometerFormat, IntegerFormat } from "@/util/validate";
 import cropDialog from "@/components/crop-dialog/main";
 import _ from "lodash";
@@ -251,6 +251,11 @@ export default {
       type: String,
       default: 'first'
     },
+    // 1.贸易 2.泽兴
+    delType: {
+      type: Number,
+      default: 1
+    },
   },
   filters: {
     isPercentage(val) {
@@ -417,13 +422,29 @@ export default {
       }).then(() => {
         //费用判断是否需要调用删除接口
         if (row.id) {
-          delItem(row.id, this.feeUrl).then(res => {
-            this.$message({
-              type: "success",
-              message: "删除成功!"
+          if (this.delType == 1) {
+            delItem(row.id, this.feeUrl).then(res => {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.feeData.splice(index, 1);
             });
-            this.feeData.splice(index, 1);
-          });
+          } else {
+            let data={
+              srcParentId:row.id,
+              billType:this.billType,
+              tradeType:this.optionType
+            }
+            delItem2(data, this.feeUrl).then(res => {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.feeData.splice(index, 1);
+            });
+          }
+
         } else {
           this.$message({
             type: "success",
@@ -507,7 +528,7 @@ export default {
             params.exchangeRate = data.receivableParities;
             this.$refs.feeCrud.rowCellAdd(params);
           });
-        }else if(this.optionType == "JK") {
+        } else if (this.optionType == "JK") {
           getParities({
             currency: "USD",
             businesDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"

+ 2 - 2
src/views/purchase/contract/detailsPage.vue

@@ -233,9 +233,9 @@
             </template>
           </avue-crud>
         </trade-card>
-        <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="viewDisabled" :itemType="'采购'"
+        <fee-info ref="feeInfo" :orderFeesList="orderFeesList" :disabled="viewDisabled" :itemType="'申请'"
           activeName="second" :optionType="'JK'" @beforeFinance="beforeFinance" @afterFinance="afterFinance"
-          @getBillNo="getBillNo" feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :billNoList="billNoList" />
+          @getBillNo="getBillNo" feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :billNoList="billNoList" :delType="2" />
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled" :orderFilesList="orderFilesList"
           delUrl="" />
       </el-form>

+ 1 - 1
src/views/salesManagement/salesContract/detailsPage.vue

@@ -213,7 +213,7 @@
           </avue-crud>
         </trade-card>
         <fee-info ref="feeInfo" @beforeFinance="beforeFinance" @afterFinance="afterFinance" :disabled="viewDisabled"
-          :orderFeesList="orderFeesList" :itemType="'采购'" :optionType="'JK'" feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" />
+          :orderFeesList="orderFeesList" :itemType="'收费'" optionType="'JK'" feeUrl="/blade-purchase-sales/entranceOrder/removeOrderFees" :corpId="form.corpId" :delType="2" />
         <upload-file ref="uploadFile" title="合同附件" :disabled="viewDisabled"
           :orderFilesList="orderFilesList || viewDisabled" delUrl="" />
       </el-form>