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

src/api/finance/query.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询主列表
+export function getList(data) {
+  return request({
+    url: '/warehouseBusiness/warehousebillsfees/queryMenuList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 导出
+export function exportList(data) {
+  return request({
+    url: '/warehouseBusiness/warehousebillsfees/queryMenuExport',
+    method: 'get',
+    params: data
+  })
+}

src/api/warehouseBusiness/warehouseInStock.js

@@ -147,6 +147,14 @@ export function detailStock(query) {
     params: query
   })
 }
+//详情列表（新）
+export function getDetailStock(query) {
+  return request({
+    url: 'warehouseBusiness/whgenleg/detailsList',
+    method: 'get',
+    params: query
+  })
+}
 
 //主表审核
 export function submitWarehousingApproval(data) {

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -1488,11 +1488,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -1881,11 +1883,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>

src/views/Warehousing/cargoClearance/index.vue

@@ -124,18 +124,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="录入" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="驳回" value="3"></el-option>
-                    <el-option label="请核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="全部入账" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -542,6 +539,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -661,7 +659,7 @@ export default {
         },
         {
           surface: "16",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1051,6 +1049,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/components/incomeMoney.vue

@@ -515,17 +515,19 @@
           <el-button
               @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
               size="small"
-              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              :disabled="scope.row.fBillstatus == 6 || browseStatus"
           >移除
           </el-button>
           <el-button
             size="small"
             @click="listCheck(scope.row)"
             v-if="scope.row.fBillstatus < 6"
+            :disabled="browseStatus"
           >请核</el-button>
           <el-button
             size="small"
             @click="revokeListCheck(scope.row)"
+            :disabled="browseStatus"
             v-if="scope.row.fBillstatus == 6"
           >撤销请核</el-button>
         </template>

src/views/Warehousing/components/payMoney.vue

@@ -377,11 +377,13 @@
             size="small"
             @click="listCheck(scope.row)"
             v-if="scope.row.fBillstatus < 6"
+            :disabled="browseStatus"
           >请核</el-button>
           <el-button
             size="small"
             @click="revokeListCheck(scope.row)"
             v-if="scope.row.fBillstatus == 6"
+            :disabled="browseStatus"
           >撤销请核</el-button>
         </template>
       </el-table-column>

src/views/Warehousing/costModify/AddOrUpdate.vue

@@ -894,14 +894,14 @@ export default {
         fSrcTypeId: 10,
         fBillstatus: null,
         actId: 1000,
-        fBilltype: this.form.fBilltype
+        fBilltype: this.form.fBilltype,
+        fStltypeid: 1,
       }
       console.log(list)
       this.formfeesList.push(list)
     },
     //变更按钮
     change(row){
-      console.log(row)
       let list = JSON.parse(JSON.stringify(row))
       list.fId = ''
       list.fBillstatus = ''

src/views/Warehousing/costModify/index.vue

@@ -536,6 +536,7 @@ export default {
   created() {
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
+    this.getRow()
     this.getList();
     this.getDicts("data_billtype_type").then((response) => {
       this.billTypeList = response.data;
@@ -842,7 +843,7 @@ export default {
     save() {
       this.showSetting = false;
       this.data = {
-        tableName: "船舶信息",
+        tableName: "费用变更",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList,
       };
@@ -850,6 +851,31 @@ export default {
         this.getRowList = this.setRowList.filter((e) => e.checked == 0);
       });
     },
+    //查询列数据
+    getRow() {
+      let that = this;
+      this.data = {
+        tableName: "费用变更",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList = res.data.filter((e) => e.checked == 0);
+          this.setRowList = res.data;
+          this.setRowList = this.setRowList.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
+            return res;
+          }, []);
+        }
+      });
+    },
   }
 }
 </script>

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -1001,11 +1001,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -1402,11 +1404,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>

src/views/Warehousing/goodsTransfer/index.vue

@@ -123,18 +123,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="保存" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="审批驳回" value="3"></el-option>
-                    <el-option label="提交审核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="审核完成" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -536,6 +533,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -570,7 +568,7 @@ export default {
         },
         {
           surface: "14",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1071,6 +1069,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/inAndOutStock/index.vue

@@ -122,18 +122,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="录入" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="驳回" value="3"></el-option>
-                    <el-option label="请核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="全部入账" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -466,6 +463,11 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
+              v-if="
+                scope.row.fBillstatus == '录入' ||
+                scope.row.fBillstatus == '暂存' ||
+                scope.row.fBillstatus == '驳回'
+              "
               @click="handleDelete(scope.row)"
               v-hasPermi="['warehouseBusiness:outStock:remove']"
               >删除
@@ -553,6 +555,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus:null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -693,7 +696,7 @@ export default {
         },
         {
           surface: "19",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1005,6 +1008,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -215,6 +215,7 @@
                 :disabled="detailList.findIndex(function(item){return item.fWarehouseInformation}) == -1?false:true"
                 style="width: 80%"
                 placeholder="请选择"
+                @change="warehouseChange"
             >
               <el-option
                   v-for="(item, index) in warehouseOptions"
@@ -1331,6 +1332,13 @@
                       v-Alphabet
                   />
                 </span>
+                <span v-else-if="item.label == 'fSerialNumber'">
+                  <el-input
+                    v-model="scope.row.fSerialNumber"
+                    placeholder="流水号"
+                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                  />
+                </span>
                 <span v-else>{{ scope.row[item.label] }}</span>
               </template>
             </el-table-column>
@@ -1856,7 +1864,7 @@
             <div>
             </div>
             <div>
-              <div>流水号：{{ form.fBillno }}</div>
+              <div>办单号：{{ form.fBillno }}</div>
               <div>办单日期：{{ nowTime }}</div>
             </div>
           </div>
@@ -6261,6 +6269,7 @@ import upLoad from "../components/upLoad";
 import incomeMoney from "../components/incomeMoney";
 import payMoney from "../components/payMoney";
 import uploadExcel from "./uploadExcel";
+import { getDept } from "@/api/basicdata/dept";
 
 export default {
   name: "inStock",
@@ -8134,21 +8143,6 @@ export default {
                           this.relevantAttachments = response.data.enclosures;
                         }
                       }
-                      // else {
-                      //   this.approvalStatus = false;
-                      //   this.browseStatus = false;
-                      //   this.$set(this.form, "fId", null);
-                      //   this.$set(this.form, "fMblno", null);
-                      //   this.$set(this.form, "fMarks", null);
-                      //   this.$set(this.form, "fProductName", null);
-                      //   this.$set(this.form, "warehouseStatus", null);
-                      //   this.$set(this.form, "fBillstatus", null);
-                      //   this.$set(this.form, "fItemsStatus", null);
-                      //   this.$set(this.form, "fNetweight", 0);
-                      //   this.$set(this.form, "fPlanvolumn", 0);
-                      //   this.$set(this.form, "fGrossweight", 0);
-                      //   // this.recordStatus = true
-                      // }
                     });
                     if (status == "goBack") {
                       this.cancel();
@@ -9279,6 +9273,13 @@ export default {
         query: { data: data},
       });
     },
+    // 获取仓库信息
+    warehouseChange() {
+      getDept(this.form.fWarehouseid).then(res => {
+        this.$set(this.form, 'fContacts', res.data.fContacts)
+        this.$set(this.form, 'fTel', res.data.fTel)
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/inStock/index.vue

@@ -125,18 +125,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="录入" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="驳回" value="3"></el-option>
-                    <el-option label="请核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="全部入账" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -457,7 +454,7 @@
           :height="tableHeight"
           @expand-change="expandChange"
         >
-          <el-table-column type="selection" fixed align="center" />
+          <el-table-column type="selection" fixed align="center" width="58" />
           <el-table-column type="expand" fixed="left">
             <template slot-scope="props">
               <el-table
@@ -645,6 +642,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -789,7 +787,7 @@ export default {
         },
         {
           surface: "19",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1293,6 +1291,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -193,6 +193,7 @@
               "
                 style="width: 80%"
                 placeholder="请选择"
+                @change="warehouseChange"
             >
               <el-option
                   v-for="(item, index) in form.fMblno && form.fCorpid && !form.fId?warehouseSwitching:warehouseOptions"
@@ -1152,6 +1153,13 @@
                       :disabled="browseStatus || scope.row.fBillstatus >= 40"
                   />
                 </span>
+                <span v-else-if="item.label == 'fSerialNumber'">
+                  <el-input
+                    v-model="scope.row.fSerialNumber"
+                    placeholder="流水号"
+                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                  />
+                </span>
                 <span v-else-if="item.label == 'remark'">
                   <el-input
                       v-model="scope.row.remark"
@@ -1741,11 +1749,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -2143,11 +2153,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -2511,7 +2523,7 @@
             <div>
             </div>
             <div>
-              <div>流水号：{{ Printinglist.length > 0 ? Printinglist[0].fSerialNumber : '' }}</div>
+              <div>办单号：{{ Printinglist.length > 0 ? Printinglist[0].fSerialNumber : '' }}</div>
               <div>办单日期：{{ nowTime }}</div>
             </div>
           </div>
@@ -2758,7 +2770,7 @@
               <td style="width: 8%;"><span class="no-print">合 同 号</span></td>
               <td style="width: 13%;">{{ Printinglist.length === 1 ? Printinglist[0].fSerialNumber : '' }}</td>
               <td style="width: 9%;"><span class="no-print">品 名</span></td>
-              <td style="width: 16%;">{{ Printinglist.length === 1 ? Printinglist[0].fGoodsid : '' }}</td>
+              <td style="width: 16%;">{{ Printinglist.length === 1 ? Printinglist[0].fGoodsids : '' }}</td>
             </tr>
             <tr>
               <td><span class="no-print">件 数</span></td>
@@ -2779,7 +2791,7 @@
             </tr>
             <tr>
               <td><span class="no-print">出库日</span></td>
-              <td>{{ Printinglist.length === 1 ? Printinglist[0].fBsdate : '' }}</td>
+              <td>{{ Printinglist.length === 1 ? Printinglist[0].time : '' }}</td>
               <td><span class="no-print">预计到厂日</span></td>
               <td>{{ form.fPredictBranch ? form.fPredictBranch : '' }}</td>
               <td><span class="no-print">等级</span></td>
@@ -3864,6 +3876,8 @@ import upLoad from "../components/upLoad";
 import draggable from "vuedraggable";
 import {queryClerkRoleList} from "@/api/warehouseBusiness/warehouseInStock";
 import { listCharge } from "@/api/system/viewApproval";
+import { getDept } from "@/api/basicdata/dept";
+
 
 export default {
   name: "inStock",
@@ -4378,6 +4392,12 @@ export default {
     },
   },
   created() {
+    const aaa = new Date(1639440000000)
+    const year = aaa.getFullYear();
+    const month = aaa.getMonth() + 1;
+    const day = aaa.getDate();
+    const timeFormat = year + "-" + month + "-" + day;
+    console.log(timeFormat)
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.setRowList2 = this.tableDate2;
@@ -6490,7 +6510,9 @@ export default {
         await addJoblist(formData).then((response) => {
           if (response.code == 200) {
             this.Printinglist.forEach((item, index) => {
-              item.fSerialNumber = response.data.warehousebillsitems[index].fSerialNumber
+              if (!item.fSerialNumber) {
+                this.$set(item, 'fSerialNumber', response.data.warehousebillsitems[index].fSerialNumber)
+              }
             })
             for (let item in this.detailList) {
               this.zcList[item] = this.detailList[item]
@@ -6648,6 +6670,14 @@ export default {
             } else if (command == "c") {
               this.print_lhd = true;
             } else if (command == "q") {
+              this.Printinglist.forEach(item => {
+                const dateMat = new Date(item.fBsdate);
+                const year = dateMat.getFullYear();
+                const month = dateMat.getMonth() + 1;
+                const day = dateMat.getDate();
+                const time = year + "-" + month + "-" + day;
+                this.$set(item, 'time', time)
+              })
               this.print_signFor = true;
             } else if (command == "d") {
               let date = new Date();
@@ -7360,6 +7390,13 @@ export default {
         }
       })
     },
+    // 获取仓库信息
+    warehouseChange() {
+      getDept(this.form.fWarehouseid).then(res => {
+        this.$set(this.form, 'fContacts', res.data.fContacts)
+        this.$set(this.form, 'fTel', res.data.fTel)
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/outStock/index.vue

@@ -124,18 +124,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="录入" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="驳回" value="3"></el-option>
-                    <el-option label="请核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="全部入账" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -558,6 +555,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -698,7 +696,7 @@ export default {
         },
         {
           surface: "19",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -996,10 +994,10 @@ export default {
             }
           }, 0);
           if (column.property === "fGrossweight") {
-            sums[index] = sums[index].toFixed(4) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           }
           if (column.property === "fNetweight") {
-            sums[index] = sums[index].toFixed(4) + "吨";
+            sums[index] = (sums[index] / 1000).toFixed(4) + "吨";
           }
           if (column.property === "fQty") {
             // sums[index] = sums[index].toFixed(2);
@@ -1129,6 +1127,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -198,6 +198,7 @@
               :disabled="browseStatus || detailList.length > 0"
               style="width: 80%"
               placeholder="请选择"
+              @change="warehouseChange"
             >
               <el-option
                 v-for="(item, index) in warehouseOptions"
@@ -1046,6 +1047,13 @@
                     :disabled="browseStatus || scope.row.fBillstatus >= 40"
                   />
                 </span>
+                <span v-else-if="item.label == 'fSerialNumber'">
+                  <el-input
+                    v-model="scope.row.fSerialNumber"
+                    placeholder="流水号"
+                    :disabled="browseStatus || scope.row.fBillstatus >= 40"
+                  />
+                </span>
                 <span v-else-if="item.label == 'remark'">
                   <el-input
                     v-model="scope.row.remark"
@@ -1813,11 +1821,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -2214,11 +2224,13 @@
                 size="small"
                 @click="listCheck(scope.row)"
                 v-if="scope.row.fBillstatus < 6"
+                :disabled="browseStatus"
               >请核</el-button>
               <el-button
                 size="small"
                 @click="revokeListCheck(scope.row)"
                 v-if="scope.row.fBillstatus == 6"
+                :disabled="browseStatus"
               >撤销请核</el-button>
             </template>
           </el-table-column>
@@ -3269,6 +3281,8 @@ import Cookies from "js-cookie";
 import { addSet, select, resetModule } from "@/api/system/set";
 import upLoad from "../components/upLoad";
 import draggable from "vuedraggable";
+import { getDept } from "@/api/basicdata/dept";
+
 export default {
   name: "inStock",
   props: {
@@ -5999,6 +6013,12 @@ export default {
         this.$message.error("请选择需要打印的明细!");
       }
     },
+    warehouseChange() {
+      getDept(this.form.fWarehouseid).then(res => {
+        this.$set(this.form, 'fContacts', res.data.fContacts)
+        this.$set(this.form, 'fTel', res.data.fTel)
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/stockTransfer/index.vue

@@ -124,18 +124,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="费用状态" prop="fBillstatus">
+                <el-form-item label="费用状态" prop="fFeeStatus">
                   <el-select
                     style="width: 200px"
-                    v-model="queryParams.fBillstatus"
+                    v-model="queryParams.fFeeStatus"
                     placeholder="请选择费用状态"
                   >
-                    <el-option label="录入" value="1"></el-option>
-                    <el-option label="暂存" value="2"></el-option>
-                    <el-option label="驳回" value="3"></el-option>
-                    <el-option label="请核" value="4"></el-option>
-                    <el-option label="审核中" value="5"></el-option>
-                    <el-option label="全部入账" value="6"></el-option>
+                    <el-option label="暂存" :value="1"></el-option>
+                    <el-option label="部分" :value="2"></el-option>
+                    <el-option label="全部入账" :value="3"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -542,6 +539,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus: null,
       },
       // 显示搜索条件
       showSearch: true,
@@ -661,7 +659,7 @@ export default {
         },
         {
           surface: "16",
-          label: "fBillstatus",
+          label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
@@ -1086,6 +1084,7 @@ export default {
         fBillstatus: null,
         fItemsStatus: null,
         timeInterval: null,
+        fFeeStatus:null,
       };
       this.userOptions = [];
       this.fMblnoOptions = [];

src/views/analysis/stockDetail/index.vue

@@ -8,60 +8,67 @@
           <div @click="goPage(scope.row)"><el-link type="primary" :underline="false">{{ scope.row.fMblno }}</el-link></div>
         </template>
       </el-table-column>
-      <el-table-column label="货物属性" align="center" prop="fBusinessType" />
+      <el-table-column label="货物属性" align="center" prop="fBusinessType">
+        <template slot-scope="scope">
+          <div>{{ scope.row.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="属性详情" align="center" prop="fMarks" />
-      <el-table-column label="业务类型" align="center" prop="fBilltype" />
+      <el-table-column label="业务类型" align="center" prop="fbilltype" />
       <el-table-column label="业务日期" align="center" prop="fBsdate" />
       <el-table-column label="贸易方式" align="center" prop="fTrademodeid" />
       <el-table-column label="件数" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.fBilltype == '入库'">{{ scope.row.fQtyRK }}</div>
-          <div v-if="scope.row.fBilltype == '出库'">{{ scope.row.fQtyCK }}</div>
-          <div v-if="scope.row.fBilltype == '调拨'">{{ scope.row.fQtyDB }}</div>
-          <div v-if="scope.row.fBilltype == '货权转移'">
-            {{ scope.row.fQtyHZ }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货物通关'">
-            {{ scope.row.fQtyTG }}
-          </div>
+<!--          <div v-if="scope.row.fbilltype == '入库'">{{ scope.row.fQtyRK }}</div>-->
+<!--          <div v-if="scope.row.fbilltype == '出库'">{{ scope.row.fQtyCK }}</div>-->
+<!--          <div v-if="scope.row.fbilltype == '调拨'">{{ scope.row.fQtyDB }}</div>-->
+<!--          <div v-if="scope.row.fbilltype == '货权转移'">-->
+<!--            {{ scope.row.fQtyHZ }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货物通关'">-->
+<!--            {{ scope.row.fQtyTG }}-->
+<!--          </div>-->
+          <div>{{scope.row.qty}}</div>
         </template>
       </el-table-column>
       <el-table-column label="毛重" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.fBilltype == '入库'">
-            {{ scope.row.fGrossweightRK }}
-          </div>
-          <div v-if="scope.row.fBilltype == '出库'">
-            {{ scope.row.fGrossweightCK }}
-          </div>
-          <div v-if="scope.row.fBilltype == '调拨'">
-            {{ scope.row.fGrossweightDB }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货权转移'">
-            {{ scope.row.fGrossweightHZ }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货物通关'">
-            {{ scope.row.fGrossweightTG }}
-          </div>
+          <div>{{ scope.row.grossweight }}</div>
+<!--          <div v-if="scope.row.fbilltype == '入库'">-->
+<!--            {{ scope.row.fGrossweightRK }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '出库'">-->
+<!--            {{ scope.row.fGrossweightCK }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '调拨'">-->
+<!--            {{ scope.row.fGrossweightDB }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货权转移'">-->
+<!--            {{ scope.row.fGrossweightHZ }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货物通关'">-->
+<!--            {{ scope.row.fGrossweightTG }}-->
+<!--          </div>-->
         </template>
       </el-table-column>
       <el-table-column label="净重" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.fBilltype == '入库'">
-            {{ scope.row.fNetweightRK }}
-          </div>
-          <div v-if="scope.row.fBilltype == '出库'">
-            {{ scope.row.fNetweightCK }}
-          </div>
-          <div v-if="scope.row.fBilltype == '调拨'">
-            {{ scope.row.fNetweightDB }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货权转移'">
-            {{ scope.row.fNetweightHZ }}
-          </div>
-          <div v-if="scope.row.fBilltype == '货物通关'">
-            {{ scope.row.fNetweightTG }}
-          </div>
+          <div>{{ scope.row.netweight }}</div>
+<!--          <div v-if="scope.row.fbilltype == '入库'">-->
+<!--            {{ scope.row.fNetweightRK }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '出库'">-->
+<!--            {{ scope.row.fNetweightCK }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '调拨'">-->
+<!--            {{ scope.row.fNetweightDB }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货权转移'">-->
+<!--            {{ scope.row.fNetweightHZ }}-->
+<!--          </div>-->
+<!--          <div v-if="scope.row.fbilltype == '货物通关'">-->
+<!--            {{ scope.row.fNetweightTG }}-->
+<!--          </div>-->
         </template>
       </el-table-column>
     </el-table>
@@ -69,7 +76,7 @@
 </template>
 
 <script>
-import { detailStock } from "@/api/warehouseBusiness/warehouseInStock";
+import { detailStock, getDetailStock } from "@/api/warehouseBusiness/warehouseInStock";
 
 import { listCorps } from "@/api/basicdata/corps";
 
@@ -87,9 +94,25 @@ export default {
       stockDate: [],
       // 遮罩层
       loading: true,
+      // 货物属性
+      fStorageTypeOptions: [],
     };
   },
   created() {
+    this.getDicts("storage_type").then((response) => {
+      this.fStorageTypeOptions = response.data;
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
+    });
+  },
+  activated() {
+    getDetailStock({
+      fId: this.$route.query.fId,
+      fWarehouseLocationid: this.$route.query.fWarehouseLocationid,
+    }).then((response) => {
+      this.loading = false;
+      console.log(response);
+      this.stockDate = response.data;
+    });
     // detailStock({
     //   fWarehouseLocationid: this.$route.query.fWarehouseLocationid,
     //   fTrademodeids: this.$route.query.fTrademodeids,
@@ -104,20 +127,16 @@ export default {
     //   this.stockDate = response.rows;
     // });
   },
-  activated() {
-    detailStock({
-      fWarehouseLocationid: this.$route.query.fWarehouseLocationid,
-      fTrademodeids: this.$route.query.fTrademodeids,
-      fBusinessType: this.$route.query.fBusinessType,
-      fGoodsid: this.$route.query.fGoodsid,
-      fCorpIds: this.$route.query.fCorpIds,
-      fMarks: this.$route.query.fMarks,
-      fMblno: this.$route.query.fMblno,
-    }).then((response) => {
-      this.loading = false;
-      console.log(response);
-      this.stockDate = response.rows;
-    });
+  filters: {
+    fStorageTypeFormat(row, fStorageTypeOptions) {
+      let fStorageType;
+      fStorageTypeOptions.map((e) => {
+        if (row == e.dictValue) {
+          fStorageType = e.dictLabel;
+        }
+      });
+      return fStorageType;
+    },
   },
   methods: {
        //列设置全选
@@ -196,7 +215,7 @@ export default {
     },
     //跳转审批页面
     goPage(row) {
-      switch (row.fBilltype) {
+      switch (row.fbilltype) {
         case "入库": {
           this.$router.push({
             path: "/business/inStock",

src/views/basicdata/dept/index.vue

@@ -381,7 +381,7 @@ export default {
     /** 查询仓库列表 */
     getList() {
       this.loading = true;
-      lazyListDept().then(res => {
+      lazyListDept(this.queryParams).then(res => {
         this.deptList = res.data
         this.loading = false
       })
@@ -445,6 +445,8 @@ export default {
       if (row != undefined) {
         this.form.parentId = row.fId;
       }
+      this.$set(this.form, 'fStatus', '0')
+      // this.form.fStatus = '0'
       this.open = true;
       this.title = "添加仓库";
       listDept().then(response => {
@@ -494,7 +496,8 @@ export default {
         }).then(function() {
           return delDept(row.fId);
         }).then(() => {
-          this.getList();
+          // this.getList();
+          location.reload();
           this.msgSuccess("删除成功");
         })
     }

src/views/finance/Invoicing/index.vue

@@ -1015,7 +1015,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item
-                  label="出入库日期"
+                  label="业务日期"
                   label-width="85px"
                   prop="fAccbilldate"
                   v-if="typevalue == 1 || typevalue == 3"
@@ -2424,13 +2424,13 @@ export default {
         },
       ],
       tableDate3: [
-        {
-          surface: "1",
-          label: "fName",
-          name: "货权方",
-          checked: 0,
-          width: 100,
-        },
+        // {
+        //   surface: "1",
+        //   label: "fName",
+        //   name: "货权方",
+        //   checked: 0,
+        //   width: 100,
+        // },
         {
           surface: "2",
           label: "fMblno",
@@ -2760,7 +2760,7 @@ export default {
     getRow() {
       let that = this;
       this.data = {
-        tableName: "付费",
+        tableName: "开票",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -2785,7 +2785,7 @@ export default {
     save() {
       this.showSetting = false;
       this.data = {
-        tableName: "付费",
+        tableName: "开票",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList,
       };
@@ -2796,7 +2796,7 @@ export default {
     //重置列表
     delRow() {
       this.data = {
-        tableName: "付费",
+        tableName: "开票",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {
@@ -2822,7 +2822,7 @@ export default {
     getRow2() {
       let that = this;
       this.data = {
-        tableName: "付费明细",
+        tableName: "开票明细",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -2847,7 +2847,7 @@ export default {
     save2() {
       this.showSetting2 = false;
       this.data = {
-        tableName: "付费明细",
+        tableName: "开票明细",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList2,
       };
@@ -2858,7 +2858,7 @@ export default {
     //重置列表
     delRow2() {
       this.data = {
-        tableName: "付费明细",
+        tableName: "开票明细",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {
@@ -2884,7 +2884,7 @@ export default {
     getRow3() {
       let that = this;
       this.data = {
-        tableName: "付费弹窗",
+        tableName: "开票弹窗",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -2909,7 +2909,7 @@ export default {
     save3() {
       this.showSetting3 = false;
       this.data = {
-        tableName: "付费弹窗",
+        tableName: "开票弹窗",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList3,
       };
@@ -2920,7 +2920,7 @@ export default {
     //重置列表
     delRow3() {
       this.data = {
-        tableName: "付费弹窗",
+        tableName: "开票弹窗",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {

src/views/finance/charge/index.vue

@@ -980,7 +980,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item
-            label="出入库日期"
+            label="业务日期"
             label-width="85px"
             prop="fAccbilldate"
             v-if="typevalue == 1 || typevalue == 3"
@@ -1677,13 +1677,13 @@ export default {
         },
       ],
       tableDate3: [
-        {
-          surface: "1",
-          label: "fName",
-          name: "货权方",
-          checked: 0,
-          width: 100,
-        },
+        // {
+        //   surface: "1",
+        //   label: "fName",
+        //   name: "货权方",
+        //   checked: 0,
+        //   width: 100,
+        // },
         {
           surface: "2",
           label: "fMblno",

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

@@ -34,7 +34,9 @@
               size="small"
               placeholder="请选择"
               clearable
-              :disabled="form.fBillstatus >= 4 || readOnly == 0 || form.fId!=null"
+              :disabled="
+                form.fBillstatus >= 4 || readOnly == 0 || form.fId != null
+              "
               style="width: 100%"
               filterable
             >
@@ -255,6 +257,7 @@
           size="mini"
           @click="submit"
           :disabled="form.fBillstatus >= 4 || readOnly == 0"
+          :loading="subLoading"
         >
           确认收费
         </el-button>
@@ -263,6 +266,7 @@
           size="mini"
           @click="backrRconciliation"
           v-if="form.fBillstatus === '6'"
+          :loading="subLoading"
           >撤销收费</el-button
         >
         <el-button
@@ -285,7 +289,14 @@
           @click="addOrUpdateHandle('f_billstatus')"
           >查看审批流</el-button
         >
-        <el-button type="success" size="mini" @click="save"> 保存 </el-button>
+        <el-button
+          type="success"
+          size="mini"
+          @click="save"
+          :loading="subLoading"
+        >
+          保存
+        </el-button>
         <el-button
           type="warning"
           size="mini"
@@ -478,6 +489,7 @@ export default {
       approve: false,
       addOrUpdateVisib: false,
       readOnly: null,
+      subLoading: false,
     };
   },
   components: {
@@ -697,13 +709,19 @@ export default {
     // 撤销收费
     backrRconciliation() {
       this.form.fBillstatus = "1";
+      this.subLoading = true;
       let formDate = new window.FormData();
       formDate.append("tFee", JSON.stringify(this.form));
       formDate.append("tFeeDo", JSON.stringify(this.tableData));
-      revoke(formDate).then((response) => {
-        this.msgSuccess("撤回成功");
-        this.$emit("goBack", false);
-      });
+      revoke(formDate)
+        .then((response) => {
+          this.msgSuccess("撤回成功");
+          Object.assign(this.$data, this.$options.data());
+          this.$emit("goBack", false);
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     Search() {
       const data = {
@@ -755,16 +773,22 @@ export default {
       if (this.form.fId == null) {
         return this.$message.error("数据未保存,不能进行确认收费");
       }
+      this.subLoading = true;
       let formDate = new window.FormData();
       formDate.append("tFee", JSON.stringify(this.form));
       formDate.append("tFeeDo", JSON.stringify(this.tableData));
       formDate.append("billsType", JSON.stringify("KHDZ"));
-      confirm(formDate).then((res) => {
-        if (res.code == 200) {
-          this.$emit("goBack", false);
-          this.$message.success("收费成功");
-        }
-      });
+      confirm(formDate)
+        .then((res) => {
+          if (res.code == 200) {
+            this.$message.success("收费成功");
+            Object.assign(this.$data, this.$options.data());
+            this.$emit("goBack", false);
+          }
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     save(type) {
       if (this.form.fCorpid == null) {
@@ -783,25 +807,30 @@ export default {
         this.form.fToDate = this.form.date[1];
       }
       this.lumpSum();
+      this.subLoading = true;
       let formDate = new window.FormData();
       formDate.append("tFee", JSON.stringify(this.form));
       formDate.append("tFeeDo", JSON.stringify(this.tableData));
       formDate.append("billsType", JSON.stringify("KHDZ"));
-      save(formDate).then((res) => {
-        if (res.code == 200) {
-          if (!type) {
-            if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
-              const date = [];
-              date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
-              res.data.tFee.date = date;
+      save(formDate)
+        .then((res) => {
+          if (res.code == 200) {
+            if (!type) {
+              if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
+                const date = [];
+                date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
+                res.data.tFee.date = date;
+              }
             }
+            this.form = res.data.tFee;
+            this.tableData = res.data.tFeeDo;
+            this.$emit("refFresh");
+            this.$message.success("保存成功");
           }
-          this.form = res.data.tFee;
-          this.tableData = res.data.tFeeDo;
-          this.$emit("refFresh");
-          this.$message.success("保存成功");
-        }
-      });
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     cancel() {
       if (this.readOnly != 0) {

src/views/finance/contrast/index.vue

@@ -1110,7 +1110,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接单日期" prop="acceptDateList">
+                <el-form-item label="业务日期" prop="acceptDateList">
                   <el-date-picker
                     v-model="TWareHouseFees.acceptDateList"
                     size="small"
@@ -2052,13 +2052,13 @@ export default {
         },
       ],
       tableDate3: [
-        {
-          surface: "1",
-          label: "fName",
-          name: "货权方",
-          checked: 0,
-          width: 100,
-        },
+        // {
+        //   surface: "1",
+        //   label: "fName",
+        //   name: "货权方",
+        //   checked: 0,
+        //   width: 100,
+        // },
         {
           surface: "2",
           label: "fFeesName",

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

@@ -239,6 +239,7 @@
           size="mini"
           @click="submit"
           :disabled="form.fBillstatus >= 4 || readOnly == 0"
+          :loading="subLoading"
         >
           确认对账
         </el-button>
@@ -247,6 +248,7 @@
           size="mini"
           @click="backrRconciliation"
           v-if="form.fBillstatus === '6'"
+          :loading="subLoading"
           >撤销对账</el-button
         >
         <el-button
@@ -269,7 +271,14 @@
           @click="addOrUpdateHandle('f_billstatus')"
           >查看审批流</el-button
         >
-        <el-button type="success" size="mini" @click="save"> 保存 </el-button>
+        <el-button
+          type="success"
+          size="mini"
+          @click="save"
+          :loading="subLoading"
+        >
+          保存
+        </el-button>
         <el-button
           type="warning"
           size="mini"
@@ -463,6 +472,7 @@ export default {
       approve: false,
       addOrUpdateVisib: false,
       readOnly: null,
+      subLoading: false,
     };
   },
   components: {
@@ -682,13 +692,19 @@ export default {
     // 撤销对账
     backrRconciliation() {
       this.form.fBillstatus = "1";
+      this.subLoading = true;
       let formDate = new window.FormData();
       formDate.append("tFee", JSON.stringify(this.form));
       formDate.append("tFeeDo", JSON.stringify(this.tableData));
-      revoke(formDate).then((response) => {
-        this.msgSuccess("撤回成功");
-        this.$emit("goBack", false);
-      });
+      revoke(formDate)
+        .then((response) => {
+          this.msgSuccess("撤回成功");
+          Object.assign(this.$data, this.$options.data());
+          this.$emit("goBack", false);
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     Search() {
       const data = {
@@ -739,16 +755,22 @@ export default {
       if (this.form.fId == null) {
         return this.$message.error("数据未保存,不能进行确认对账");
       }
+      this.subLoading = true;
       let formDate = new window.FormData();
       formDate.append("tFee", JSON.stringify(this.form));
       formDate.append("tFeeDo", JSON.stringify(this.tableData));
       formDate.append("billsType", JSON.stringify("KHDZ"));
-      confirm(formDate).then((res) => {
-        if (res.code == 200) {
-          this.$emit("goBack", false);
-          this.$message.success("对账成功");
-        }
-      });
+      confirm(formDate)
+        .then((res) => {
+          if (res.code == 200) {
+            this.$message.success("对账成功");
+            Object.assign(this.$data, this.$options.data());
+            this.$emit("goBack", false);
+          }
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     save(type) {
       if (this.form.fCorpid == null) {
@@ -764,25 +786,30 @@ export default {
         this.form.fToDate = this.form.date[1];
       }
       this.lumpSum();
+      this.subLoading = true;
       let formDate = new window.FormData();
       formDate.append("tFee", JSON.stringify(this.form));
       formDate.append("tFeeDo", JSON.stringify(this.tableData));
       formDate.append("billsType", JSON.stringify("KHDZ"));
-      save(formDate).then((res) => {
-        if (res.code == 200) {
-          if (!type) {
-            if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
-              const date = [];
-              date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
-              res.data.tFee.date = date;
+      save(formDate)
+        .then((res) => {
+          if (res.code == 200) {
+            if (!type) {
+              if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
+                const date = [];
+                date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
+                res.data.tFee.date = date;
+              }
             }
+            this.form = res.data.tFee;
+            this.tableData = res.data.tFeeDo;
+            this.$emit("refFresh");
+            this.$message.success("保存成功");
           }
-          this.form = res.data.tFee;
-          this.tableData = res.data.tFeeDo;
-          this.$emit("refFresh");
-          this.$message.success("保存成功");
-        }
-      });
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     cancel() {
       if (this.readOnly != 0) {

src/views/finance/payment/index.vue

@@ -1015,7 +1015,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item
-                  label="出入库日期"
+                  label="业务日期"
                   label-width="85px"
                   prop="fAccbilldate"
                   v-if="typevalue == 1 || typevalue == 3"

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

@@ -34,7 +34,9 @@
               size="small"
               placeholder="请选择"
               clearable
-              :disabled="form.fBillstatus >= 4 || readOnly == 0 || form.fId!=null"
+              :disabled="
+                form.fBillstatus >= 4 || readOnly == 0 || form.fId != null
+              "
               style="width: 100%"
               filterable
             >
@@ -255,6 +257,7 @@
           size="mini"
           @click="submit"
           :disabled="form.fBillstatus >= 4 || readOnly == 0"
+          :loading="subLoading"
         >
           确认付费
         </el-button>
@@ -263,6 +266,7 @@
           size="mini"
           @click="backrRconciliation"
           v-if="form.fBillstatus === '6'"
+          :loading="subLoading"
           >撤销付费</el-button
         >
         <el-button
@@ -285,7 +289,14 @@
           @click="addOrUpdateHandle('f_billstatus')"
           >查看审批流</el-button
         >
-        <el-button type="success" size="mini" @click="save"> 保存 </el-button>
+        <el-button
+          type="success"
+          size="mini"
+          @click="save"
+          :loading="subLoading"
+        >
+          保存
+        </el-button>
         <el-button
           type="warning"
           size="mini"
@@ -478,6 +489,7 @@ export default {
       approve: false,
       addOrUpdateVisib: false,
       readOnly: null,
+      subLoading: false,
     };
   },
   components: {
@@ -697,13 +709,19 @@ export default {
     // 撤销付费
     backrRconciliation() {
       this.form.fBillstatus = "1";
+      this.subLoading = true;
       let formDate = new window.FormData();
       formDate.append("tFee", JSON.stringify(this.form));
       formDate.append("tFeeDo", JSON.stringify(this.tableData));
-      revoke(formDate).then((response) => {
-        this.msgSuccess("撤回成功");
-        this.$emit("goBack", false);
-      });
+      revoke(formDate)
+        .then((response) => {
+          this.msgSuccess("撤回成功");
+          Object.assign(this.$data, this.$options.data());
+          this.$emit("goBack", false);
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     Search() {
       const data = {
@@ -755,16 +773,22 @@ export default {
       if (this.form.fId == null) {
         return this.$message.error("数据未保存,不能进行确认付费");
       }
+      this.subLoading = true;
       let formDate = new window.FormData();
       formDate.append("tFee", JSON.stringify(this.form));
       formDate.append("tFeeDo", JSON.stringify(this.tableData));
       formDate.append("billsType", JSON.stringify("KHDZ"));
-      confirm(formDate).then((res) => {
-        if (res.code == 200) {
-          this.$emit("goBack", false);
-          this.$message.success("付费成功");
-        }
-      });
+      confirm(formDate)
+        .then((res) => {
+          if (res.code == 200) {
+            this.$message.success("付费成功");
+            Object.assign(this.$data, this.$options.data());
+            this.$emit("goBack", false);
+          }
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     save(type) {
       if (this.form.fCorpid == null) {
@@ -783,25 +807,30 @@ export default {
         this.form.fToDate = this.form.date[1];
       }
       this.lumpSum();
+      this.subLoading = true;
       let formDate = new window.FormData();
       formDate.append("tFee", JSON.stringify(this.form));
       formDate.append("tFeeDo", JSON.stringify(this.tableData));
       formDate.append("billsType", JSON.stringify("KHDZ"));
-      save(formDate).then((res) => {
-        if (res.code == 200) {
-          if (!type) {
-            if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
-              const date = [];
-              date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
-              res.data.tFee.date = date;
+      save(formDate)
+        .then((res) => {
+          if (res.code == 200) {
+            if (!type) {
+              if (res.data.tFee.fFromDate && res.data.tFee.fToDate) {
+                const date = [];
+                date.push(res.data.tFee.fFromDate, res.data.tFee.fToDate);
+                res.data.tFee.date = date;
+              }
             }
+            this.form = res.data.tFee;
+            this.tableData = res.data.tFeeDo;
+            this.$emit("refFresh");
+            this.$message.success("保存成功");
           }
-          this.form = res.data.tFee;
-          this.tableData = res.data.tFeeDo;
-          this.$emit("refFresh");
-          this.$message.success("保存成功");
-        }
-      });
+        })
+        .finally(() => {
+          this.subLoading = false;
+        });
     },
     cancel() {
       if (this.readOnly != 0) {

src/views/finance/query/index.vue

@@ -0,0 +1,698 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      v-show="showSearch"
+      label-width="100px"
+      size="mini"
+    >
+      <el-row>
+        <el-col :xs="12" :sm="6">
+          <el-form-item label="提单号" prop="fMblno">
+            <el-input
+              v-model="queryParams.fMblno"
+              placeholder="请输入提单号"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :xs="12" :sm="6">
+          <el-form-item label="客户名称" prop="fCorpid">
+            <el-select
+              v-model="queryParams.fCorpid"
+              clearable
+              filterable
+              placeholder="请输入关键词"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="(item, index) in fMblnoOptions"
+                :key="index.fId"
+                :label="item.fName"
+                :value="item.fId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="12" :sm="6">
+          <el-form-item label="业务日期" prop="fBsdateList">
+            <el-date-picker
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00', '23:59:59']"
+              clearable
+              unlink-panels
+              style="width: 100%"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              v-model="queryParams.fBsdateList"
+            ></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="12" :sm="6">
+          <el-form-item label="审核日期" prop="fReviewDateList">
+            <el-date-picker
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00', '23:59:59']"
+              clearable
+              unlink-panels
+              style="width: 100%"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              v-model="queryParams.fReviewDateList"
+            ></el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-collapse-transition>
+        <div v-show="show">
+          <el-row>
+            <el-col :xs="12" :sm="6">
+              <el-form-item label="收/付" prop="fDc">
+                <el-select
+                  v-model="queryParams.fDc"
+                  clearable
+                  filterable
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
+                  <el-option
+                    label="收"
+                    value="D"
+                  ></el-option>
+                  <el-option
+                    label="付"
+                    value="C"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="12" :sm="6">
+              <el-form-item label="费用状态" prop="fBillstatus">
+                <el-select
+                  v-model="queryParams.fBillstatus"
+                  clearable
+                  filterable
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
+                  <el-option
+                    label="录入"
+                    value="1"
+                  ></el-option>
+                  <el-option
+                    label="暂存"
+                    value="2"
+                  ></el-option>
+                  <el-option
+                    label="审批驳回"
+                    value="3"
+                  ></el-option>
+                  <el-option
+                    label="提交审核"
+                    value="4"
+                  ></el-option>
+                  <el-option
+                    label="审核中"
+                    value="5"
+                  ></el-option>
+                  <el-option
+                    label="审核通过"
+                    value="6"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-collapse-transition>
+    </el-form>
+    <el-row :gutter="10" style="padding-bottom: 10px">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <div class="tabSetting">
+        <div style="margin-right: 20px">
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            v-hasPermi="['warehouse:modify:list']"
+          >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+          >
+          <el-button
+            v-show="show"
+            @click="show = !show"
+            icon="el-icon-arrow-up"
+            size="mini"
+          >展开</el-button
+          >
+          <el-button
+            v-show="!show"
+            @click="show = !show"
+            icon="el-icon-arrow-down"
+            size="mini"
+          >展开</el-button
+          >
+        </div>
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+        <div style="margin: 0 12px">
+          <el-button
+            icon="el-icon-setting"
+            size="mini"
+            circle
+            @click="showSetting = !showSetting"
+          ></el-button>
+        </div>
+      </div>
+    </el-row>
+
+    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
+      <div>配置排序列数据（拖动调整顺序）</div>
+      <div style="margin-left: 17px">
+        <el-checkbox
+          v-model="allCheck"
+          label="全选"
+          @change="allChecked"
+        ></el-checkbox>
+      </div>
+      <div style="padding: 4px; display: flex; justify-content: center">
+        <draggable
+          v-model="setRowList"
+          group="site"
+          animation="300"
+          @start="onStart"
+          @end="onEnd"
+          handle=".indraggable"
+        >
+          <transition-group>
+            <div
+              v-for="item in setRowList"
+              :key="item.surface"
+              class="listStyle"
+            >
+              <div style="width: 500px" class="indraggable">
+                <div class="progress" :style="{ width: item.width + 'px' }">
+                  <el-checkbox
+                    :label="item.name"
+                    v-model="item.checked"
+                    :true-label="0"
+                    :false-label="1"
+                  >{{ item.name }}
+                  </el-checkbox>
+                </div>
+              </div>
+              <el-input-number
+                v-model.number="item.width"
+                controls-position="right"
+                :min="1"
+                :max="500"
+                size="mini"
+              ></el-input-number>
+            </div>
+          </transition-group>
+        </draggable>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
+        <el-button type="primary" @click="save()">确 定</el-button>
+      </span>
+    </el-dialog>
+
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      style="width: 100%"
+      ref="table"
+      :height="tableHeight"
+      stripe
+      show-summary
+      :summary-method="getSum"
+    >
+      <el-table-column
+        type="index"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :show-overflow-tooltip="true"
+        sortable
+        :fixed="item.fixed"
+      >
+        <template slot-scope="scope">
+          <span v-if="item.label == 'fDc'">
+            {{ scope.row.fDc == 'D'? '收': '付' }}
+          </span>
+          <span v-else-if="item.label == 'fFeeUnitid'">
+            {{ scope.row.fFeeUnitid | fFeeUnitFormat(fFeetUnitOptions) }}
+          </span>
+          <span v-else-if="item.label == 'fBilltype'">
+            {{ scope.row.fBilltype | billTypeFormat(billTypeList) }}
+          </span>
+          <span v-else>{{ scope.row[item.label] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import Cookies from "js-cookie";
+import draggable from "vuedraggable";
+import { addSet, resetModule, select } from '@/api/system/set';
+import {listCorps} from "@/api/basicdata/corps";
+import {getList, exportList} from "@/api/finance/query";
+
+export default {
+  name: "index",
+  components: {
+    draggable,
+  },
+  data() {
+    return {
+      // 表格高度
+      tableHeight: 0,
+      // 总条数
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      showSearch: true,
+      // 搜索展开/隐藏
+      show: false,
+      // 自定义列弹窗显示
+      showSetting: false,
+      //自定义列宽
+      allCheck: false,
+      setRowList: [],
+      getRowList: [],
+      drag: false,
+      tableDate: [
+        {
+          surface: "1",
+          label: "corpName",
+          name: "客户名称",
+          checked: 0,
+          width: 140,
+        },
+        {
+          surface: "2",
+          label: "fMblno",
+          name: "提单号",
+          checked: 0,
+          width: 180,
+        }, {
+          surface: "3",
+          label: "fBsdate",
+          name: "业务日期",
+          checked: 0,
+          width: 100,
+        },{
+          surface: "4",
+          label: "fReviewDate",
+          name: "审核日期",
+          checked: 0,
+          width: 100,
+        },{
+          surface: "5",
+          label: "feeName",
+          name: "费用名称",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "6",
+          label: "fBillstatusName",
+          name: "费用状态",
+          checked: 0,
+          width: 100,
+        },{
+          surface: "6",
+          label: "fDc",
+          name: "收/付",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "7",
+          label: "fAmount",
+          name: "金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "8",
+          label: "fStlamount",
+          name: "结算金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "9",
+          label: "fStlamountDate",
+          name: "结算日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "10",
+          label: "fInvamount",
+          name: "开票金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
+          label: "fInvnos",
+          name: "发票号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "12",
+          label: "fAccamount",
+          name: "对账金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "13",
+          label: "fAccamountDate",
+          name: "对账日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
+          label: "fStatementNo",
+          name: "对账单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "15",
+          label: "fFeeUnitid",
+          name: "计价单位",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "16",
+          label: "fQty",
+          name: "数量",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "17",
+          label: "fUnitprice",
+          name: "单价",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "18",
+          label: "fBilltype",
+          name: "业务类型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "19",
+          label: "fProductName",
+          name: "货物名称",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "remark",
+          name: "备注",
+          checked: 0,
+          width: 100,
+        },
+      ],
+      // 计价单位
+      fFeetUnitOptions: [],
+      fMblnoOptions: [],
+      loading: false,
+      dataList: [],
+      billTypeList: [],
+    }
+  },
+  created() {
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
+    this.getRow()
+    this.getList()
+    listCorps({type: 1}).then((response) => {
+      this.fMblnoOptions = response.rows;
+    });
+    this.getDicts("data_unitfees").then((response) => {
+      this.fFeetUnitOptions = response.data;
+    });
+    this.getDicts("data_billtype_type").then((response) => {
+      this.billTypeList = response.data;
+    });
+  },
+  mounted() {
+    this.$nextTick(() => {
+      let windowHeight = document.documentElement.clientHeight || document.body.clientHeight;
+      this.tableHeight = windowHeight - 280;
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
+      }
+    })
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs.table.doLayout();
+    })
+  },
+  filters: {
+    fFeeUnitFormat(row, fFeetUnitOptions) {
+      let name;
+      fFeetUnitOptions.map((e) => {
+        if (row == e.dictValue) {
+          name = e.dictLabel;
+        }
+      });
+      return name;
+    },
+    billTypeFormat(row, billTypeList) {
+      let type;
+      billTypeList.map((e) => {
+        if (row == e.dictValue) {
+          type = e.dictLabel;
+        }
+      });
+      return type;
+    },
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      getList(this.queryParams).then(res => {
+        this.dataList = res.rows
+        this.total = res.total
+        this.loading = false;
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 导出
+    handleExport() {
+      this.$confirm("是否确认导出所有库存总账数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        return exportList(this.queryParams)
+      }).then(res => {
+        this.download(res.msg)
+      })
+    },
+    // 表格合计
+    getSum(param) {
+      const { columns, data } = param;
+      const sums = [];
+      var values = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        if (column.property === "fAmount") {
+          values = data.map((item) => Number(item["fAmount"]));
+        }
+        if (column.property === "fStlamount") {
+          values = data.map((item) => Number(item["fStlamount"]));
+        }
+        if (column.property === "fInvamount") {
+          values = data.map((item) => Number(item["fInvamount"]));
+        }
+        if (column.property === "fAccamount") {
+          values = data.map((item) => Number(item.fAccamount));
+        }
+        if (column.property === "fQty") {
+          values = data.map((item) => Number(item.fQty));
+        }
+        if (
+          column.property === "fAmount" ||
+          column.property === "fStlamount" ||
+          column.property === "fInvamount" ||
+          column.property === "fAccamount" ||
+          column.property === "fQty"
+        ) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          if (column.property === "fAmount") {
+            sums[index] = (sums[index]).toFixed(2);
+          }
+          if (column.property === "fStlamount") {
+            sums[index] = (sums[index]).toFixed(2);
+          }
+          if (column.property === "fInvamount") {
+            sums[index] = (sums[index]).toFixed(2);
+          }
+          if (column.property === "fAccamount") {
+            sums[index] = (sums[index]).toFixed(2);
+          }
+          if (column.property === "fQty") {
+            sums[index] = sums[index];
+          }
+        }
+      });
+      return sums;
+    },
+
+    //列设置全选
+    allChecked() {
+      if (this.allCheck == true) {
+        this.setRowList.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //开始拖拽事件
+    onStart() {
+      this.drag = true;
+    },
+    //拖拽结束事件
+    onEnd() {
+      this.drag = false;
+    },
+    //重置列表
+    delRow() {
+      this.data = {
+        tableName: "财务查询",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          console.log(this.setRowList)
+          this.getRowList = this.tableDate;
+        }
+      });
+    },
+    //保存列设置
+    save() {
+      this.showSetting = false;
+      this.data = {
+        tableName: "财务查询",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList,
+      };
+      addSet(this.data).then((res) => {
+        this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+      });
+    },
+    //查询列数据
+    getRow() {
+      let that = this;
+      this.data = {
+        tableName: "财务查询",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList = res.data.filter((e) => e.checked == 0);
+          this.setRowList = res.data;
+          this.setRowList = this.setRowList.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
+            return res;
+          }, []);
+        }
+      });
+    },
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/index.vue

@@ -201,6 +201,7 @@
                 <div class="home_stock_table">
                   <span v-if="item.refno2 === 'SJRK'">入库</span>
                   <span v-else-if="item.actId === 1000">费用修改</span>
+                  <span v-else-if="item.refno2 === 'CDZZ'">场地直装</span>
                   <span v-else-if="item.refno2 === 'SJCK'">出库</span>
                   <span v-else-if="item.refno2 === 'HQZY'">货转</span>
                   <span v-else-if="item.refno2 === 'CKDB'">调拨</span>
@@ -1177,6 +1178,13 @@ export default {
     approval(row) {
       console.log(row)
       switch (row.refno2) {
+        case "CDZZ": {
+          this.$router.push({
+            path: "/business/inAndOutStock",
+            query: { id: row.billId }
+          })
+          break;
+        }
         case "FYBG": {
           this.$router.push({
             path: "/business/costModify",

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

@@ -62,9 +62,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="开船日期" prop="timeInterval">
+          <el-form-item label="订舱日期" prop="cLoadDate">
             <el-date-picker
-              v-model="queryParams.timeInterval"
+              v-model="queryParams.cLoadDate"
               type="daterange"
               range-separator="至"
               style="width: 240px"
@@ -189,9 +189,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="订舱日期" prop="cLoadDate">
+              <el-form-item label="开船日期" prop="timeInterval">
                 <el-date-picker
-                  v-model="queryParams.cLoadDate"
+                  v-model="queryParams.timeInterval"
                   type="daterange"
                   range-separator="至"
                   style="width: 240px"
@@ -748,7 +748,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        timeInterval:defaultDate(),
+        cLoadDate: defaultDate(),
       },
       fMblnoOptions: [],
       createBy: [],
@@ -1041,7 +1041,7 @@ export default {
         fCntrcount: null,
         cLoadDate: null,
         fCntrno: null,
-        timeInterval:null
+        timeInterval: null,
       };
       this.resetForm("queryForm");
       this.handleQuery();

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

@@ -1483,8 +1483,8 @@
           <div
             style="width: 50%;height: 160px;float: left;justify-content:center;align-items:center;display:-webkit-flex">
             <div style="width: 500px;border: 1px solid #cccccc;padding: 10px">
-              <h4 style="margin: 0">1、本运单一是四联，第一联退回发货人或托运人，做为目的港收货人提货凭证。</h4>
-              <h4 style="margin: 0">2、运单一经题取货物后即失去提货效力。</h4>
+              <h4 style="margin: 0">1、本运单一式四联，第一联退回发货人或托运人，做为目的港收货人提货凭证。</h4>
+              <h4 style="margin: 0">2、运单一经提取货物后即失去提货效力。</h4>
               <h4 style="margin: 0">3、运单非有价证券，不得流通或转让给非本运单指定的第三方。</h4>
               <h4 style="margin: 0">4、托运人必须投保货物运输综合险，否则由此产生的损失由托运人自负。</h4>
               <h4 style="margin: 0">5、船东过失承运人不承担责任，由过失方承担。</h4>
@@ -1495,6 +1495,7 @@
           <p>离港日:{{ estimatedTime.fEtd }}</p>
           <p>运单号:{{ form.fMblno }}</p>
           <p>运输条款:{{ form.fServiceitems | fServiceitemsNameFormat(transport) }}</p>
+          <p>箱型箱量:{{goodsList&&goodsList.length>0?goodsList[0].cntrName+"*"+goodsList[0].fCntrcount:'—'}}</p>
           <p>业务号:{{ form.fBillno }}</p>
         </div>
         <table border="1" style="border-collapse: collapse;width: 100%;text-align: center">
@@ -1554,10 +1555,10 @@
           </tr>
           <tr class="listTd">
             <td rowspan="2" colspan="2">箱号</td>
-            <td rowspan="2" colspan="2">封号</td>
+            <td rowspan="2" colspan="2">铅封号</td>
             <td rowspan="2">批号</td>
             <td rowspan="2">货名</td>
-            <td rowspan="2">件数</td>
+            <td rowspan="2">箱型</td>
             <td rowspan="2">价值</td>
             <td rowspan="2">托运人确定重量(吨)</td>
             <td rowspan="2">计算重量(吨)</td>
@@ -1811,6 +1812,7 @@ export default {
   },
   //页面跳转后传递参数
   activated() {
+    this.jumpDonot=false;
     if (this.$route.query.testing)this.dataElist = true
     this.modify = true
     let formDate

src/views/morePage/stock/index.vue

@@ -640,6 +640,10 @@ export default {
                 e.refno2 = "费用变更";
                 break;
               }
+              case "CDZZ": {
+                e.refno2 = "场地直装";
+                break;
+              }
               case "SJRK": {
                 e.refno2 = "入库";
                 break;
@@ -741,6 +745,13 @@ export default {
     },
     approval(row) {
       switch (row.refno4) {
+        case "CDZZ": {
+          this.$router.push({
+            path: "/business/inAndOutStock",
+            query: { id: row.billId }
+          })
+          break;
+        }
         case "FYBG": {
           this.$router.push({
             path: "/business/costModify",

src/views/reportManagement/whgenleg/index.vue

@@ -1065,6 +1065,7 @@ export default {
       this.$router.push({
         path: "/analysis/stockDetail",
         query: {
+          fId: row.fId,
           fWarehouseLocationid: row.fWarehouseLocationid,
           fTrademodeids: row.fTrademodeids,
           fBusinessType: row.fBusinessType,

src/views/startApproval.vue

@@ -48,8 +48,8 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDia">关闭</el-button>
-      <el-button @click="approvalRejected">审批驳回</el-button>
-      <el-button @click="approved">审批通过</el-button>
+      <el-button @click="approvalRejected" :loading="subLoading">审批驳回</el-button>
+      <el-button @click="approved" :loading="subLoading">审批通过</el-button>
     </span>
   </el-dialog>
 </template>
@@ -76,6 +76,7 @@ export default {
       },
       visible: false,
       optionsBranch: [],
+      subLoading: false,
     };
   },
   components: {},
@@ -124,24 +125,40 @@ export default {
       })
         .then(() => {
           this.getTime();
-          return listCharge(this.dataForm, "/warehouse/paths/approved");
-        })
-        .then((data) => {
-          if (data && data.code == 200) {
-            this.$message({
-              message: "审核通过",
-              type: "success",
-              duration: 600,
-              onClose: () => {
+          this.subLoading = true;
+          listCharge(this.dataForm, "/warehouse/paths/approved")
+            .then((res) => {
+              if (res.code) {
+                this.$message({
+                  message: "审核通过",
+                  type: "success",
+                  duration: 600,
+                });
                 this.closeDia();
-              },
+                this.visible = true;
+              }
+            })
+            .finally(() => {
+              this.subLoading = false;
+              // this.closeDia();
             });
-            this.visible = true;
-            // this.homePage()
-          } else {
-            this.$message.error(data.msg);
-          }
-        });
+          return;
+        })
+        // .then((data) => {
+        //   console.log(data);
+        //   if (data && data.code == 200) {
+        //     this.$message({
+        //       message: "审核通过",
+        //       type: "success",
+        //       duration: 600,
+        //     });
+        //     this.closeDia();
+        //     this.visible = true;
+        //     // this.homePage()
+        //   } else {
+        //     this.$message.error(data.msg);
+        //   }
+        // });
     },
     // homePage(){
     //   let view = {
@@ -205,5 +222,4 @@ export default {
 };
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -343,7 +343,9 @@
               v-if="
               scope.row.fBillstatus == '录入' ||
               scope.row.fBillstatus == '暂存'  ||
-              scope.row.fBillstatus == '审核驳回'
+              scope.row.fBillstatus == '审核驳回' ||
+              scope.row.fBillstatus == '保存' ||
+              scope.row.fBillstatus == '请核驳回'
             "
               @click="handleUpdate(scope.row, false)"
               v-hasPermi="['warehouseBusiness:storageFeeCalculation:edit']"
@@ -356,7 +358,9 @@
               v-if="
               scope.row.fBillstatus == '录入' ||
               scope.row.fBillstatus == '暂存'  ||
-              scope.row.fBillstatus == '审核驳回'
+              scope.row.fBillstatus == '审核驳回' ||
+              scope.row.fBillstatus == '保存' ||
+              scope.row.fBillstatus == '请核驳回'
             "
               @click="handleDelete(scope.row)"
               v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']"
@@ -629,7 +633,7 @@
               header-align="center"
               align="center"
               width="140px"
-              label="入库日期"
+              label="业务日期"
           >
             <template slot-scope="scope">
               <el-date-picker
@@ -638,7 +642,7 @@
                   type="date"
                   disabled
                   value-format="timestamp"
-                  placeholder="入库日期"
+                  placeholder="业务日期"
               >
               </el-date-picker>
             </template>

vue.config.js

@@ -35,11 +35,15 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.1.177:9010/`,
-        target: `http://192.168.1.194:9010/`,
+        // target: `http://192.168.1.194:9010/`,
+        // target: `http://192.168.1.111:9010/`,
+        // target: `http://192.168.1.116:9012/`,
+        // target: `http://192.168.1.116:9010/`,
         // target: `https://test.fms.tubaosoft.com/prod-api/`,
-        // target: `https://test.wms.tubaosoft.com/prod-api/`,
+        target: `https://test.wms.tubaosoft.com/prod-api/`,
         // target: `https://test.tms.tubaosoft.com/prod-api/`,
         // target: `https://test.ke.tubaosoft.com/prod-api/`,
+        // target: `http://lhsy.tubaosoft.com/prod-api/`,
 
         // target: `https://zd.tubaosoft.com/prod-api/`,
         // target: `https://jianqiao.tubaosoft.com/prod-api/`,