fix

src/api/kaihe/domesticTrade/orderInformation.js

@@ -169,3 +169,13 @@ export function shippingList(query) {
     params: query
   })
 }
+/**
+ * 撤销审核
+ */
+ export function cancellationFees(data) {
+  return request({
+    url: '/khwarehouse/warehousebills/cancellationFees',
+    method: 'post',
+    data: data
+  })
+}

src/views/finance/charge/kaihe-index.vue

@@ -12,6 +12,8 @@
                 placeholder="请选择"
                 clearable
                 style="width: 100%"
+                filterable
+                :remote-method="remoteMethod"
               >
                 <el-option
                   v-for="item in corpList"

src/views/finance/contrast/kaihe-index.vue

@@ -12,6 +12,7 @@
                 placeholder="请选择"
                 clearable
                 style="width: 100%"
+                filterable
               >
                 <el-option
                   v-for="item in corpList"

src/views/finance/payment/kaihe-index.vue

@@ -12,6 +12,7 @@
                 placeholder="请选择"
                 clearable
                 style="width: 100%"
+                filterable
               >
                 <el-option
                   v-for="item in corpList"

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -735,7 +735,7 @@
                 v-model="scope.row.fBusinessType"
                 filterable
                 remote
-                :disabled="modify || scope.row.fSrcTypeId != 0"
+                :disabled="modify"
                 placeholder="请选择业务类型"
               >
                 <el-option
@@ -759,7 +759,7 @@
                 v-model="scope.row.fCorpid"
                 filterable
                 remote
-                :disabled="modify || scope.row.fSrcTypeId != 0"
+                :disabled="modify"
                 placeholder="请选择客户名称"
               >
                 <el-option
@@ -783,7 +783,7 @@
                 v-model="scope.row.fFeeid"
                 filterable
                 remote
-                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :disabled="modify"
                 placeholder="请选择费用名称"
               >
                 <el-option
@@ -808,7 +808,7 @@
                 placeholder="请选择计价单位"
                 @change="changeFeeUnit(scope.row)"
                 clearable
-                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :disabled="modify"
               >
                 <el-option
                   v-for="(dict, index) in jFeetunitOptions"
@@ -831,7 +831,7 @@
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fQty"
                 placeholder="数量"
-                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :disabled="modify"
                 @change="changeContractAmt(scope.row)"
                 show-word-limit
               />
@@ -849,7 +849,7 @@
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fUnitprice"
                 placeholder="单价"
-                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :disabled="modify"
                 @change="changeContractAmt(scope.row)"
                 show-word-limit
               />
@@ -883,7 +883,7 @@
               <el-select
                 v-model="scope.row.fStltypeid"
                 placeholder="请选择结算表票结、月结"
-                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :disabled="modify"
               >
                 <el-option
                   v-for="(dict, index) in fStltypeOptions"
@@ -904,7 +904,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fCurrency"
-                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :disabled="modify"
                 placeholder="币别"
                 show-word-limit
               />
@@ -920,7 +920,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fExrate"
-                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :disabled="modify"
                 placeholder="汇率"
                 show-word-limit
               />
@@ -936,7 +936,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fTaxrate"
-                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :disabled="modify"
                 placeholder="税率"
                 show-word-limit
               />
@@ -966,7 +966,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.remark"
-                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :disabled="modify"
                 placeholder="备注"
                 show-word-limit
               />
@@ -1338,6 +1338,9 @@
                  @click="feeSubmission"
       >费用请核
       </el-button>
+      <el-button type="primary"  v-if="form.fBillstatus == 11 && this.form.moneyStatus >= 4" @click="revokeSubmission">
+        撤销费用请核
+      </el-button>
       <el-button type="success" v-if="approVal" @click="addOrUpdateHand(form,'f_billstatus')">审 批</el-button>
       <el-button type="primary"
                  v-if="(form.fUpdeteStatus >= 2 && form.fUpdeteStatus <= 6) && (form.fSubmitUpdate >= 2 && form.fSubmitUpdate <= 6) && (form.fDeleteStatus >= 2 && form.fDeleteStatus <= 5) && approvalTwo"
@@ -1624,7 +1627,8 @@ import {
   voyageNumber,
   reject,
   deleteAll,
-  shippingList
+  shippingList,
+   cancellationFees
 } from '@/api/kaihe/domesticTrade/orderInformation'
 import Global from '@/layout/components/global'
 import { getToken } from '@/utils/auth'
@@ -2620,6 +2624,118 @@ export default {
         remark: null
       })
     },
+    //撤销审核
+    revokeSubmission(){
+        if (!this.warehouseDrList && !this.warehouseCrList) {
+        this.$message.error('请维护费用')
+        return false
+      }
+      if (this.warehouseDrList) {
+        for (let li in this.warehouseDrList) {
+          if (!this.warehouseDrList[li].fBusinessType) {
+            this.$message.error('应收费用第' + (Number(li) + 1) + '行业务类型为空，请维护业务类型')
+            return false
+          } else if (!this.warehouseDrList[li].fCorpid) {
+            this.$message.error('应收费用第' + (Number(li) + 1) + '行客户名称为空，请维护客户名称')
+            return false
+          } else if (!this.warehouseDrList[li].fFeeid) {
+            this.$message.error('应收费用第' + (Number(li) + 1) + '行费用名称为空，请维护费用名称')
+            return false
+          } else if (!this.warehouseDrList[li].fQty) {
+            this.$message.error('应收费用第' + (Number(li) + 1) + '行数量为空，请维护数量')
+            return false
+          } else if (!this.warehouseDrList[li].fUnitprice) {
+            this.$message.error('应收费用第' + (Number(li) + 1) + '行单价为空，请维护单价')
+            return false
+          }
+        }
+      }
+      if (this.warehouseCrList) {
+        // console.log(this.warehouseCrList[1].fCorpid);
+        for (let li in this.warehouseCrList) {
+          if (!this.warehouseCrList[li].fBusinessType) {
+            this.$message.error('应付费用第' + (Number(li) + 1) + '行业务类型为空，请维护业务类型')
+            return false
+          } else if (!this.warehouseCrList[li].fCorpid) {
+            this.$message.error('应付费用第' + (Number(li) + 1) + '行客户名称为空，请维护客户名称')
+            return false
+          } else if (!this.warehouseCrList[li].fFeeid) {
+            this.$message.error('应付费用第' + (Number(li) + 1) + '行费用名称为空，请维护费用名称')
+            return false
+          } else if (!this.warehouseCrList[li].fQty) {
+            this.$message.error('应付费用第' + (Number(li) + 1) + '行数量为空，请维护数量')
+            return false
+          } else if (!this.warehouseCrList[li].fUnitprice) {
+            this.$message.error('应付费用第' + (Number(li) + 1) + '行单价为空，请维护单价')
+            return false
+          }
+        }
+      }
+
+      let form = {
+        fId: this.form.fId,
+        fMblno: this.form.fMblno
+      }
+      let formData = new window.FormData()
+      for (let li in this.warehouseDrList) {
+        this.warehouseDrList[li].fMblno = this.form.fMblno
+        for (let item in this.nameOptions) {
+          if (this.warehouseDrList[li].fCorpid == this.nameOptions[item].fName) {
+            this.warehouseDrList[li].fCorpid = this.nameOptions[item].fId
+          }
+        }
+      }
+      for (let li in this.warehouseCrList) {
+        this.warehouseCrList[li].fMblno = this.form.fMblno
+      }
+      formData.append('tWarehousebills', JSON.stringify(form))
+      formData.append('tWarehousebillsCntritems', JSON.stringify(this.dataList))
+      formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
+      formData.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
+      cancellationFees(formData).then(response => {
+        this.$message.success('操作成功')
+        this.form.moneyStatus = 4
+        this.jumpDonot = false
+        this.modify = true
+        let data = {
+          actId: 460,
+          id: this.form.fId
+        }
+        getName(data).then(response => {
+          if (response.data.length != 0) {
+            this.before = response.data[0].userName
+            if (this.current == this.before) {
+              this.disappear = false
+            }
+          }
+        })
+                if (response.data.tWarehouseBills) {
+          this.form = response.data.tWarehouseBills
+          this.$set(this.form,'fPaymode',JSON.stringify(this.form.fPaymode))
+          this.$set(this.form,'fSign',JSON.stringify(this.form.fSign))
+          this.$set(this.form,'fDetentioncargo',JSON.stringify(this.form.fDetentioncargo))
+        }
+      if(response.data.tWarehousebillsCntrList){
+        this.goodsList = response.data.tWarehousebillsCntrList
+      }
+        if (response.data.tWarehousebillsCntritemsList !== null) {
+          this.dataList = response.data.tWarehousebillsCntritemsList
+        }else this.dataList = []
+        if (response.data.warehousebillsfeesCrList) {
+          this.warehouseCrList = response.data.warehousebillsfeesCrList
+          for (let item in this.warehouseCrList) {
+            this.$set(this.warehouseCrList[item], 'fFeeUnitid', JSON.stringify(this.warehouseCrList[item].fFeeunitid))
+          }
+        }
+        if (response.data.warehousebillsfeesDrList) {
+          this.warehouseDrList = response.data.warehousebillsfeesDrList
+          for (let item in this.warehouseDrList) {
+            this.$set(this.warehouseDrList[item], 'fFeeUnitid', JSON.stringify(this.warehouseDrList[item].fFeeunitid))
+          }
+        }
+      })
+
+    },
     //提交审批
     approval(res) {
       if (!this.form.fMblno) {