Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/api/warehouseBusiness/goodsTransfer.js

@@ -140,3 +140,13 @@ export function revokefeeCheck(id) {
     }
   })
 }
+// 提单号查询客户、仓库
+export function fromMblno(mblno) {
+  return request({
+    url: '/warehouseBusiness/goodsTransfer/corpOrWarehouseByMblno',
+    method: 'get',
+    params: {
+      mblno: mblno
+    }
+  })
+}

src/api/warehouseBusiness/warehouseInAndOutStock.js

@@ -164,3 +164,23 @@ export function matchWarehouse(data) {
     params: data
   })
 }
+// 费用明细单条审核
+export function feesCheck(id) {
+  return request({
+    url: '/warehouseBusiness/inAndOutStock/feeReview',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}
+// 费用明细单条撤销审核
+export function revokefeeCheck(id) {
+  return request({
+    url: '/warehouseBusiness/inAndOutStock/revokefeeReview',
+    method: 'get',
+    params: {
+      id: id
+    }
+  })
+}

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -3588,7 +3588,8 @@ export default {
           fWarehouseLocationids: e.fWarehouseLocationids,
           fTransferWarehouselocid: null,
           remark: null,
-          fSrcid: e.fId
+          fSrcid: e.fId,
+          fSrcBsdate: e.fBsdate,
         });
       });
       this.whgenlegVisible = false;
@@ -4752,6 +4753,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = { pageNum: 1, fDc: "D" };
@@ -4787,6 +4789,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = { pageNum: 1, fDc: "C" };
@@ -4835,6 +4838,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 1,
+              fStltypeid: '1',
             });
           } else {
             this.warehouseCrList.push({
@@ -4852,6 +4856,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 1,
+              fStltypeid: '1',
             });
           }
         });

src/views/Warehousing/cargoClearance/index.vue

@@ -529,7 +529,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: 1,
+        type: 2,
         fBillno: null,
         createBy: null,
         fTrademodeid: null,
@@ -743,7 +743,7 @@ export default {
     } else {
       nDay = 28
     }
-    this.queryParams.timeInterval = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + '23:59:59']
+    this.queryParams.timeInterval = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + ' 23:59:59']
 
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
@@ -1038,7 +1038,7 @@ export default {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        type: 1,
+        type: 2,
         fBillno: null,
         createBy: null,
         fTrademodeid: null,

src/views/Warehousing/components/incomeMoney.vue

@@ -895,6 +895,7 @@ export default {
             fMarks: this.form.fMarks,
             fBusinessType: this.form.fBusinessType,
             fSrcTypeId: 1,
+            fStltypeid: '1',
           });
         });
 

src/views/Warehousing/components/payMoney.vue

@@ -882,6 +882,7 @@ export default {
             fMarks: this.form.fMarks,
             fBusinessType: this.form.fBusinessType,
             fSrcTypeId: 1,
+            fStltypeid: '1',
           });
         });
         this.warehousingagreements = false;

src/views/Warehousing/costModify/index.vue

@@ -16,7 +16,7 @@
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
-              style="max-width: 199px"
+              style="max-width: 230px"
             />
           </el-form-item>
         </el-col>
@@ -27,12 +27,12 @@
               value-format="yyyy-MM-dd"
               clearable
               unlink-panels
-              style="width: 199px"
+              style="width: 230px"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               @keyup.enter.native="handleQuery"
-              v-model="queryParams.createTime"
+              v-model="queryParams.createTimeList"
             >
             </el-date-picker>
           </el-form-item>
@@ -47,10 +47,10 @@
               filterable
             >
               <el-option
-                v-for="(dict, index) in fMblnoOptions"
-                :key="index.fId"
-                :label="dict.fName"
-                :value="dict.fId"
+                v-for="(dict, index) in userOptions"
+                :key="index"
+                :label="dict.nickName"
+                :value="dict.userName"
               />
             </el-select>
           </el-form-item>
@@ -130,7 +130,7 @@
                   end-placeholder="结束日期"
                   unlink-panels
                   @keyup.enter.native="handleQuery"
-                  v-model="queryParams.fBstime"
+                  v-model="queryParams.bstimeList"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -381,6 +381,7 @@ import {
   treeselect,
   listWarehousesss,
 } from "@/api/basicdata/warehouse";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "costModify",
@@ -529,6 +530,7 @@ export default {
       warehouseId: null,
       disabledtwo: false,
       approVal: false,
+      userOptions: [],
     }
   },
   created() {
@@ -547,6 +549,9 @@ export default {
     listWarehousesss({fStatus: 0, delFlag: 0}).then((response) => {
       this.warehouseOptions = response.rows;
     });
+    listUser().then((response) => {
+      this.userOptions = response.rows;
+    });
   },
   activated() {
     if (this.$route.query.data) {
@@ -653,10 +658,22 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
+      if (this.queryParams.createTimeList) {
+        this.queryParams.createTimeList[0] = this.queryParams.createTimeList[0]+ " " + "00:00:00"
+        this.queryParams.createTimeList[1] = this.queryParams.createTimeList[1]+ " " + "23:59:59"
+      }
+      if (this.queryParams.bstimeList) {
+        this.queryParams.bstimeList[0] = this.queryParams.bstimeList[0]+ " " + "00:00:00"
+        this.queryParams.bstimeList[1] = this.queryParams.bstimeList[1]+ " " + "23:59:59"
+      }
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -2701,9 +2701,10 @@ export default {
     },
     // 改变提单号获取客户和仓库
     changeMblno() {
+      this.$set(this.form, "fCorpid", '')
+      this.$set(this.form, "fWarehouseid", '')
       if (this.form.fMblno) {
         fromMblno(this.form.fMblno).then(res => {
-          console.log(res)
           this.fGetMblnoOptions = res.data.corpsList
           this.warehouseOptions = res.data.warehouseList
         })
@@ -2827,7 +2828,8 @@ export default {
           fWarehouseLocationids: e.fWarehouseLocationids,
           fTransferWarehouselocid: null,
           remark: null,
-          fSrcid: e.fId
+          fSrcid: e.fId,
+          fSrcBsdate: e.fBsdate,
         });
       });
       this.whgenlegVisible = false;
@@ -3935,6 +3937,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = { pageNum: 1, fDc: "D" };
@@ -3970,6 +3973,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = { pageNum: 1, fDc: "C" };
@@ -4018,6 +4022,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 1,
+              fStltypeid: '1',
             });
           } else {
             this.warehouseCrList.push({
@@ -4035,6 +4040,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 1,
+              fStltypeid: '1',
             });
           }
         });

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -2134,7 +2134,7 @@
                   filterable
                   clearable
                   placeholder="客户名称"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                     v-for="(item, index) in fMblnoOptions"
@@ -2158,7 +2158,7 @@
                   clearable
                   filterable
                   placeholder="费用名称"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                     v-for="(item, index) in fDNameOptions"
@@ -2204,7 +2204,7 @@
                   v-model="scope.row.fFeeUnitid"
                   placeholder="请选择计价单位"
                   clearable
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -2228,7 +2228,7 @@
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fUnitprice"
                   placeholder="数量"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   @change="changeContractAmt(scope.row)"
                   show-word-limit
               />
@@ -2246,7 +2246,7 @@
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fQty"
                   placeholder="单价"
-                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
+                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                   @change="changeContractAmt(scope.row)"
                   show-word-limit
               />
@@ -2261,7 +2261,7 @@
           >
             <template slot-scope="scope">
               <el-input
-                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
+                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fAmount"
                   placeholder="金额"
@@ -2280,7 +2280,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"
@@ -2301,7 +2301,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fCurrency"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="币别"
                   show-word-limit
               />
@@ -2317,7 +2317,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fExrate"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="汇率"
                   show-word-limit
               />
@@ -2333,7 +2333,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fTaxrate"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="税率"
                   show-word-limit
               />
@@ -2349,7 +2349,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fMblno"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="提单号"
                   show-word-limit
               />
@@ -2365,7 +2365,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fProductName"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="品名"
                   show-word-limit
               />
@@ -2381,7 +2381,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fMarks"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="品牌"
                   show-word-limit
               />
@@ -2420,10 +2420,10 @@
               align="center"
               width="140px"
               label="业务单号"
-              :disabled="browseStatus"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fMblno" :disabled="browseStatus" placeholder="请输入业务单号"></el-input>
+              <el-input v-model="scope.row.fMblno" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入业务单号"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2434,7 +2434,7 @@
               label="唛头"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fMarks" :disabled="browseStatus" placeholder="请输入唛头"></el-input>
+              <el-input v-model="scope.row.fMarks" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入唛头"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2447,7 +2447,7 @@
             <template slot-scope="scope">
               <el-date-picker
                   style="width: 100%;"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   v-model="scope.row.fBsdate"
                   type="date"
                   placeholder="选择日期">
@@ -2465,7 +2465,7 @@
               <el-select
                   v-model="scope.row.fBillingway"
                   placeholder="请选择计费单位"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   clearable
               >
                 <el-option
@@ -2485,7 +2485,7 @@
               label="计费数量"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fBillingQty" :disabled="browseStatus" placeholder="请输入计费数量"></el-input>
+              <el-input v-model="scope.row.fBillingQty" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入计费数量"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2498,7 +2498,7 @@
             <template slot-scope="scope">
               <el-date-picker
                   style="width: 100%;"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   v-model="scope.row.fChargedate"
                   type="date"
                   placeholder="选择日期">
@@ -2515,7 +2515,7 @@
             <template slot-scope="scope">
               <el-date-picker
                   style="width: 100%;"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   v-model="scope.row.fBillingDeadline"
                   type="date"
                   placeholder="选择日期">
@@ -2530,7 +2530,7 @@
               label="计费天数"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fBillingDays" :disabled="browseStatus" placeholder="请输入计费天数"></el-input>
+              <el-input v-model="scope.row.fBillingDays" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入计费天数"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2541,7 +2541,7 @@
               label="库存天数"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fInventoryDays" :disabled="browseStatus" placeholder="请输入库存天数"></el-input>
+              <el-input v-model="scope.row.fInventoryDays" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入库存天数"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -2552,7 +2552,7 @@
               label="计费金额"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fAmt" :disabled="browseStatus" placeholder="请输入计费金额"
+              <el-input v-model="scope.row.fAmt" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入计费金额"
                         @change="calculationFAmt(scope.row)"></el-input>
             </template>
           </el-table-column>
@@ -2566,7 +2566,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.remark"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="备注"
                   show-word-limit
               />
@@ -2587,6 +2587,16 @@
               >移除
               </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>
@@ -2671,7 +2681,7 @@
                   filterable
                   clearable
                   placeholder="客户名称"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                     v-for="(item, index) in fMblnoOptions"
@@ -2695,7 +2705,7 @@
                   clearable
                   filterable
                   placeholder="费用名称"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
               >
                 <el-option
                     v-for="(item, index) in fCNameOptions"
@@ -2742,7 +2752,7 @@
                   v-model="scope.row.fFeeUnitid"
                   placeholder="请选择计价单位"
                   clearable
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -2765,7 +2775,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
@@ -2783,7 +2793,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
@@ -2818,7 +2828,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"
@@ -2840,7 +2850,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fCurrency"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="币别"
                   show-word-limit
               />
@@ -2856,7 +2866,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fExrate"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="汇率"
                   show-word-limit
               />
@@ -2872,7 +2882,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fTaxrate"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="税率"
                   show-word-limit
               />
@@ -2889,7 +2899,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fMblno"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="提单号"
                   show-word-limit
               />
@@ -2905,7 +2915,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fProductName"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="品名"
                   show-word-limit
               />
@@ -2922,7 +2932,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.fMarks"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="品牌"
                   show-word-limit
               />
@@ -2951,7 +2961,7 @@
             <template slot-scope="scope">
               <el-input
                   v-model="scope.row.remark"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   placeholder="备注"
                   show-word-limit
               />
@@ -2973,6 +2983,16 @@
               >移除
               </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>
@@ -4456,7 +4476,9 @@ import {
   ordersRevoke,
   checkCode,
   deliveryCalculation,
-  matchWarehouse
+  matchWarehouse,
+  feesCheck,
+  revokefeeCheck
 } from "@/api/warehouseBusiness/warehouseInAndOutStock";
 import {operationAgreement} from "@/api/agreement/agreement";
 import {listCorps} from "@/api/basicdata/corps";
@@ -7229,7 +7251,8 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
-              fBilltype: 'CDZZ'
+              fBilltype: 'CDZZ',
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = {pageNum: 1, fDc: "D"};
@@ -7265,6 +7288,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = {pageNum: 1, fDc: "C"};
@@ -7312,6 +7336,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 1,
+              fStltypeid: '1',
             });
           } else {
             this.warehouseCrList.push({
@@ -7329,6 +7354,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 1,
+              fStltypeid: '1',
             });
           }
         });
@@ -7701,6 +7727,34 @@ export default {
         query: { data: data},
       });
     },
+    // 费用明细请核
+    listCheck(row) {
+      feesCheck(row.fId).then(res => {
+        this.$message.success('请核成功')
+        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        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 => {
+        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        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 改变

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -8193,6 +8193,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = {pageNum: 1, fDc: "D"};
@@ -8783,6 +8784,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = {pageNum: 1, fDc: "C"};

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -4814,7 +4814,8 @@ export default {
           fDriverIdCar: this.whgenlegList.fDriverIdCar,
           fBusinessType: e.fBusinessType ? e.fBusinessType.toString() : null,
           fWarehouseInformation: e.fWarehouseids,
-          fSrcid: e.fId
+          fSrcid: e.fId,
+          fSrcBsdate: e.fBsdate,
         });
       });
       this.whgenlegVisible = false;
@@ -6695,7 +6696,8 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
-              fBilltype: 'SJCK'
+              fBilltype: 'SJCK',
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = {pageNum: 1, fDc: "D"};
@@ -6731,6 +6733,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = {pageNum: 1, fDc: "C"};
@@ -6780,6 +6783,7 @@ export default {
               fSrcTypeId: 1,
               fBillingway: e.fFeeUnitid,
               remark: e.remark,
+              fStltypeid: '1',
             });
           } else {
             this.warehouseCrList.push({
@@ -6797,6 +6801,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 1,
+              fStltypeid: '1',
             });
           }
         });

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -778,7 +778,6 @@
               <el-button
                 size="small"
                 type="info"
-                :disabled="browseStatus"
                 prop="打印"
                 @click="printZyd"
                 >作业单
@@ -2514,7 +2513,6 @@
         <el-button
           type="primary"
           size="mini"
-          :disabled="browseStatus"
           @click="
             print_zyd = false;
             addprint('zyd');
@@ -2637,7 +2635,6 @@
       <span slot="footer" class="dialog-footer">
         <el-button
           type="primary"
-          :disabled="browseStatus"
           @click="
             print_rkd = false;
             addprint('rkd');
@@ -2707,7 +2704,6 @@
       <span slot="footer" class="dialog-footer">
         <el-button
           type="primary"
-          :disabled="browseStatus"
           @click="
             addprint('shd');
             print_shd = false;
@@ -2797,7 +2793,6 @@
       <span slot="footer" class="dialog-footer">
         <el-button
           type="primary"
-          :disabled="browseStatus"
           @click="
             addprint('ykd');
             print_ykd = false;
@@ -2894,7 +2889,6 @@
       <span slot="footer" class="dialog-footer">
         <el-button
           type="primary"
-          :disabled="browseStatus"
           @click="
             addprint('ddd');
             print_ddd = false;
@@ -4169,7 +4163,8 @@ export default {
           fWarehouseLocationids: e.fWarehouseLocationids,
           fTransferWarehouselocid: null,
           remark: null,
-          fSrcid: e.fId
+          fSrcid: e.fId,
+          fSrcBsdate: e.fBsdate,
         });
       });
       this.whgenlegVisible = false;
@@ -5504,6 +5499,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = { pageNum: 1, fDc: "D" };
@@ -5539,6 +5535,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 0,
+              fStltypeid: '1',
             });
             this.fWbuOptions = [];
             let queryParams = { pageNum: 1, fDc: "C" };
@@ -5586,6 +5583,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 1,
+              fStltypeid: '1',
             });
           } else {
             this.warehouseCrList.push({
@@ -5603,6 +5601,7 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: 1,
+              fStltypeid: '1',
             });
           }
         });

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

@@ -767,7 +767,7 @@ export default {
         }
       });
     },
-    save() {
+    save(type) {
       if (this.form.fCorpid == null) {
         return this.$message.error("客户名称不能为空");
       }

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -332,7 +332,7 @@
               icon="el-icon-view"
               @click="handleUpdate(scope.row, true)"
               v-hasPermi="['warehouseBusiness:storageFeeCalculation:edit']"
-              v-if="scope.row.fBillstatus == '请核'  || scope.row.fBillstatus == '审核中' "
+              v-if="scope.row.fBillstatus == '请核'  || scope.row.fBillstatus == '审核中' || scope.row.fBillstatus == '提交审核'"
           >审批进度
           </el-button
           >