库存总账修改

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/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,