1.增加库存总账分类监管导出功能

2.增加出入库统计提单号变亮，方便点击后能跳到对应的仓库详情页

src/api/reportManagement/whgenleg.js

@@ -60,3 +60,12 @@ export function exportWhgenleg(query) {
     params: query
   })
 }
+
+// 分类监管导出
+export  function superviseExportWhgenleg(query) {
+  return request({
+    url: '/warehouseBusiness/whgenleg/superviseExport',
+    method: 'get',
+    params: query
+  })
+}

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -343,6 +343,22 @@
           </el-form-item>
         </el-col>
       </el-row>
+<!--      <el-row>
+        <el-col :span="8">
+          <el-form-item label="包装" prop="fUnit">
+            <el-input
+              v-model.number="form.fUnit"
+              style="width: 80%"
+              maxlength="9"
+              v-input-limit="0"
+              placeholder="包装"
+              :disabled="
+                browseStatus || current !== before || form.warehouseStatus > 3
+              "
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>-->
       <div v-if="detailsHidden2">
         <el-row>
           <el-col :span="8" v-if="false">
@@ -6407,6 +6423,7 @@ export default {
         fbillingway: [{required: true, message: " ", trigger: "blur"}],
         fTocorpid: [{required: true, message: " ", trigger: "blur"}],
         fGoodsid: [{required: true, message: " ", trigger: "blur"}],
+        // fUnit: [{required: true, message: " ", trigger: "blur"}],
       },
       imporRules: {
         fBsdate: [{required: true, message: " ", trigger: "blur"}],

src/views/Warehousing/inStock/index.vue

@@ -806,14 +806,14 @@ export default {
         },
         {
           surface: "23",
-          label: "",
+          label: "fReceivable",
           name: "应收合计",
           checked: 0,
           width: 100,
         },
         {
           surface: "24",
-          label: "",
+          label: "fDue",
           name: "应付合计",
           checked: 0,
           width: 100,
@@ -827,14 +827,14 @@ export default {
         },
         {
           surface: "26",
-          label: "",
+          label: "fRecycle",
           name: "实收合计",
           checked: 0,
           width: 100,
         },
         {
           surface: "27",
-          label: "",
+          label: "fPay",
           name: "实付合计",
           checked: 0,
           width: 100,

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{ test? '青岛道合': '智慧云仓平台' }}</h3>
+      <h3 class="title">{{ test? '青岛道合供应链': '智慧云仓平台' }}</h3>
 
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

src/views/reportManagement/Statistics/index.vue

@@ -240,7 +240,19 @@
         :show-overflow-tooltip="true"
         sortable
         :fixed="item.fixed"
-      />
+      >
+        <template slot-scope="scope">
+            <span v-if="item.label == 'fMblno'">
+              <span v-if="queryParams.isCntrno == 2">{{ scope.row.fMblno }}</span>
+              <el-link v-else :underline="false" type="primary"
+              ><div @click="goDetail(scope.row)">
+                  {{ scope.row.fMblno }}
+                </div></el-link
+              >
+            </span>
+          <span v-else>{{ scope.row[item.label] }}</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column
         label="客户"
         sortable
@@ -1028,6 +1040,21 @@ export default {
           this.download(response.msg);
         });
     },
+    goDetail(row) {
+      this.$router.push({
+        path: "/analysis/stockDetail",
+        query: {
+          fId: row.fId,
+          fWarehouseLocationid: row.fWarehouseLocationid,
+          fTrademodeids: row.fTrademodeids,
+          fBusinessType: row.fBusinessType,
+          fGoodsid: row.fGoodsid,
+          fCorpIds: row.fCorpIds,
+          fMarks: row.fMarks,
+          fMblno: row.fMblno,
+        },
+      });
+    },
   },
 };
 </script>

src/views/reportManagement/whgenleg/index.vue

@@ -177,6 +177,13 @@
       <div class="tabSetting">
         <el-col :span="1.5">
           <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
+            @click="superviseExport"
+            v-hasPermi="['warehouseBusiness:whgenleg:superviseExport']"
+            >分类监管导出</el-button>
+          <el-button
             type="warning"
             icon="el-icon-download"
             size="mini"
@@ -410,8 +417,8 @@ import {
   delWhgenleg,
   addWhgenleg,
   updateWhgenleg,
-  exportWhgenleg,
-} from "@/api/reportManagement/whgenleg";
+  exportWhgenleg, superviseExportWhgenleg
+} from '@/api/reportManagement/whgenleg'
 import { listWarehouse, treeselect } from "@/api/basicdata/warehouse";
 import { listArea } from "@/api/basicdata/area";
 import { listGoods } from "@/api/basicdata/goods";
@@ -1068,6 +1075,19 @@ export default {
         }
       });
     },
+    /** 分类监管导出 */
+    superviseExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("确认是否导出分类监管数据?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(function() {
+        return superviseExportWhgenleg(queryParams);
+      }).then((response) => {
+        this.download(response.msg);
+      })
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;