Browse Source

新增费用变更按钮

lichao 3 years ago
parent
commit
6d846b0ba8

+ 38 - 1
src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -1150,6 +1150,14 @@
               type="danger"
               >作业费协议</el-button
             >
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange('D')"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -1516,6 +1524,14 @@
               :disabled="browseStatus"
               >作业费协议</el-button
             >
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange('C')"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -2531,7 +2547,7 @@
         :total="whgenlegTotal"
         :page.sync="pageNum"
         :limit.sync="pageSize"
-        @pagination="getWhgenlegList"
+        @pagination="getWhgenlegList(key_id)"
       />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="zhgenlegData">导 入</el-button>
@@ -4480,6 +4496,8 @@ export default {
           type: "warning",
         });
       } else {
+        this.pageNum = 1;
+        this.pageSize = 10;
         this.dialogWhgenlegList = [];
         this.whgenlegTotal = 0;
         this.warehousingagreements = true;
@@ -5037,6 +5055,25 @@ export default {
           this.cancel();
         });
     },
+    feeChange(fDC) {
+      let data = {
+        form: {},
+        warehousebillsfeesCr: [],
+        warehousebillsfeesDr: [],
+        billType: 'cargoClearance',
+        fDc: fDC
+      }
+      data.form = this.form
+      if (fDC == 'C') {
+        data.warehousebillsfeesCr = this.warehouseCrList
+      } else {
+        data.warehousebillsfeesDr = this.warehouseDrList
+      }
+      this.$router.push({
+        path: "/business/costModify",
+        query: { data: data},
+      });
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

+ 63 - 15
src/views/Warehousing/components/incomeMoney.vue

@@ -39,6 +39,12 @@
             type="warning"
         >计算仓储费
         </el-button>
+        <el-button
+          type="primary"
+          size="small"
+          v-if="browseStatus"
+          @click="feeChange"
+        >费用变更</el-button>
       </div>
     </div>
     <el-table
@@ -66,7 +72,7 @@
               filterable
               clearable
               placeholder="客户名称"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
           >
             <el-option
                 v-for="(item, index) in fMblnoOptions"
@@ -90,7 +96,7 @@
               clearable
               filterable
               placeholder="费用名称"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
           >
             <el-option
                 v-for="(item, index) in fDNameOptions"
@@ -136,7 +142,7 @@
               v-model="scope.row.fFeeUnitid"
               placeholder="请选择计价单位"
               clearable
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
               @change="changeFeeUnit(scope.row)"
           >
             <el-option
@@ -160,7 +166,7 @@
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fQty"
               placeholder="数量"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
               @change="changeContractAmt(scope.row)"
               show-word-limit
           />
@@ -178,7 +184,7 @@
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fUnitprice"
               placeholder="单价"
-              :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
+              :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
               @change="changeContractAmt(scope.row)"
               show-word-limit
           />
@@ -195,7 +201,7 @@
           <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fAmount"
-              :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
+              :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
               placeholder="金额"
               show-word-limit
           />
@@ -212,7 +218,7 @@
           <el-select
               v-model="scope.row.fStltypeid"
               placeholder="请选择结算表票结、月结"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
           >
             <el-option
                 v-for="(item, index) in fStltypeOptions"
@@ -233,7 +239,7 @@
         <template slot-scope="scope">
           <el-input
               v-model="scope.row.fCurrency"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
               placeholder="币别"
               show-word-limit
           />
@@ -249,7 +255,7 @@
         <template slot-scope="scope">
           <el-input
               v-model="scope.row.fExrate"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
               placeholder="汇率"
               show-word-limit
           />
@@ -265,7 +271,7 @@
         <template slot-scope="scope">
           <el-input
               v-model="scope.row.fTaxrate"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
               placeholder="税率"
               show-word-limit
           />
@@ -281,7 +287,7 @@
         <template slot-scope="scope">
           <el-input
               v-model="scope.row.fMblno"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
               placeholder="提单号"
               show-word-limit
           />
@@ -297,7 +303,7 @@
         <template slot-scope="scope">
           <el-input
               v-model="scope.row.fProductName"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
               placeholder="品名"
               show-word-limit
           />
@@ -313,7 +319,7 @@
         <template slot-scope="scope">
           <el-input
               v-model="scope.row.fMarks"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
               placeholder="品牌"
               show-word-limit
           />
@@ -492,7 +498,7 @@
         <template slot-scope="scope">
           <el-input
               v-model="scope.row.Remarks"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
               placeholder="备注"
               show-word-limit
           />
@@ -508,9 +514,19 @@
           <el-button
               @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
               size="small"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
           >移除
           </el-button>
+          <el-button
+            size="small"
+            @click="listCheck(scope.row)"
+            v-if="scope.row.fBillstatus < 6"
+          >请核</el-button>
+          <el-button
+            size="small"
+            @click="revokeListCheck(scope.row)"
+            v-if="scope.row.fBillstatus == 6"
+          >撤销请核</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -638,6 +654,7 @@
 
 <script>
 import {operationAgreement} from "@/api/agreement/agreement";
+import {feesCheck,revokefeeCheck} from "@/api/warehouseBusiness/warehouseInStock";
 
 export default {
   props: {
@@ -704,6 +721,9 @@ export default {
     };
   },
   methods: {
+    feeChange() {
+      this.$emit("feeChangeD", 'D');
+    },
     saveForm() {
       this.$emit("chiSave");
     },
@@ -807,6 +827,8 @@ export default {
           type: "warning",
         });
       } else {
+        this.pageNum = 1;
+        this.pageSize = 10;
         this.dialogWhgenlegList = [];
         this.whgenlegTotal = 0;
         this.warehousingagreements = true;
@@ -878,6 +900,32 @@ export default {
         this.warehousingagreements = false;
       }
     },
+    // 费用明细请核
+    listCheck(row) {
+      feesCheck(row.fId).then(res => {
+        this.$message.success('请核成功')
+        if (res.data.fDc == 'D') {
+          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseDrList.splice(index, 1, res.data)
+        } else {
+          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseCrList.splice(index, 1, res.data)
+        }
+      })
+    },
+    // 费用明细撤销请核
+    revokeListCheck(row) {
+      revokefeeCheck(row.fId).then(res => {
+        this.$message.success('操作成功')
+        if (res.data.fDc == 'D') {
+          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseDrList.splice(index, 1, res.data)
+        } else {
+          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseCrList.splice(index, 1, res.data)
+        }
+      })
+    },
   },
   watch: {
     browseStatus(val) {

+ 64 - 28
src/views/Warehousing/components/payMoney.vue

@@ -31,14 +31,14 @@
           :disabled="browseStatus"
           >作业费协议</el-button
         >
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          size="small"-->
-<!--          v-if="browseStatus"-->
-<!--          @click="feeChange"-->
-<!--        >-->
-<!--          费用变更-->
-<!--        </el-button>-->
+        <el-button
+          type="primary"
+          size="small"
+          v-if="browseStatus"
+          @click="feeChange"
+        >
+          费用变更
+        </el-button>
       </div>
     </div>
     <el-table
@@ -65,7 +65,7 @@
             filterable
             clearable
             placeholder="客户名称"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
           >
             <el-option
               v-for="(item, index) in fMblnoOptions"
@@ -89,7 +89,7 @@
             clearable
             filterable
             placeholder="费用名称"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
           >
             <el-option
               v-for="(item, index) in fCNameOptions"
@@ -136,7 +136,7 @@
             v-model="scope.row.fFeeUnitid"
             placeholder="请选择计价单位"
             clearable
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             @change="changeFeeUnit(scope.row)"
           >
             <el-option
@@ -159,7 +159,7 @@
           <el-input
             oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
             v-model="scope.row.fQty"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             @change="changeContractAmt(scope.row)"
             placeholder="数量"
             show-word-limit
@@ -177,7 +177,7 @@
           <el-input
             oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
             v-model="scope.row.fUnitprice"
-            :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
+            :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
             @change="changeContractAmt(scope.row)"
             placeholder="单价"
             show-word-limit
@@ -212,7 +212,7 @@
           <el-select
             v-model="scope.row.fStltypeid"
             placeholder="请选择结算表票结、月结"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
           >
             <el-option
               v-for="(item, index) in fStltypeOptions"
@@ -234,7 +234,7 @@
         <template slot-scope="scope">
           <el-input
             v-model="scope.row.fCurrency"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             placeholder="币别"
             show-word-limit
           />
@@ -250,7 +250,7 @@
         <template slot-scope="scope">
           <el-input
             v-model="scope.row.fExrate"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             placeholder="汇率"
             show-word-limit
           />
@@ -266,7 +266,7 @@
         <template slot-scope="scope">
           <el-input
             v-model="scope.row.fTaxrate"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             placeholder="税率"
             show-word-limit
           />
@@ -283,7 +283,7 @@
         <template slot-scope="scope">
           <el-input
             v-model="scope.row.fMblno"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             placeholder="提单号"
             show-word-limit
           />
@@ -299,7 +299,7 @@
         <template slot-scope="scope">
           <el-input
             v-model="scope.row.fProductName"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             placeholder="品名"
             show-word-limit
           />
@@ -316,7 +316,7 @@
         <template slot-scope="scope">
           <el-input
             v-model="scope.row.fMarks"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             placeholder="品牌"
             show-word-limit
           />
@@ -344,7 +344,7 @@
         <template slot-scope="scope">
           <el-input
             v-model="scope.row.remarks"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             placeholder="备注"
             show-word-limit
           />
@@ -361,9 +361,19 @@
           <el-button
             @click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
             size="small"
-            :disabled="browseStatus"
+            :disabled="browseStatus || scope.row.fBillstatus == 6"
             >移除</el-button
           >
+          <el-button
+            size="small"
+            @click="listCheck(scope.row)"
+            v-if="scope.row.fBillstatus < 6"
+          >请核</el-button>
+          <el-button
+            size="small"
+            @click="revokeListCheck(scope.row)"
+            v-if="scope.row.fBillstatus == 6"
+          >撤销请核</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -490,6 +500,8 @@
 
 <script>
 import { operationAgreement } from "@/api/agreement/agreement";
+import {feesCheck,revokefeeCheck} from "@/api/warehouseBusiness/warehouseInStock";
+
 export default {
   name: 'payMoney',
   props: {
@@ -555,6 +567,9 @@ export default {
     };
   },
   methods: {
+    feeChange() {
+      this.$emit("feeChangeC", 'C');
+    },
     saveForm() {
       this.$emit("chiSave");
     },
@@ -641,6 +656,8 @@ export default {
           type: "warning",
         });
       } else {
+        this.pageNum = 1;
+        this.pageSize = 10;
         this.dialogWhgenlegList = [];
         this.whgenlegTotal = 0;
         this.warehousingagreements = true;
@@ -712,12 +729,31 @@ export default {
         this.warehousingagreements = false;
       }
     },
-    feeChange() {
-      this.$router.push({
-        path: "/business/costModify",
-        // query: { id: this.form.id},
-        query: { id: 1},
-      });
+    // 费用明细请核
+    listCheck(row) {
+      feesCheck(row.fId).then(res => {
+        this.$message.success('请核成功')
+        if (res.data.fDc == 'D') {
+          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseDrList.splice(index, 1, res.data)
+        } else {
+          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseCrList.splice(index, 1, res.data)
+        }
+      })
+    },
+    // 费用明细撤销请核
+    revokeListCheck(row) {
+      revokefeeCheck(row.fId).then(res => {
+        this.$message.success('操作成功')
+        if (res.data.fDc == 'D') {
+          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseDrList.splice(index, 1, res.data)
+        } else {
+          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseCrList.splice(index, 1, res.data)
+        }
+      })
     },
   },
   watch: {

+ 111 - 45
src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -660,12 +660,14 @@
               type="danger"
               >作业费协议</el-button
             >
-<!--            <el-button-->
-<!--              type="primary"-->
-<!--              size="small"-->
-<!--              v-if="browseStatus"-->
-<!--              @click="feeChange"-->
-<!--            >费用变更</el-button>-->
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange('D')"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -694,7 +696,7 @@
                 filterable
                 clearable
                 placeholder="客户名称"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -718,7 +720,7 @@
                 clearable
                 filterable
                 placeholder="费用名称"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fDNameOptions"
@@ -764,7 +766,7 @@
                 v-model="scope.row.fFeeUnitid"
                 placeholder="请选择计价单位"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -788,7 +790,7 @@
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fQty"
                 placeholder="数量"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 show-word-limit
               />
@@ -806,7 +808,7 @@
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fUnitprice"
                 placeholder="单价"
-                :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
+                :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 show-word-limit
               />
@@ -840,7 +842,7 @@
               <el-select
                 v-model="scope.row.fStltypeid"
                 placeholder="请选择结算表票结、月结"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fStltypeOptions"
@@ -861,7 +863,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fCurrency"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="币别"
                 show-word-limit
               />
@@ -877,7 +879,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fExrate"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="汇率"
                 show-word-limit
               />
@@ -893,7 +895,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fTaxrate"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="税率"
                 show-word-limit
               />
@@ -909,7 +911,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMblno"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="提单号"
                 show-word-limit
               />
@@ -925,7 +927,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fProductName"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品名"
                 show-word-limit
               />
@@ -941,7 +943,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMarks"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品牌"
                 show-word-limit
               />
@@ -970,7 +972,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.Remarks"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="备注"
                 show-word-limit
               />
@@ -986,9 +988,19 @@
               <el-button
                 @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
                 size="small"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 >移除</el-button
               >
+              <el-button
+                size="small"
+                @click="listCheck(scope.row)"
+                v-if="scope.row.fBillstatus < 6"
+              >请核</el-button>
+              <el-button
+                size="small"
+                @click="revokeListCheck(scope.row)"
+                v-if="scope.row.fBillstatus == 6"
+              >撤销请核</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -1032,12 +1044,14 @@
               :disabled="browseStatus"
               >作业费协议</el-button
             >
-<!--            <el-button-->
-<!--              type="primary"-->
-<!--              size="small"-->
-<!--              v-if="browseStatus"-->
-<!--              @click="feeChange"-->
-<!--            >费用变更</el-button>-->
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange('C')"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -1070,7 +1084,7 @@
                 filterable
                 clearable
                 placeholder="客户名称"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -1094,7 +1108,7 @@
                 clearable
                 filterable
                 placeholder="费用名称"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fCNameOptions"
@@ -1141,7 +1155,7 @@
                 v-model="scope.row.fFeeUnitid"
                 placeholder="请选择计价单位"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -1164,7 +1178,7 @@
               <el-input
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fQty"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 placeholder="数量"
                 show-word-limit
@@ -1182,7 +1196,7 @@
               <el-input
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fUnitprice"
-                :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
+                :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 placeholder="单价"
                 show-word-limit
@@ -1217,7 +1231,7 @@
               <el-select
                 v-model="scope.row.fStltypeid"
                 placeholder="请选择结算表票结、月结"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fStltypeOptions"
@@ -1239,7 +1253,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fCurrency"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="币别"
                 show-word-limit
               />
@@ -1255,7 +1269,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fExrate"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="汇率"
                 show-word-limit
               />
@@ -1271,7 +1285,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fTaxrate"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="税率"
                 show-word-limit
               />
@@ -1288,7 +1302,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMblno"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="提单号"
                 show-word-limit
               />
@@ -1304,7 +1318,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fProductName"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品名"
                 show-word-limit
               />
@@ -1321,7 +1335,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMarks"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品牌"
                 show-word-limit
               />
@@ -1349,7 +1363,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.remarks"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="备注"
                 show-word-limit
               />
@@ -1366,9 +1380,19 @@
               <el-button
                 @click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
                 size="small"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 >移除</el-button
               >
+              <el-button
+                size="small"
+                @click="listCheck(scope.row)"
+                v-if="scope.row.fBillstatus < 6"
+              >请核</el-button>
+              <el-button
+                size="small"
+                @click="revokeListCheck(scope.row)"
+                v-if="scope.row.fBillstatus == 6"
+              >撤销请核</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -1677,7 +1701,7 @@
         :total="whgenlegTotal"
         :page.sync="pageNum"
         :limit.sync="pageSize"
-        @pagination="getWhgenlegList"
+        @pagination="getWhgenlegList(key_id)"
       />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="zhgenlegData">导 入</el-button>
@@ -1773,6 +1797,8 @@ import {
   delgoodsTransfer_s,
   exportgoodsTransfer,
   updateCredit,
+  feesCheck,
+  revokefeeCheck
 } from "@/api/warehouseBusiness/goodsTransfer";
 import { operationAgreement } from "@/api/agreement/agreement";
 import { listCorps } from "@/api/basicdata/corps";
@@ -2862,7 +2888,7 @@ export default {
               }
             });
           });
-          this.msgSuccess("调拨成功");
+          this.msgSuccess("货转成功");
           this.$set(this.form, "fItemsStatus", 4);
         }
       });
@@ -3513,6 +3539,8 @@ export default {
           type: "warning",
         });
       } else {
+        this.pageNum = 1;
+        this.pageSize = 10;
         this.dialogWhgenlegList = [];
         this.whgenlegTotal = 0;
         this.warehousingagreements = true;
@@ -3896,13 +3924,51 @@ export default {
           this.cancel();
         });
     },
-    feeChange() {
+    feeChange(fDC) {
+      let data = {
+        form: {},
+        warehousebillsfeesCr: [],
+        warehousebillsfeesDr: [],
+        billType: 'outStock',
+        fDc: fDC
+      }
+      data.form = this.form
+      if (fDC == 'C') {
+        data.warehousebillsfeesCr = this.warehouseCrList
+      } else {
+        data.warehousebillsfeesDr = this.warehouseDrList
+      }
       this.$router.push({
         path: "/business/costModify",
-        // query: { id: this.form.id},
-        query: { id: 1},
+        query: { data: data},
       });
     },
+    // 费用明细请核
+    listCheck(row) {
+      feesCheck(row.fId).then(res => {
+        this.$message.success('请核成功')
+        if (res.data.fDc == 'D') {
+          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseDrList.splice(index, 1, res.data)
+        } else {
+          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseCrList.splice(index, 1, res.data)
+        }
+      })
+    },
+    // 费用明细撤销请核
+    revokeListCheck(row) {
+      revokefeeCheck(row.fId).then(res => {
+        this.$message.success('操作成功')
+        if (res.data.fDc == 'D') {
+          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseDrList.splice(index, 1, res.data)
+        } else {
+          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseCrList.splice(index, 1, res.data)
+        }
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

+ 40 - 1
src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -2096,6 +2096,14 @@
                 type="warning"
             >计算仓储费
             </el-button>
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange('D')"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -2146,6 +2154,7 @@
               <el-select
                   v-model="scope.row.fFeeid"
                   clearable
+                  filterable
                   placeholder="费用名称"
                   :disabled="browseStatus"
               >
@@ -2619,6 +2628,14 @@
             >作业费协议
             </el-button
             >
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange('D')"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -2673,6 +2690,7 @@
               <el-select
                   v-model="scope.row.fFeeid"
                   clearable
+                  filterable
                   placeholder="费用名称"
                   :disabled="browseStatus"
               >
@@ -4331,7 +4349,7 @@
           :total="whgenlegTotal"
           :page.sync="pageNum"
           :limit.sync="pageSize"
-          @pagination="getWhgenlegList"
+          @pagination="getWhgenlegList(key_id)"
       />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="zhgenlegData">导 入</el-button>
@@ -6637,6 +6655,8 @@ export default {
           type: "warning",
         });
       } else {
+        this.pageNum = 1;
+        this.pageSize = 10;
         this.dialogWhgenlegList = [];
         this.whgenlegTotal = 0;
         this.warehousingagreements = true;
@@ -7638,6 +7658,25 @@ export default {
             this.cancel();
           });
     },
+    feeChange(fDC) {
+      let data = {
+        form: {},
+        warehousebillsfeesCr: [],
+        warehousebillsfeesDr: [],
+        billType: 'outStock',
+        fDc: fDC
+      }
+      data.form = this.form
+      if (fDC == 'C') {
+        data.warehousebillsfeesCr = this.warehouseCrList
+      } else {
+        data.warehousebillsfeesDr = this.warehouseDrList
+      }
+      this.$router.push({
+        path: "/business/costModify",
+        query: { data: data},
+      });
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

+ 37 - 10
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1322,16 +1322,16 @@
                 fixed="right"
             >
               <template slot-scope="scope">
-<!--                <el-button-->
-<!--                  type="text"-->
-<!--                  size="small"-->
-<!--                  disabled-->
-<!--                >提交</el-button>-->
-<!--                <el-button-->
-<!--                  type="text"-->
-<!--                  size="small"-->
-<!--                  disabled-->
-<!--                >撤销</el-button>-->
+                <el-button
+                  type="text"
+                  size="small"
+                  @click="listCheck"
+                >请核</el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click="revokeListCheck"
+                >撤销请核</el-button>
                 <el-button
                     :disabled="browseStatus || scope.row.fBillstatus > 30"
                     type="text"
@@ -1384,6 +1384,7 @@
             :browseStatus="browseStatus"
             @chiSave="saveForm"
             @chiAdd="addCollection"
+            @feeChangeD="feeChange"
             :warehouseDrList="warehouseDrList"
             :businessTypeOption="businessTypeOption"
             :fDNameOptions="fDNameOptions"
@@ -1412,6 +1413,7 @@
             @chiAdd="addpayment"
             @checkRow="checkRow"
             @revokeRow="revokeRow"
+            @feeChangeC="feeChange"
             :warehouseCrList="warehouseCrList"
             :businessTypeOption="businessTypeOption"
             :fCNameOptions="fCNameOptions"
@@ -6109,6 +6111,7 @@ import {
   checkCode,
   queryClerkRoleList,
   pleaseCheck,
+  feesCheck
 } from "@/api/warehouseBusiness/warehouseInStock";
 import {operationAgreement} from "@/api/agreement/agreement";
 import {listCorps} from "@/api/basicdata/corps";
@@ -9048,6 +9051,30 @@ export default {
         this.$set(this.form, 'fPlangrossweight', this.form.fPlannetweight)
       }
     },
+    // 费用明细撤销请核
+    revokeListCheck() {},
+    // 费用明细请核
+    listCheck() {
+      feesCheck().then(res => {})
+    },
+    feeChange(fDC) {
+      let data = {
+        form: this.form,
+        warehousebillsfeesCr: [],
+        warehousebillsfeesDr: [],
+        billType: 'inStock',
+        fDc: fDC
+      }
+      if (fDC == 'C') {
+        data.warehousebillsfeesCr = this.warehouseCrList
+      } else {
+        data.warehousebillsfeesDr = this.warehouseDrList
+      }
+      this.$router.push({
+        path: "/business/costModify",
+        query: { data: data},
+      });
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

+ 4 - 3
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -1341,7 +1341,7 @@
             </template>
           </el-table-column>
           <el-table-column
-              prop="fFeeunitid"
+              prop="fFeeUnitid"
               header-align="center"
               align="center"
               width="180px"
@@ -1349,7 +1349,7 @@
           >
             <template slot-scope="scope">
               <el-select
-                  v-model="scope.row.fFeeunitid"
+                  v-model="scope.row.fFeeUnitid"
                   placeholder="请选择计价单位"
                   clearable
                   :disabled="browseStatus || scope.row.fBillstatus == 6"
@@ -1544,7 +1544,8 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+              <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
 

+ 112 - 44
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -1476,12 +1476,14 @@
               type="danger"
               >作业费协议</el-button
             >
-<!--            <el-button-->
-<!--              type="primary"-->
-<!--              size="small"-->
-<!--              v-if="browseStatus"-->
-<!--              @click="feeChange"-->
-<!--            >费用变更</el-button>-->
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange('D')"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -1510,7 +1512,7 @@
                 filterable
                 clearable
                 placeholder="客户名称"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -1534,7 +1536,7 @@
                 clearable
                 filterable
                 placeholder="费用名称"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fDNameOptions"
@@ -1580,7 +1582,7 @@
                 v-model="scope.row.fFeeUnitid"
                 placeholder="请选择计价单位"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -1604,7 +1606,7 @@
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fQty"
                 placeholder="数量"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 show-word-limit
               />
@@ -1622,7 +1624,7 @@
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fUnitprice"
                 placeholder="单价"
-                :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
+                :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 show-word-limit
               />
@@ -1656,7 +1658,7 @@
               <el-select
                 v-model="scope.row.fStltypeid"
                 placeholder="请选择结算表票结、月结"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fStltypeOptions"
@@ -1677,7 +1679,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fCurrency"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="币别"
                 show-word-limit
               />
@@ -1693,7 +1695,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fExrate"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="汇率"
                 show-word-limit
               />
@@ -1709,7 +1711,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fTaxrate"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="税率"
                 show-word-limit
               />
@@ -1725,7 +1727,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMblno"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="提单号"
                 show-word-limit
               />
@@ -1741,7 +1743,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fProductName"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品名"
                 show-word-limit
               />
@@ -1757,7 +1759,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMarks"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品牌"
                 show-word-limit
               />
@@ -1786,7 +1788,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.Remarks"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="备注"
                 show-word-limit
               />
@@ -1802,9 +1804,19 @@
               <el-button
                 @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
                 size="small"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 >移除</el-button
               >
+              <el-button
+                size="small"
+                @click="listCheck(scope.row)"
+                v-if="scope.row.fBillstatus < 6"
+              >请核</el-button>
+              <el-button
+                size="small"
+                @click="revokeListCheck(scope.row)"
+                v-if="scope.row.fBillstatus == 6"
+              >撤销请核</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -1848,12 +1860,14 @@
               :disabled="browseStatus"
               >作业费协议</el-button
             >
-<!--            <el-button-->
-<!--              type="primary"-->
-<!--              size="small"-->
-<!--              v-if="browseStatus"-->
-<!--              @click="feeChange"-->
-<!--            >费用变更</el-button>-->
+            <el-button
+              type="primary"
+              size="small"
+              v-if="browseStatus"
+              @click="feeChange('C')"
+            >
+              费用变更
+            </el-button>
           </div>
         </div>
         <el-table
@@ -1886,7 +1900,7 @@
                 filterable
                 clearable
                 placeholder="客户名称"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -1910,7 +1924,7 @@
                 clearable
                 filterable
                 placeholder="费用名称"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fCNameOptions"
@@ -1957,7 +1971,7 @@
                 v-model="scope.row.fFeeUnitid"
                 placeholder="请选择计价单位"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -1980,7 +1994,7 @@
               <el-input
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fQty"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 placeholder="数量"
                 show-word-limit
@@ -1998,7 +2012,7 @@
               <el-input
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fUnitprice"
-                :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
+                :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 placeholder="单价"
                 show-word-limit
@@ -2033,7 +2047,7 @@
               <el-select
                 v-model="scope.row.fStltypeid"
                 placeholder="请选择结算表票结、月结"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                   v-for="(item, index) in fStltypeOptions"
@@ -2055,7 +2069,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fCurrency"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="币别"
                 show-word-limit
               />
@@ -2071,7 +2085,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fExrate"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="汇率"
                 show-word-limit
               />
@@ -2087,7 +2101,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fTaxrate"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="税率"
                 show-word-limit
               />
@@ -2104,7 +2118,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMblno"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="提单号"
                 show-word-limit
               />
@@ -2120,7 +2134,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fProductName"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品名"
                 show-word-limit
               />
@@ -2137,7 +2151,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMarks"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品牌"
                 show-word-limit
               />
@@ -2165,7 +2179,7 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.remarks"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="备注"
                 show-word-limit
               />
@@ -2182,9 +2196,19 @@
               <el-button
                 @click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
                 size="small"
-                :disabled="browseStatus"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
                 >移除</el-button
               >
+              <el-button
+                size="small"
+                @click="listCheck(scope.row)"
+                v-if="scope.row.fBillstatus < 6"
+              >请核</el-button>
+              <el-button
+                size="small"
+                @click="revokeListCheck(scope.row)"
+                v-if="scope.row.fBillstatus == 6"
+              >撤销请核</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -2973,7 +2997,7 @@
         :total="whgenlegTotal"
         :page.sync="pageNum"
         :limit.sync="pageSize"
-        @pagination="getWhgenlegList"
+        @pagination="getWhgenlegList(key_id)"
       />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="zhgenlegData">导 入</el-button>
@@ -3076,6 +3100,8 @@ import {
   submitWarehousingApproval,
   ordersRevoke,
   checkCode,
+  feesCheck,
+  revokefeeCheck
 } from "@/api/warehouseBusiness/stockTransfer";
 import { operationAgreement } from "@/api/agreement/agreement";
 import { listCorps } from "@/api/basicdata/corps";
@@ -4994,6 +5020,8 @@ export default {
           type: "warning",
         });
       } else {
+        this.pageNum = 1;
+        this.pageSize = 10;
         this.dialogWhgenlegList = [];
         this.whgenlegTotal = 0;
         this.warehousingagreements = true;
@@ -5595,13 +5623,53 @@ export default {
           this.cancel();
         });
     },
-    feeChange() {
+    feeChange(fDC) {
+      let data = {
+        form: {},
+        warehousebillsfeesCr: [],
+        warehousebillsfeesDr: [],
+        billType: 'outStock',
+        fDc: fDC
+      }
+      data.form = this.form
+      if (fDC == 'C') {
+        data.warehousebillsfeesCr = this.warehouseCrList
+      } else {
+        data.warehousebillsfeesDr = this.warehouseDrList
+      }
       this.$router.push({
         path: "/business/costModify",
-        // query: { id: this.form.id},
-        query: { id: 1},
+        query: { data: data},
       });
     },
+    // 费用明细请核
+    listCheck(row) {
+      feesCheck(row.fId).then(res => {
+        this.$message.success('请核成功')
+        if (res.data.fDc == 'D') {
+          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseDrList.splice(index, 1, res.data)
+        } else {
+          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseCrList.splice(index, 1, res.data)
+        }
+        console.log(res)
+      })
+    },
+    // 费用明细撤销请核
+    revokeListCheck(row) {
+      revokefeeCheck(row.fId).then(res => {
+        this.$message.success('操作成功')
+        if (res.data.fDc == 'D') {
+          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseDrList.splice(index, 1, res.data)
+        } else {
+          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+          this.warehouseCrList.splice(index, 1, res.data)
+        }
+        console.log(this.warehouseDrList)
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变