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

src/api/fleet/carManage.js

@@ -26,7 +26,7 @@ export function lookOver(fId) {
 // 模糊查询车队名称
 export function company(companyName) {
   return request({
-    url: '/fleet/companyMsg/query',
+    url: '/fleet/companyMsg/list',
     method: 'get',
     params: companyName
   })

src/api/fleet/driverMsg.js

@@ -18,7 +18,7 @@ export function lookOver(fId) {
 // 模糊查询车队名称
 export function company(companyName) {
   return request({
-    url: '/fleet/companyMsg/query',
+    url: '/fleet/companyMsg/list',
     method: 'get',
     params: companyName
   })

src/api/warehouseBusiness/warehouseInStock.js

@@ -117,9 +117,19 @@ export function serialNumber() {
   })
 }
 //删除前的判断
-export function delinStock_s(fId) {
+export function delinStock(fId) {
   return request({
     url: '/warehouseBusiness/inStock/queryRemove/' + fId,
     method: 'delete'
   })
 }
+
+
+//详情列表
+export function detailStock(query) {
+  return request({
+    url: '/warehouseBusiness/whgenleg/detailed/list',
+    method: 'get',
+    params: query
+  })
+}

src/views/analysis/stockDetail/index.vue

@@ -0,0 +1,153 @@
+<template>
+  <div class="app-container">
+    <el-table v-loading="loading" :data="stockDate">
+      <el-table-column type="index" label="序号" align="center" />
+      <el-table-column label="货主" align="center" prop="fcorpid" />
+      <el-table-column label="提单号" align="center">
+        <template slot-scope="scope">
+          <div @click="goPage(scope.row)">{{ scope.row.fMblno }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="货物属性" align="center" prop="fBusinessType" />
+      <el-table-column label="属性详情" align="center" prop="fMarks" />
+      <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>
+        </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>
+        </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>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { detailStock } from "@/api/warehouseBusiness/warehouseInStock";
+
+import { listCorps } from "@/api/basicdata/corps";
+
+import { listWarehouse } from "@/api/basicdata/warehouse";
+
+import { listGoods } from "@/api/basicdata/goods";
+
+import { listUser, queryUserVal } from "@/api/system/user";
+
+export default {
+  name: "Warehousebills",
+  components: {},
+  data() {
+    return {
+      stockDate: [],
+      // 遮罩层
+      loading: true,
+    };
+  },
+  created() {
+    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;
+    });
+  },
+  methods: {
+    //跳转审批页面
+    goPage(row) {
+      switch (row.fBilltype) {
+        case "入库": {
+          this.$router.push({
+            path: "/business/inStock",
+            query: { id: row.fId },
+          });
+          break;
+        }
+        case "出库": {
+          this.$router.push({
+            path: "/business/outStock",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "调拨": {
+          this.$router.push({
+            path: "/business/goodsTransfer",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "货权转移": {
+          this.$router.push({
+            path: "/business/stockTransfer",
+            query: { data: { billId: row.fId } },
+          });
+          break;
+        }
+        case "货物通关": {
+          this.$router.push({
+            path: "/business/cargoClearance",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        default: {
+          return this.$message.error("未知错误，无状态");
+        }
+      }
+    },
+  },
+};
+</script>

src/views/basicdata/fleet/carManage.vue

@@ -16,7 +16,6 @@
     </el-form>
     <el-table
       :data="dataList"
-      border
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       style="width: 100%;"

src/views/basicdata/fleet/companyMsg-add-or-update.vue

@@ -394,6 +394,11 @@ export default {
         ],
         fTel: [
           { required: true, message: "请输入联系人电话", trigger: "blur" },
+          {
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            message: "请正确输入手机号",
+            trigger: "blur",
+          },
         ],
       },
     };

src/views/basicdata/fleet/companyMsg.vue

@@ -58,7 +58,6 @@
     </el-form>
     <el-table
       :data="dataList"
-      border
       stripe
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"

src/views/basicdata/fleet/driverMsg-add-or-update.vue

@@ -121,6 +121,7 @@
           v-model="dataFormD.fTel"
           :disabled="doNot"
           placeholder="联系电话"
+           maxlength="11"
         ></el-input>
       </el-form-item>
       <el-form-item label="家庭住址" prop="fAddr">
@@ -302,7 +303,14 @@ export default {
         fScale: [
           { required: true, message: "请输入身份证号", trigger: "blur" },
         ],
-        fTel: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+        fTel: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+          {
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            message: "请正确输入手机号",
+            trigger: "blur",
+          },
+        ],
       },
       optionsProjectTypeItem: [],
       fileList: [],
@@ -347,7 +355,7 @@ export default {
         lookOver(this.dataForm.id).then((data) => {
           this.doNot = true;
           this.dataFormD = data.data;
-          this.dataFormD.fFax=Number(data.data.fFax);
+          this.dataFormD.fFax = Number(data.data.fFax);
           this.fTmsorderbillsattachs = data.data.fTmsorderbillsattachs;
           this.optionsProjectTypeItem = data.data.fleetCompanyMsg;
           if (data.data.fleetCompanyMsg) {

src/views/basicdata/fleet/driverMsg.vue

@@ -18,7 +18,6 @@
     </el-form>
     <el-table
       :data="dataList"
-      border
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       style="width: 100%;">

src/views/finance/charge/index.vue

@@ -887,7 +887,11 @@
           <el-table-column label="货权方" align="center" prop="fName" />
           <el-table-column label="提单号" align="center" prop="fMblno" />
           <el-table-column label="品名" align="center" prop="fProductName" />
-          <el-table-column label="业务日期" align="center" prop="fBsdate" />
+                <el-table-column label="业务日期" align="center">
+          <template slot-scope="scope" v-if="scope.row.fBsdate">
+            <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
+          </template>
+        </el-table-column>
           <el-table-column label="业务类型" align="center" prop="fBilltype">
             <template slot-scope="scope">
               <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>

src/views/finance/contrast/index.vue

@@ -752,7 +752,7 @@
               </el-select>
             </template>
           </el-form-item>
-          <el-form-item label="仓储业务" prop="fFeeid">
+          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1">
             <el-select
               v-model="TWareHouseFees.fBilltype"
               size="small"
@@ -855,7 +855,11 @@
             <!-- <el-table-column label="账单日期" align="center" prop="fAccbilldate"/> -->
             <el-table-column label="提单号" align="center" prop="fMblno" />
             <el-table-column label="品名" align="center" prop="fProductName" />
-            <el-table-column label="业务日期" align="center" prop="fBsdate" />
+            <el-table-column label="业务日期" align="center">
+              <template slot-scope="scope" v-if="scope.row.fBsdate">
+                <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="业务类型" align="center" prop="fBilltype">
               <template slot-scope="scope">
                 <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
@@ -1590,10 +1594,14 @@ export default {
     addOrUpdateHandle() {
       this.addOrUpdateVisible = true;
       this.addOrUpdateVisib = false;
-      let id = "448";
-      let actId = "110";
+      let id = null;
+      if (this.queryParams.fId) {
+        id = this.queryParams.fId
+      } else {
+        id = this.queryParams.id
+      }
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId);
+        this.$refs.addOrUpdate.init(id, this.contrastId);
       });
     },
     // 撤销对账

src/views/finance/payment/index.vue

@@ -170,13 +170,11 @@
           <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="付费日期"
-        align="center"
-        sortable
-        prop="fAccbilldate"
-        width="120"
-      />
+      <el-table-column label="付费日期" align="center" sortable width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fAccbilldate, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="提单号"
         align="center"
@@ -261,7 +259,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['finance:payment:edit']"
-             v-if="
+            v-if="
               scope.row.fBillstatus == '保存' ||
               scope.row.fBillstatus == '暂存' ||
               scope.row.fBillstatus == '审批驳回'
@@ -274,7 +272,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['finance:payment:remove']"
-             v-if="
+            v-if="
               scope.row.fBillstatus == '保存' ||
               scope.row.fBillstatus == '暂存' ||
               scope.row.fBillstatus == '审批驳回'
@@ -473,7 +471,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-         <el-form-item label="业务类型" prop="fSystemType">
+        <el-form-item label="业务类型" prop="fSystemType">
           <el-select
             v-model="queryParams.fSystemType"
             placeholder="请选择业务类型"
@@ -539,7 +537,7 @@
         <el-table-column label="提单号" align="center" prop="fMblno" />
         <el-table-column label="存货单号" align="center" prop="fBscorpno" />
         <el-table-column label="品名" align="center" prop="fProductName" />
-        <el-table-column label="业务日期" align="center" prop="fBsdate">
+        <el-table-column label="业务日期" align="center">
           <template slot-scope="scope" v-if="scope.row.fBsdate">
             <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
           </template>
@@ -737,7 +735,7 @@
               </el-select>
             </template>
           </el-form-item>
-          <el-form-item label="仓储业务" prop="fFeeid">
+          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1">
             <el-select
               v-model="queryParameter.fBilltype"
               size="small"
@@ -835,7 +833,11 @@
           <el-table-column label="货权方" align="center" prop="fName" />
           <el-table-column label="提单号" align="center" prop="fMblno" />
           <el-table-column label="品名" align="center" prop="fProductName" />
-          <el-table-column label="业务日期" align="center" prop="fBsdate" />
+          <el-table-column label="业务日期" align="center">
+             <template slot-scope="scope" v-if="scope.row.fBsdate">
+            <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
+          </template>
+          </el-table-column>
           <el-table-column label="业务类型" align="center" prop="fBilltype">
             <template slot-scope="scope">
               <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
@@ -923,7 +925,6 @@
         <el-table-column
           label="业务日期"
           align="center"
-          prop="fBsdate"
           width="120"
         >
           <template slot-scope="scope" v-if="scope.row.fBsdate">

src/views/fleet/plans/AddOrUpdate.vue

@@ -754,7 +754,9 @@
                       @click.native.prevent="
                         revokeplansRow(scope.$index, schedulingList, scope.row)
                       "
-                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
+                      :disabled="
+                        scope.row.billStatus < 6 || !scope.row.billStatus
+                      "
                       >撤销</el-button
                     >
                     <el-button
@@ -762,7 +764,9 @@
                       type="text"
                       icon="el-icon-refresh"
                       @click.native.prevent="changeplansRow(scope.row)"
-                      :disabled="scope.row.billStatus < 6||!scope.row.billStatus"
+                      :disabled="
+                        scope.row.billStatus < 6 || !scope.row.billStatus
+                      "
                       >变更</el-button
                     >
                   </template>
@@ -1283,11 +1287,21 @@
         >提 交</el-button
       >
       <!-- <el-button type="success" @click="submitFix">修改</el-button> -->
-      <el-button type="success" @click="submitAllowChanges" :disabled="!this.form.billStatus">修 改</el-button>
+      <el-button
+        type="success"
+        @click="submitAllowChanges"
+        :disabled="!this.form.billStatus"
+        >修 改</el-button
+      >
       <el-button type="info" @click="submitSave" :disabled="disabled"
         >保 存</el-button
       >
-      <el-button type="warning" @click="submitRetreat" :disabled="!this.form.billStatus">撤 回</el-button>
+      <el-button
+        type="warning"
+        @click="submitRetreat"
+        :disabled="!this.form.billStatus"
+        >撤 回</el-button
+      >
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
   </el-dialog>
@@ -1356,10 +1370,10 @@ export default {
       type: Array,
       default: [],
     },
-    relevantAttachments:{
+    relevantAttachments: {
       type: Array,
       default: [],
-    }
+    },
   },
   components: {
     UploadFile,
@@ -1482,8 +1496,7 @@ export default {
       this.fWbuOptions = response.rows;
     });
     company({
-      delFlag: "0",
-      billStatus: 6,
+      fStatus: 1,
     }).then((response) => {
       this.companyList = response.rows;
     });
@@ -1769,7 +1782,7 @@ export default {
           if (response.code == 200) {
             this.$set(row, "billStatus", 6);
             // this.$set(row, "disabled", true);
-             this.$set(row, "id", response.data.plan.id);
+            this.$set(row, "id", response.data.plan.id);
             this.$set(row, "orgId", response.data.plan.orgId);
             this.$parent.getSave2(response.data.cntrs);
           }
@@ -1779,7 +1792,7 @@ export default {
           this.msgSuccess("成功提交");
           if (response.code == 200) {
             this.$set(row, "billStatus", 6);
-             this.$set(row, "id", response.data.plan.id);
+            this.$set(row, "id", response.data.plan.id);
             this.$set(row, "orgId", response.data.plan.orgId);
             this.$parent.getSave2(response.data.cntrs);
           }

src/views/fleet/plans/index.vue

@@ -324,7 +324,11 @@
         fixed="left"
       >
         <template slot-scope="scope">
-          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+          <el-link :underline="false"
+            ><div @click="handleUpdate(scope.row)">
+              {{ scope.row.mblno }}
+            </div></el-link
+          >
         </template>
       </el-table-column>
       <el-table-column

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -714,7 +714,7 @@
                   label="操作"
                   align="center"
                   class-name="small-padding fixed-width"
-                  width="200"
+                  width="240"
                 >
                   <template slot-scope="scope">
                     <el-button

src/views/fleet/scheduling/index.vue

@@ -307,7 +307,11 @@
         fixed="left"
       >
         <template slot-scope="scope">
-          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+            <el-link :underline="false"
+            ><div @click="handleUpdate(scope.row)">
+              {{ scope.row.mblno }}
+            </div></el-link
+          >
         </template>
       </el-table-column>
       <el-table-column

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -708,21 +708,16 @@
                   prop="orderStatus"
                 >
                   <template slot-scope="scope">
-                    <div v-if="scope.row.orderStatus == 10">车队安排</div>
-                    <div v-if="scope.row.orderStatus == 20">司机受理</div>
-                    <div v-if="scope.row.orderStatus == 30">司机出车</div>
-                    <div v-if="scope.row.orderStatus == 40">提箱</div>
-                    <div v-if="scope.row.orderStatus == 50">装卸货</div>
-                    <div v-if="scope.row.orderStatus == 60">还卸柜</div>
-                    <div v-if="scope.row.orderStatus == 70">费用确认</div>
-                    <div v-if="scope.row.orderStatus == 80">回单</div>
+                    <div v-if="scope.row.billStatus == 2">已暂存</div>
+                    <div v-if="scope.row.billStatus == 3">已撤销</div>
+                    <div v-if="scope.row.billStatus == 6">已提交</div>
                   </template>
                 </el-table-column>
                 <el-table-column
                   label="操作"
                   align="center"
                   class-name="small-padding fixed-width"
-                  width="220"
+                  width="240"
                   fixed="right"
                 >
                   <template slot-scope="scope">
@@ -1489,8 +1484,7 @@ export default {
       this.carManages = response;
     });
     company({
-      delFlag: "0",
-      billStatus: 6,
+         fStatus:1
     }).then((response) => {
       this.companyList = response.rows;
     });

src/views/fleet/sendcar/index.vue

@@ -317,7 +317,11 @@
         fixed="left"
       >
         <template slot-scope="scope">
-          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+            <el-link :underline="false"
+            ><div @click="handleUpdate(scope.row)">
+              {{ scope.row.mblno }}
+            </div></el-link
+          >
         </template>
       </el-table-column>
       <el-table-column

src/views/reportManagement/whgenleg/index.vue

@@ -1,21 +1,29 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="仓库" prop="fwarehouseid">
-        <treeselect style="width:200px"
-                    v-model="queryParams.fWarehouseLocationid"
-                    :options="fWarehouseidOption"
-                    @select="treeseLect"
-                    :show-count="true"
-                    size="small"
-                    placeholder="请选择归属库区" />
+        <treeselect
+          style="width: 200px"
+          v-model="queryParams.fWarehouseLocationid"
+          :options="fWarehouseidOption"
+          @select="treeseLect"
+          :show-count="true"
+          size="small"
+          placeholder="请选择归属库区"
+        />
       </el-form-item>
       <el-form-item label="货物名称" prop="fgoodsid">
         <el-select
           v-model="queryParams.fGoodsid"
           filterable
           remote
-          style="width:200px"
+          style="width: 200px"
           clearable
           size="small"
           :remote-method="goodsRemoteMethod"
@@ -35,7 +43,7 @@
           v-model="queryParams.fTrademodeid"
           placeholder="请选择贸易方式"
           clearable
-          style="width:200px"
+          style="width: 200px"
           size="small"
           @keyup.enter.native="handleQuery"
         >
@@ -52,7 +60,7 @@
           v-model="queryParams.fCorpid"
           filterable
           remote
-          style="width:200px"
+          style="width: 200px"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -72,7 +80,7 @@
           v-model="queryParams.fMblno"
           placeholder="请输入提单号"
           clearable
-          style="width:200px"
+          style="width: 200px"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -82,7 +90,7 @@
           v-model="queryParams.fCntrno"
           placeholder="请输入箱号"
           clearable
-          style="width:200px"
+          style="width: 200px"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -98,12 +106,21 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery">
+          @keyup.enter.native="handleQuery"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -115,51 +132,172 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['warehouseBusiness:whgenleg:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="whgenlegList" show-summary :summary-method="getSum">
+    <el-table
+      v-loading="loading"
+      :data="whgenlegList"
+      show-summary
+      :summary-method="getSum"
+    >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column type="index" label="行号" align="center" width="120" fixed/>
-      <el-table-column label="客户" sortable align="center" prop="fCorpid" fixed width="220"/>
-      <el-table-column label="入库日期" sortable align="center" prop="fReviewDate" fixed width="120">
+      <el-table-column
+        type="index"
+        label="行号"
+        align="center"
+        width="120"
+        fixed
+      />
+      <el-table-column
+        label="客户"
+        sortable
+        align="center"
+        prop="fCorpid"
+        fixed
+        width="220"
+      />
+      <el-table-column
+        label="入库日期"
+        sortable
+        align="center"
+        prop="fReviewDate"
+        fixed
+        width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.fOriginalbilldate, "{y}-{m}-{d}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="仓储费计算日期"
+        sortable
+        align="center"
+        prop="fChargedate"
+        fixed
+        width="140"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fOriginalbilldate , "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.fChargedate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="仓储费计算日期" sortable align="center" prop="fChargedate" fixed width="140">
+      <el-table-column
+        label="提单号"
+        sortable
+        align="center"
+        fixed
+        show-overflow-tooltip
+        width="216"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fChargedate , "{y}-{m}-{d}") }}</span>
+          <div @click="goDetail(scope.row)">{{ scope.row.fMblno }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="提单号" sortable align="center" fixed prop="fMblno" show-overflow-tooltip width="216"/>
-      <el-table-column label="货物属性" align="center" prop="fBusinessTypes" width="120"/>
-      <el-table-column label="属性详情" align="center" prop="fMarks" width="120"/>
-      <el-table-column label="品名" align="center" prop="fGoodsids" width="120"/>
-      <el-table-column label="仓库" sortable align="center" prop="fWarehouseids" width="120"/>
-      <el-table-column label="贸易方式" sortable align="center" prop="fTrademodeid" width="120"/>
-<!--      <el-table-column
+      <el-table-column
+        label="货物属性"
+        align="center"
+        prop="fBusinessTypes"
+        width="120"
+      />
+      <el-table-column
+        label="属性详情"
+        align="center"
+        prop="fMarks"
+        width="120"
+      />
+      <el-table-column
+        label="品名"
+        align="center"
+        prop="fGoodsids"
+        width="120"
+      />
+      <el-table-column
+        label="仓库"
+        sortable
+        align="center"
+        prop="fWarehouseids"
+        width="120"
+      />
+      <el-table-column
+        label="贸易方式"
+        sortable
+        align="center"
+        prop="fTrademodeid"
+        width="120"
+      />
+      <!--      <el-table-column
         label="贸易方式"
         align="center"
         prop="fTrademodeid"
         :formatter="fTrademodeidFormat"
         width="120"
       />-->
-      <el-table-column label="入库件数" align="center" prop="fQtyD" width="120"/>
-<!--      <el-table-column label="入库尺码" align="center" prop="fVolumnD" />-->
-      <el-table-column label="入库毛重(kg)" align="center" prop="fGrossweightD" width="120"/>
-      <el-table-column label="入库净重(kg)" align="center" prop="fNetweightD" width="120"/>
-<!--      <el-table-column label="出库尺码" align="center" prop="fVolumnC" />-->
-      <el-table-column label="出库件数" align="center" prop="fQtyC" width="120"/>
-      <el-table-column label="出库毛重(kg)" align="center" prop="fGrossweightC" width="120"/>
-      <el-table-column label="出库净重(kg)" align="center" prop="fNetweightC" width="120"/>
-      <el-table-column label="结余件数" align="center" prop="fQtyblc" width="120"/>
-      <el-table-column label="结余毛重(kg)" align="center" prop="fGrossweightblc" width="120"/>
-      <el-table-column label="结余净重(kg)" align="center" prop="fNetweightblc" width="120"/>
-      <el-table-column label="箱号" align="center" prop="fCntrno" width="120"/>
-      <el-table-column label="备注" align="center" prop="remark" width="120"/>
+      <el-table-column
+        label="入库件数"
+        align="center"
+        prop="fQtyD"
+        width="120"
+      />
+      <!--      <el-table-column label="入库尺码" align="center" prop="fVolumnD" />-->
+      <el-table-column
+        label="入库毛重(kg)"
+        align="center"
+        prop="fGrossweightD"
+        width="120"
+      />
+      <el-table-column
+        label="入库净重(kg)"
+        align="center"
+        prop="fNetweightD"
+        width="120"
+      />
+      <!--      <el-table-column label="出库尺码" align="center" prop="fVolumnC" />-->
+      <el-table-column
+        label="出库件数"
+        align="center"
+        prop="fQtyC"
+        width="120"
+      />
+      <el-table-column
+        label="出库毛重(kg)"
+        align="center"
+        prop="fGrossweightC"
+        width="120"
+      />
+      <el-table-column
+        label="出库净重(kg)"
+        align="center"
+        prop="fNetweightC"
+        width="120"
+      />
+      <el-table-column
+        label="结余件数"
+        align="center"
+        prop="fQtyblc"
+        width="120"
+      />
+      <el-table-column
+        label="结余毛重(kg)"
+        align="center"
+        prop="fGrossweightblc"
+        width="120"
+      />
+      <el-table-column
+        label="结余净重(kg)"
+        align="center"
+        prop="fNetweightblc"
+        width="120"
+      />
+      <el-table-column label="箱号" align="center" prop="fCntrno" width="120" />
+      <el-table-column label="备注" align="center" prop="remark" width="120" />
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -181,11 +319,11 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-      :page-sizes="[50,100, 200, 500, 1000]"
+      :page-sizes="[50, 100, 200, 500, 1000]"
       @pagination="getList"
     />
 
@@ -193,16 +331,28 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="原始入库业务编号" prop="fOriginalbillno">
-          <el-input v-model="form.fOriginalbillno" placeholder="请输入原始入库业务编号" />
+          <el-input
+            v-model="form.fOriginalbillno"
+            placeholder="请输入原始入库业务编号"
+          />
         </el-form-item>
         <el-form-item label="上期件数" prop="fPreqty">
           <el-input v-model="form.fPreqty" placeholder="请输入上期件数" />
         </el-form-item>
-        <el-form-item label="上期毛重,单位为吨，保留6位小数" prop="fPregrossweight">
-          <el-input v-model="form.fPregrossweight" placeholder="请输入上期毛重,单位为吨，保留6位小数" />
+        <el-form-item
+          label="上期毛重,单位为吨，保留6位小数"
+          prop="fPregrossweight"
+        >
+          <el-input
+            v-model="form.fPregrossweight"
+            placeholder="请输入上期毛重,单位为吨，保留6位小数"
+          />
         </el-form-item>
         <el-form-item label="上期净重," prop="fPrenetweight">
-          <el-input v-model="form.fPrenetweight" placeholder="请输入上期净重," />
+          <el-input
+            v-model="form.fPrenetweight"
+            placeholder="请输入上期净重,"
+          />
         </el-form-item>
         <el-form-item label="入库件数" prop="fQtyd">
           <el-input v-model="form.fQtyd" placeholder="请输入入库件数" />
@@ -226,13 +376,19 @@
           <el-input v-model="form.fQtyblc" placeholder="请输入结余件数" />
         </el-form-item>
         <el-form-item label="出库毛重,单位为吨" prop="fGrossweightc">
-          <el-input v-model="form.fGrossweightc" placeholder="请输入出库毛重,单位为吨" />
+          <el-input
+            v-model="form.fGrossweightc"
+            placeholder="请输入出库毛重,单位为吨"
+          />
         </el-form-item>
         <el-form-item label="出库净重" prop="fNetweightc">
           <el-input v-model="form.fNetweightc" placeholder="请输入出库净重" />
         </el-form-item>
         <el-form-item label="结余毛重" prop="fGrossweightblc">
-          <el-input v-model="form.fGrossweightblc" placeholder="请输入结余毛重" />
+          <el-input
+            v-model="form.fGrossweightblc"
+            placeholder="请输入结余毛重"
+          />
         </el-form-item>
         <el-form-item label="结余净重" prop="fNetweightblc">
           <el-input v-model="form.fNetweightblc" placeholder="请输入结余净重" />
@@ -252,7 +408,11 @@
           <el-input v-model="form.fMarks" placeholder="请输入唛头" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -264,23 +424,30 @@
 </template>
 
 <script>
-import { listWhgenleg, getWhgenleg, delWhgenleg, addWhgenleg, updateWhgenleg, exportWhgenleg } from "@/api/reportManagement/whgenleg";
-import { listWarehouse, treeselect } from '@/api/basicdata/warehouse'
-import {listArea} from "@/api/basicdata/area";
-import {listGoods} from "@/api/basicdata/goods";
-import {listCorps} from "@/api/basicdata/corps";
-import Treeselect from '@riophae/vue-treeselect'
+import {
+  listWhgenleg,
+  getWhgenleg,
+  delWhgenleg,
+  addWhgenleg,
+  updateWhgenleg,
+  exportWhgenleg,
+} from "@/api/reportManagement/whgenleg";
+import { listWarehouse, treeselect } from "@/api/basicdata/warehouse";
+import { listArea } from "@/api/basicdata/area";
+import { listGoods } from "@/api/basicdata/goods";
+import { listCorps } from "@/api/basicdata/corps";
+import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Whgenleg",
   components: {
-    Treeselect
+    Treeselect,
   },
   data() {
     return {
       //仓库树状下拉
-      fWarehouseidOption:[],
+      fWarehouseidOption: [],
       // 货权方(客户数据)
       fMblnoOptions: [],
       // 贸易方式(数据字典),对应t_trademodels 字典
@@ -324,17 +491,15 @@ export default {
         fCntrno: null,
         fStatus: null,
         fMarks: null,
-        fBusinessType:null,
-        fBusinessTypes:null
+        fBusinessType: null,
+        fBusinessTypes: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        fMarks: [
-          { required: true, message: "唛头不能为空", trigger: "blur" }
-        ],
-      }
+        fMarks: [{ required: true, message: "唛头不能为空", trigger: "blur" }],
+      },
     };
   },
   created() {
@@ -342,42 +507,59 @@ export default {
     this.getDicts("data_trademodes").then((response) => {
       this.fTrademodeidOptions = response.data;
     });
-    treeselect().then(response => {
-      this.fWarehouseidOption = response.data
-    })
+    treeselect().then((response) => {
+      this.fWarehouseidOption = response.data;
+    });
   },
   methods: {
     //合计
-    getSum(param){
-      const { columns, data } = param
-      const sums = []
+    getSum(param) {
+      const { columns, data } = param;
+      const sums = [];
       columns.forEach((column, index) => {
         if (index === 0) {
-          sums[index] = '总计'
-        } else if (index ===13  || index ===10 || index ===11 || index ===12 || index ===14 || index ===15 || index ===16 || index ===17 || index ===18) {
-          const values = data.map(item => Number(item[column.property]))
-          if (!values.every(value => isNaN(value))) {
+          sums[index] = "总计";
+        } else if (
+          index === 13 ||
+          index === 10 ||
+          index === 11 ||
+          index === 12 ||
+          index === 14 ||
+          index === 15 ||
+          index === 16 ||
+          index === 17 ||
+          index === 18
+        ) {
+          const values = data.map((item) => Number(item[column.property]));
+          if (!values.every((value) => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
+              const value = Number(curr);
               if (!isNaN(value)) {
-                return prev + curr
+                return prev + curr;
               } else {
-                return prev
+                return prev;
               }
-            }, 0)
-            if( index ===11 || index ===12 || index ===14 || index ===15 || index ===17 || index ===18){
-              sums[index] = (sums[index]/1000).toFixed(2) + '(吨)'
+            }, 0);
+            if (
+              index === 11 ||
+              index === 12 ||
+              index === 14 ||
+              index === 15 ||
+              index === 17 ||
+              index === 18
+            ) {
+              sums[index] = (sums[index] / 1000).toFixed(2) + "(吨)";
             }
           }
         }
-      })
-      return sums
+      });
+      return sums;
     },
-    treeseLect(tree){
-      this.queryParams.fWarehouseLocationid = tree.id
+    treeseLect(tree) {
+      this.queryParams.fWarehouseLocationid = tree.id;
     },
     getTreeselect() {
-      treeselect().then(response => {
+      treeselect().then((response) => {
         this.warehousesOptions = response.data;
       });
     },
@@ -439,8 +621,8 @@ export default {
     /** 查询库存总账列表 */
     getList() {
       this.loading = true;
-      listWhgenleg(this.queryParams).then(response => {
-        console.log(response)
+      listWhgenleg(this.queryParams).then((response) => {
+        console.log(response);
         this.whgenlegList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -485,7 +667,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -517,11 +699,11 @@ export default {
         fCntrno: null,
         fStatus: null,
         fMarks: null,
-        fBusinessType:null,
-        fBusinessTypes:null,
-        fBilltype:null,
-        fwarehouseid:null
-      }
+        fBusinessType: null,
+        fBusinessTypes: null,
+        fBilltype: null,
+        fwarehouseid: null,
+      };
       // this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -533,16 +715,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.fAccyear != null) {
-            updateWhgenleg(this.form).then(response => {
+            updateWhgenleg(this.form).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addWhgenleg(this.form).then(response => {
+            addWhgenleg(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -554,18 +736,34 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有库存总账数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+      this.$confirm("是否确认导出所有库存总账数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
           return exportWhgenleg(queryParams);
-        }).then(response => {
-          this.download(response.msg);
         })
-    }
-  }
-}
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+    goDetail(row) {
+      this.$router.push({
+        path: "/analysis/stockDetail",
+        query: {
+          fWarehouseLocationid: row.fWarehouseLocationid,
+          fTrademodeids: row.fTrademodeids,
+          fBusinessType: row.fBusinessType,
+          fGoodsid: row.fGoodsid,
+          fCorpIds: row.fCorpIds,
+          fMarks: row.fMarks,
+          fMblno:row.fMblno
+        },
+      });
+    },
+  },
+};
 </script>
 <style lang="scss">
 .el-table {

src/views/track/cabinet/AddOrUpdate.vue

@@ -519,7 +519,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.billType == 1">
+       <el-row v-if="form.billType == 1">
           <el-col :span="6">
             <el-form-item label="修洗费" prop="costomAmt03">
               <el-input
@@ -557,7 +557,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="垫付备注" prop="costomStr02">
+            <el-form-item label="费用备注" prop="costomStr02">
               <el-input
                 v-model="form.costomStr02"
                 placeholder="请输入备注"
@@ -570,9 +570,9 @@
         </el-row>
         <el-row v-if="form.billType == 2">
           <el-col :span="6">
-            <el-form-item label="港杂费" prop="costomAmt03">
+            <el-form-item label="港杂费" prop="costomAmt05">
               <el-input
-                v-model="form.costomAmt03"
+                v-model="form.costomAmt05"
                 placeholder="请输入港杂费"
                 size="mini"
                 style="width: 180px"
@@ -582,9 +582,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="提箱费" prop="costomAmt04">
+            <el-form-item label="提箱费" prop="costomAmt06">
               <el-input
-                v-model="form.costomAmt04"
+                v-model="form.costomAmt06"
                 placeholder="请输入提箱费"
                 size="mini"
                 style="width: 180px"
@@ -606,7 +606,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="垫付备注" prop="costomStr01">
+            <el-form-item label="费用备注" prop="costomStr01">
               <el-input
                 v-model="form.costomStr01"
                 placeholder="请输入备注"
@@ -1156,7 +1156,7 @@
         >回 单</el-button
       >
       <el-button type="success" @click="submitAllowChanges">修 改</el-button>
-      <!-- <el-button type="info" @click="submitSave">保 存</el-button> -->
+      <el-button type="info" @click="submitSave">保 存</el-button>
       <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
       <el-button @click="showDialog = false">取 消</el-button>
     </span>

src/views/track/cabinet/index.vue

@@ -162,14 +162,14 @@
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
-            <!-- <el-col :span="6">
+            <el-col :span="6">
               <el-form-item
                 label-width="100px"
                 label="提箱时间"
-                prop="pickerDate"
+                prop="cLoadDate"
               >
                 <el-date-picker
-                  v-model="queryParams.pickerDate"
+                  v-model="queryParams.cLoadDate"
                   type="daterange"
                   align="right"
                   unlink-panels
@@ -177,11 +177,12 @@
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                   :picker-options="pickerOptions"
-                  value-format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd HH:mm-ss"
+                  :default-time="['00:00:00', '23:59:59']"
                 >
                 </el-date-picker>
               </el-form-item>
-            </el-col> -->
+            </el-col>
           </el-row>
         </div>
       </el-collapse-transition>
@@ -323,7 +324,7 @@
         </div>
       </div>
     </el-row>
-    <el-dialog title="提示" :visible.sync="showSetting" width="700px">
+    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
       <div>配置排序列数据（拖动调整顺序）</div>
       <div style="margin-left: 17px">
         <el-checkbox
@@ -390,7 +391,11 @@
         fixed="left"
       >
         <template slot-scope="scope">
-          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+            <el-link :underline="false"
+            ><div @click="handleUpdate(scope.row)">
+              {{ scope.row.mblno }}
+            </div></el-link
+          >
         </template>
       </el-table-column>
       <el-table-column
@@ -542,7 +547,7 @@ export default {
         loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
-        pickerDate: null,
+        cLoadDate: null,
       },
       showSetting: false,
       drag: false,
@@ -1056,7 +1061,7 @@ export default {
         // if (response.data.cars.orderStatus >= 60) {
         //   this.disabled = true;
         // }
-        this.title = "查看装卸柜";
+        this.title = "查看详情页";
         this.form = response.data.cars;
         this.relevantAttachments = response.data.attachs;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
@@ -1107,6 +1112,8 @@ export default {
       this.queryParams.pageNum = 1;
       if (Status) {
         this.queryParams.carStatus = Status;
+      } else {
+        this.queryParams.carStatus = null;
       }
       this.getList();
     },

src/views/track/singleCost/AddOrUpdate.vue

@@ -40,9 +40,9 @@
               >
                 <el-option
                   v-for="(dict, index) in billTypeList"
-                  :key="index.dictSort"
+                  :key="index.dictValue"
                   :label="dict.dictLabel"
-                  :value="dict.dictSort"
+                  :value="dict.dictValue"
                 />
               </el-select>
             </el-form-item>
@@ -491,7 +491,7 @@
               filterable
               size="mini"
               style="width: 160px"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
             >
               <el-option
                 v-for="(dict, index) in fMblnoOptions"
@@ -502,12 +502,17 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="fFeeid" label="费用名称" align="center" width="120">
+        <el-table-column
+          prop="fFeeid"
+          label="费用名称"
+          align="center"
+          width="120"
+        >
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fFeeid"
               filterable
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
               remote
               placeholder="费用名称"
             >
@@ -520,24 +525,29 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="fDc" label="收付" align="center"  width="100">
+        <el-table-column prop="fDc" label="收付" align="center" width="100">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fDc"
               placeholder="请选择"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
             >
               <el-option label="收" value="D"></el-option>
               <el-option label="付" value="C"></el-option>
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="fFeeunitid" label="计费单位" align="center" width="100">
+        <el-table-column
+          prop="fFeeunitid"
+          label="计费单位"
+          align="center"
+          width="100"
+        >
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fFeeunitid"
               placeholder="请选择计费单位"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
               clearable
             >
               <el-option
@@ -549,33 +559,48 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="fBillingQty" label="计费数量" align="center" width="100">
+        <el-table-column
+          prop="fBillingQty"
+          label="计费数量"
+          align="center"
+          width="100"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fBillingQty"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
               placeholder="请输入内容"
               @input="total(scope.row)"
               v-input-limit="2"
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="fUnitprice" label="单价" align="center" width="100">
+        <el-table-column
+          prop="fUnitprice"
+          label="单价"
+          align="center"
+          width="100"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fUnitprice"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
               placeholder="请输入内容"
               @input="total(scope.row)"
               v-input-limit="2"
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="fCurrency" label="币种" align="center" width="100">
+        <el-table-column
+          prop="fCurrency"
+          label="币种"
+          align="center"
+          width="100"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fCurrency"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
               placeholder="请输入内容"
             ></el-input>
           </template>
@@ -584,7 +609,7 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fExrate"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
               placeholder="请输入内容"
             ></el-input>
           </template>
@@ -593,16 +618,21 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fAmount"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
               placeholder="请输入内容"
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="fTaxrate" label="税率" align="center" width="100">
+        <el-table-column
+          prop="fTaxrate"
+          label="税率"
+          align="center"
+          width="100"
+        >
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fTaxrate"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="scope.row.actId == 1080 || disabled"
               placeholder="请输入内容"
             ></el-input>
           </template>
@@ -611,18 +641,14 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.remarks"
-              :disabled="scope.row.actId != 1090 || disabled"
+              :disabled="disabled"
               placeholder="请输入内容"
             ></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="remarks" label="费用来源" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.actId == 1030">接单</span>
-            <span v-if="scope.row.actId == 1040">提箱</span>
-            <span v-if="scope.row.actId == 1050">装卸柜</span>
-            <span v-if="scope.row.actId == 1060">还卸柜</span>
-            <span v-if="scope.row.actId == 1070">回单</span>
+            <span v-if="scope.row.actId == 1080">费用确认</span>
             <span v-if="scope.row.actId == 1090">追加费用</span>
           </template>
         </el-table-column>
@@ -745,6 +771,7 @@ export default {
       goodsOptions: [],
       fWbuOptions: [],
       disabled: false,
+      fCNameOptions: [],
     };
   },
   created() {
@@ -796,6 +823,9 @@ export default {
     init() {
       this.showDialog = true;
       query(this.fname.id).then((data) => {
+        if (data.data.billType) {
+          data.data.billType = data.data.billType.toString();
+        }
         this.form = data.data;
         this.feesList = data.data.ftmsorderbillsfees;
         for (let item in this.feesList) {
@@ -847,12 +877,17 @@ export default {
       });
     },
     addRelevt2() {
-      // if(this.feesList.length){
-
-      // }
+      let arr = this.feesList;
+      let arr2 = [];
+      arr.forEach((e) => {
+        arr2.push(e.fFeeid);
+      });
+      if (arr2.length > 0) {
+        return this.msgSuccess("费用已导入，请勿重复导入");
+      }
       if (this.form.oilAmt > 0) {
         this.feesList.push({
-          actId: "1090",
+          actId: "1080",
           fCorpid: this.form.fCorpId,
           fFeeid: 52,
           fDc: "C",
@@ -866,9 +901,41 @@ export default {
           remarks: "",
         });
       }
+      if (this.form.driverbonus > 0) {
+        this.feesList.push({
+          actId: "1080",
+          fCorpid: this.form.fCorpId,
+          fFeeid: 53,
+          fDc: "C",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.driverbonus,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.driverbonus,
+          fExrate: 1,
+          remarks: "",
+        });
+      }
+      if (this.form.costOth > 0) {
+        this.feesList.push({
+          actId: "1080",
+          fCorpid: this.form.fCorpId,
+          fFeeid: 54,
+          fDc: "C",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costOth,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costOth,
+          fExrate: 1,
+          remarks: "",
+        });
+      }
       if (this.form.costomAmt03 > 0) {
         this.feesList.push({
-          actId: "1090",
+          actId: "1080",
           fCorpid: this.form.fCorpId,
           fFeeid: 55,
           fDc: "C",
@@ -882,9 +949,41 @@ export default {
           remarks: "",
         });
       }
+      if (this.form.costomAmt04 > 0) {
+        this.feesList.push({
+          actId: "1080",
+          fCorpid: this.form.fCorpId,
+          fFeeid: 56,
+          fDc: "C",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt04,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt04,
+          fExrate: 1,
+          remarks: "",
+        });
+      }
+      if (this.form.costomAmt02 > 0) {
+        this.feesList.push({
+          actId: "1080",
+          fCorpid: this.form.fCorpId,
+          fFeeid: 57,
+          fDc: "C",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt02,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt02,
+          fExrate: 1,
+          remarks: "",
+        });
+      }
       if (this.form.costomAmt05 > 0) {
         this.feesList.push({
-          actId: "1090",
+          actId: "1080",
           fCorpid: this.form.fCorpId,
           fFeeid: 58,
           fDc: "C",
@@ -898,6 +997,38 @@ export default {
           remarks: "",
         });
       }
+      if (this.form.costomAmt06 > 0) {
+        this.feesList.push({
+          actId: "1080",
+          fCorpid: this.form.fCorpId,
+          fFeeid: 59,
+          fDc: "C",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt06,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt06,
+          fExrate: 1,
+          remarks: "",
+        });
+      }
+      if (this.form.costomAmt01 > 0) {
+        this.feesList.push({
+          actId: "1080",
+          fCorpid: this.form.fCorpId,
+          fFeeid: 60,
+          fDc: "C",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt01,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt01,
+          fExrate: 1,
+          remarks: "",
+        });
+      }
     },
     deleteplansRow(index, rows, row) {
       let arr = this.schedulingList;

src/views/track/singleCost/index.vue

@@ -250,7 +250,7 @@
         </div>
       </div>
     </el-row>
-    <el-dialog title="提示" :visible.sync="showSetting" width="700px">
+    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
       <div>配置排序列数据（拖动调整顺序）</div>
       <div style="margin-left: 17px">
         <el-checkbox
@@ -317,7 +317,11 @@
         fixed="left"
       >
         <template slot-scope="scope">
-          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+            <el-link :underline="false"
+            ><div @click="handleUpdate(scope.row)">
+              {{ scope.row.mblno }}
+            </div></el-link
+          >
         </template>
       </el-table-column>
       <el-table-column

src/views/warehouseCheck/index.vue

@@ -0,0 +1,320 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="仓库名称" prop="fpid">
+        <el-input
+          v-model="queryParams.fPid"
+          placeholder="请输入仓库名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划日期" prop="fPid">
+        <el-input
+          v-model="queryParams.fPid"
+          placeholder="请输入计划日期"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="巡检人" prop="fPid">
+        <el-input
+          v-model="queryParams.fPid"
+          placeholder="请输入巡检人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="巡检备注" prop="fPid">
+        <el-input
+          v-model="queryParams.fPid"
+          placeholder="请输入巡检备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['warehouse:log:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['warehouse:log:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['warehouse:log:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['warehouse:log:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" index="index" />
+      <el-table-column label="仓库名称" align="center" prop="warehouse" />
+      <el-table-column label="计划日期" align="center" prop="planned" />
+      <el-table-column label="巡检日期" align="center" prop="planned" />
+      <el-table-column label="巡检人" align="center" prop="people" />
+      <el-table-column label="巡检备注" align="center" prop="remarks" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['warehouse:log:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['warehouse:log:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改入出库状态对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="display:flex;flex-wrap: wrap;justify-content: space-between">
+        <el-form-item label="仓库名称" prop="fPid">
+          <el-input v-model="form.fPid" style="width: 250px;" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="巡检日期" prop="fPid">
+          <el-input v-model="form.fPid" style="width: 250px;" placeholder="请输入巡检日期" />
+        </el-form-item>
+        <el-form-item label="巡检人" prop="fPid">
+          <el-input v-model="form.fPid" style="width: 250px;" placeholder="请输入仓库名称" />
+        </el-form-item>
+      </el-form>
+      <el-form ref="form" :model="form" :rules="rules" label-width="50px">
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+      </el-form-item>
+      </el-form>
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>巡检照片</span>
+<!--          <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>-->
+        </div>
+        <div class="text item" style="display: flex;justify-content: space-between">
+          <img src="https://www.dmu.com.cn/images/banner/banner41.jpg?v=2" style="width: 20%;" alt="">
+          <img src="https://www.dmu.com.cn/images/banner/banner41.jpg?v=2" style="width: 20%;" alt="">
+          <img src="https://www.dmu.com.cn/images/banner/banner41.jpg?v=2" style="width: 20%;" alt="">
+          <img src="https://www.dmu.com.cn/images/banner/banner41.jpg?v=2" style="width: 20%;" alt="">
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "Log",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 入出库状态表格数据
+      logList: [
+        {
+          warehouse:'途宝仓库-A1',
+          planned:'2021-04-07',
+          people:'张三',
+          remarks:'无异常'
+        },{
+          warehouse:'途宝仓库-A2',
+          planned:'2021-04-07',
+          people:'张三',
+          remarks:'无异常'
+        }
+      ],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fPid: null,
+        fItmeid: null,
+        fItmestatus: null,
+        fBillstatus: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询入出库状态列表 */
+    getList() {
+      this.loading = false;
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fPid: null,
+        fItmeid: null,
+        fItmestatus: 0,
+        fBillstatus: "0",
+        createTime: null,
+        createBy: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加巡检详情";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fId = row.fId || this.ids
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fId != null) {
+            updateLog(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLog(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除入出库状态编号为"' + fIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delLog(fIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有入出库状态数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportLog(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    }
+  }
+};
+</script>

vue.config.js

@@ -34,9 +34,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.137.1:9010`,
+        // target: `http://192.168.137.1:9010`,
         // target: `http://engineering.echepei.com:9010/`,
-        //  target: `http://121.36.212.131:9010/`,
+         target: `http://test.tms.tubaosoft.com:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''