From 2b78cf0cd68e1809bc4cad7d730bef6ab9c4c118 Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期四, 28 九月 2023 15:30:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS

---
 src/views/overview/AddOverviewDialog.vue         |    9 
 src/views/reportForm/inventoryReport/index.vue   |  190 +++++--------
 src/views/warehouseManage/listingRules/index.vue |   10 
 src/components/makepager/TableCommonView.vue     |  166 ++++-------
 src/views/productManage/product/index.vue        |   18 
 src/api/operate/inventoryAdjustment.js           |   16 +
 src/api/warehouseManage/warehouse.js             |   21 
 src/components/makepager/CommonFormTableView.vue |   15 +
 src/views/reportForm/locationReport/index.vue    |  134 ++++------
 src/views/operate/inventoryAdjustment/index.vue  |  150 ++++++----
 10 files changed, 345 insertions(+), 384 deletions(-)

diff --git a/src/api/operate/inventoryAdjustment.js b/src/api/operate/inventoryAdjustment.js
index a30d00b..61a55b0 100644
--- a/src/api/operate/inventoryAdjustment.js
+++ b/src/api/operate/inventoryAdjustment.js
@@ -33,3 +33,19 @@
     data
   })
 }
+// 淇敼搴撳瓨璋冩暣
+export function updateInventoryAdjustment(data) {
+  return request({
+    url: "/api-wms/v1/locationProductAmount/update",
+    method: "post",
+    data
+  })
+}
+// 搴旂敤搴撳瓨璋冩暣
+export function finishInventoryAdjustment(data) {
+  return request({
+    url: "/api-wms/v1/locationProductAmount/finish",
+    method: "post",
+    data
+  })
+}
diff --git a/src/api/warehouseManage/warehouse.js b/src/api/warehouseManage/warehouse.js
index 8e67a72..94ce3d5 100644
--- a/src/api/warehouseManage/warehouse.js
+++ b/src/api/warehouseManage/warehouse.js
@@ -18,16 +18,16 @@
 // 鍒犻櫎浠撳簱
 export function deleteWarehouse(data) {
   return request({
-    url: "/api-wms/v1/warehouse/warehouse/"+data.id,
+    url: "/api-wms/v1/warehouse/warehouse/" + data.id,
     method: "delete",
     data
   })
 }
-// 鏇存柊浠撳簱 
+// 鏇存柊浠撳簱
 export function updateWarehouse(data) {
   return request({
-    url: "/api-wms/v1/warehouse/warehouse/"+data.id,
-    method: "put",
+    url: "/api-wms/v1/warehouse/updateWarehouse",
+    method: "post",
     data
   })
 }
@@ -48,15 +48,15 @@
 // 鍒犻櫎涓氬姟绫诲瀷
 export function deleteOperationType(data) {
   return request({
-    url: "/api-wms/v1/operationType/operationType/"+data.id,
+    url: "/api-wms/v1/operationType/operationType/" + data.id,
     method: "delete",
     data
   })
 }
-// 鏇存柊涓氬姟绫诲瀷 
+// 鏇存柊涓氬姟绫诲瀷
 export function updateOperationType(data) {
   return request({
-    url: "/api-wms/v1/operationType/operationType/"+data.id,
+    url: "/api-wms/v1/operationType/operationType/" + data.id,
     method: "put",
     data
   })
@@ -77,10 +77,10 @@
     data
   })
 }
-// 鍒犻櫎浣嶇疆 
+// 鍒犻櫎浣嶇疆
 export function deleteLocation(data) {
   return request({
-    url: "/api-wms/v1/location/deleteLocation/"+data.id,
+    url: "/api-wms/v1/location/deleteLocation/" + data.id,
     method: "delete",
     data
   })
@@ -88,7 +88,7 @@
 // 浣嶇疆 璇︽儏
 export function getLocationDetails(data) {
   return request({
-    url: "/api-wms/v1/location/getLocationDetails/"+data.id,
+    url: "/api-wms/v1/location/getLocationDetails/" + data.id,
     method: "get",
     data
   })
@@ -101,4 +101,3 @@
     data
   })
 }
-
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 099c275..c569190 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -1,9 +1,16 @@
 <template>
-  <div class="page-view">
-    <el-form ref="form" :model="tableList" :show-message="false" label-position="right">
+  <div class="page-view" :class="{ setHeight: isinventory || islistingrules }">
+    <el-form
+      ref="form"
+      :model="tableList"
+      :show-message="false"
+      label-position="right"
+      :class="{ setHeight: isinventory || islistingrules }"
+    >
       <el-table
         :data="tableList.tableData"
         style="width: 100%"
+        :class="{ setHeight: isinventory || islistingrules }"
         :header-cell-style="{ background: '#f1f3f8', color: '#000009' }"
         :row-class-name="tableRowClassName"
         @row-click="tableRowClick"
@@ -534,8 +541,12 @@
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
+.setHeight {
+  height: 100%;
+}
 .page-view {
   min-width: 100px;
+
   .el-form-item {
     margin-bottom: 0;
     .custom-name {
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 31e9b0c..d3136aa 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -1,9 +1,6 @@
 <!-- eslint-disable vue/no-use-v-if-with-v-for -->
 <template>
-  <div
-    :class="{ 'table-view': true, table_height: !showSummary }"
-    v-loading="loading"
-  >
+  <div :class="{ 'table-view': true, table_height: !showSummary }" v-loading="loading">
     <el-table
       ref="table"
       border
@@ -25,15 +22,8 @@
       :summary-method="getSummaries"
       :show-summary="showSummary"
     >
-      <el-table-column v-if="tableList.selectBox" type="selection" width="40">
-      </el-table-column>
-      <el-table-column
-        v-if="tableList.selectIndex"
-        type="index"
-        label="搴忓彿"
-        width="50"
-      >
-      </el-table-column>
+      <el-table-column v-if="tableList.selectBox" type="selection" width="40"> </el-table-column>
+      <el-table-column v-if="tableList.selectIndex" type="index" label="搴忓彿" width="50"> </el-table-column>
       <el-table-column
         v-for="(item, i) in tableList.tableColumn"
         :key="i"
@@ -46,9 +36,7 @@
         v-if="item.isShowColumn"
       >
         <template slot-scope="scope">
-          <span v-if="item.price">{{
-            "锟�" + number_format(scope.row[item.prop], 2, ".", ",")
-          }}</span>
+          <span v-if="item.price">{{ "锟�" + number_format(scope.row[item.prop], 2, ".", ",") }}</span>
           <!-- 鐘舵�佹樉绀� -->
           <div v-else-if="item.status">
             <span
@@ -60,26 +48,19 @@
                 graySlot: scope.row.status == '1',
               }"
               >{{
-                item.isCallMethod
-                  ? item.getCallMethod(scope.row[item.prop], scope.row)
-                  : scope.row[item.prop]
+                item.isCallMethod ? item.getCallMethod(scope.row[item.prop], scope.row) : scope.row[item.prop]
               }}</span
             >
           </div>
           <!-- 璋冪敤鏂规硶鏄剧ず鏂囧瓧 -->
           <div v-else-if="item.isCallMethod">
-            <span>{{
-              item.getCallMethod(scope.row[item.prop], scope.row)
-            }}</span>
+            <span>{{ item.getCallMethod(scope.row[item.prop], scope.row) }}</span>
           </div>
           <!-- 灏忎簬褰撳墠鏃堕棿鏄剧ず涓嶅悓棰滆壊 -->
           <span
             v-else-if="item.date"
             :style="{
-              color:
-                new Date().getTime() > new Date(scope.row[item.prop]).getTime()
-                  ? '#D23F3A'
-                  : '#606266',
+              color: new Date().getTime() > new Date(scope.row[item.prop]).getTime() ? '#D23F3A' : '#606266'
             }"
             >{{ timeAgo(scope.row[item.prop]) }}</span
           >
@@ -93,18 +74,10 @@
             >{{ scope.row[item.prop] }}</span
           >
           <span v-else-if="item.propType == 'mulitple'">
-            {{
-              scope.row[item.prop][item.propTwo]
-                ? scope.row[item.prop][item.propTwo]
-                : "--"
-            }}
+            {{ scope.row[item.prop][item.propTwo] ? scope.row[item.prop][item.propTwo] : "--" }}
           </span>
           <span :class="item.className ? item.className : ''" v-else>{{
-            scope.row[item.prop]
-              ? scope.row[item.prop]
-              : scope.row[item.prop] === 0
-              ? scope.row[item.prop]
-              : "--"
+            scope.row[item.prop] ? scope.row[item.prop] : scope.row[item.prop] === 0 ? scope.row[item.prop] : "--"
           }}</span>
         </template>
       </el-table-column>
@@ -116,22 +89,15 @@
     <div class="overSpread1" v-show="iscolopen" @click="onMaskClick"></div>
     <div v-if="showCheckcol" class="styleBtn">
       <i @click="checkcol()" class="label">...</i>
-      <el-checkbox-group
-        v-model="showcolList"
-        v-show="iscolopen"
-        class="checkbox-group"
-        @change="selCeckBoxList"
-      >
-        <el-checkbox v-for="item in tableList.allcol" :label="item" :key="item"
-          >{{ item }}
-        </el-checkbox>
+      <el-checkbox-group v-model="showcolList" v-show="iscolopen" class="checkbox-group" @change="selCeckBoxList">
+        <el-checkbox v-for="item in tableList.allcol" :label="item" :key="item">{{ item }} </el-checkbox>
       </el-checkbox-group>
     </div>
   </div>
 </template>
 
 <script>
-import { timeago } from "@/common/config/index";
+import { timeago } from "@/common/config/index"
 export default {
   name: "TableCommonView",
   props: {
@@ -149,147 +115,146 @@
           highlight: false,
           tableColumn: [
             // table琛ㄥ崟
-            { label: "", prop: "", min: 200, tooltip: true },
-          ],
-        };
+            { label: "", prop: "", min: 200, tooltip: true }
+          ]
+        }
       },
       showcol: {
         typeof: Array,
-        default: () => [],
-      },
+        default: () => []
+      }
     },
     // 鍚堝苟鍗曞厓鏍�
     rowData: {
       type: Array,
       default: () => {
-        return [];
-      },
+        return []
+      }
     },
     // 鍔犺浇鐨刲oading
     loading: {
       type: Boolean,
-      default: false,
+      default: false
     },
     // 閫変腑鐨勬牱寮�
     selectClassRow: {
       type: Object,
       default: () => {
-        return {};
-      },
+        return {}
+      }
     },
     showCheckcol: {
       type: Boolean,
-      default: true,
+      default: true
     },
     showSummary: {
       type: Boolean,
-      default: false,
-    },
+      default: false
+    }
   },
   data() {
     return {
       iscolopen: false,
-      showcolList: this.tableList.showcol,
-    };
+      showcolList: this.tableList.showcol
+    }
   },
   watch: {},
   computed: {},
   beforeUpdate() {},
   methods: {
     onMaskClick() {
-      this.iscolopen = false;
+      this.iscolopen = false
     },
     // 鍚堝苟鍗曞厓鏍�
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      row;
-      column;
+      row
+      column
       if (this.rowData && this.rowData.length > 0) {
         // 浜у搧BOM 琛ㄦ牸鐗规畩澶勭悊 鍚堝苟鍗曞厓鏍�
         if (columnIndex < 5 || columnIndex == 9) {
-          const _row = this.rowData[rowIndex];
-          const _col = _row > 0 ? 1 : 0;
+          const _row = this.rowData[rowIndex]
+          const _col = _row > 0 ? 1 : 0
           return {
             rowspan: _row,
-            colspan: _col,
-          };
+            colspan: _col
+          }
         }
       }
     },
     tableRowClick(row) {
-      this.$emit("tableRowClick", row);
+      this.$emit("tableRowClick", row)
     },
     handleReserve(row) {
-      return row._id ? row._id : row.id;
+      return row._id ? row._id : row.id
     },
     handleSelectionChange(val) {
-      this.$emit("getSelectArray", val);
+      this.$emit("getSelectArray", val)
     },
     // 鍏叡璇︽儏
     selCommonClick(row) {
-      this.$emit("selCommonClick", row);
+      this.$emit("selCommonClick", row)
     },
     // 閫夋嫨鍒�
     checkcol() {
-      this.iscolopen = !this.iscolopen;
+      this.iscolopen = !this.iscolopen
     },
     closeCheckbox() {
-      let label = document.querySelector(".label");
+      let label = document.querySelector(".label")
       if (label) {
-        this.iscolopen = false;
+        this.iscolopen = false
       }
     },
     selCeckBoxList(val) {
-      this.$emit("selTableCol", val);
+      this.$emit("selTableCol", val)
     },
     // 鍗曢�夎鐩稿叧
     tableRowClassName({ row }) {
       if (Object.keys(this.selectClassRow).length > 0) {
         if (row.id == this.selectClassRow.id) {
-          return "onSelect";
+          return "onSelect"
         }
       }
-      this.$emit("tableRowClassName", row);
+      this.$emit("tableRowClassName", row)
     },
     timeAgo(val) {
-      return timeago(val);
+      return timeago(val)
     },
     //姹傚拰
     getSummaries(param) {
       if (this.tableList.countcol && this.tableList.countcol.length > 0) {
-        const { columns, data } = param;
-        const sums = [];
+        const { columns, data } = param
+        const sums = []
         columns.forEach((column, index) => {
           if (index === 0) {
-            sums[index] = " ";
-            return;
+            sums[index] = " "
+            return
           }
           this.tableList.countcol.forEach((countcols) => {
             if (column.label === countcols) {
-              const values = data.map((item) => Number(item[column.property]));
+              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);
-                sums[index] =
-                  this.tableList.tableColumn[index - 1].unit + "" + sums[index];
+                }, 0)
+                sums[index] = this.tableList.tableColumn[index - 1].unit + "" + sums[index]
               } else {
-                sums[index] = "";
+                sums[index] = ""
               }
             } else {
-              return;
+              return
             }
-          });
-        });
-        return sums;
+          })
+        })
+        return sums
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
@@ -297,7 +262,7 @@
 .table_height {
   height: 100%;
 }
-.el-table__body-wrapper{
+.el-table__body-wrapper {
   height: 100%;
 }
 .table-view {
@@ -379,9 +344,6 @@
     border-top-left-radius: 12px;
     border-top-right-radius: 12px;
     overflow: auto;
-  }
-  .el-table__body-wrapper {
-    // height: ;
   }
 }
 </style>
diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index 4688670..24acee5 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -22,28 +22,29 @@
           @inputContent="inputContent"
           @selLocationClick="selLocationClick"
           @selProductClick="selProductClick"
+          @tableRowClick="tableRowClick"
         >
           <template slot="tableButton">
             <el-table-column label="鎿嶄綔" width="180" fixed="right" align="center">
               <template slot-scope="scope">
-                <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
+                <span v-if="scope.row.isEdit" @click.stop="handleHistoryClick(scope.row)" class="yes-cursor">
                   <i class="el-icon-refresh-left"></i>
                   <span>鍘嗗彶</span>
                 </span>
                 <!-- <span v-if="scope.row.isSet" @click="handleSetClick(scope)" class="margin_left_5px">
                   <i class="el-icon-setting"></i>
                   <span>璁剧疆</span>
-                </span>
-                <template v-else>
-                  <span @click="handleUseClick(scope)" class="margin_left_5px">
+                </span> -->
+                <template v-if="scope.row.status === 3">
+                  <span @click.stop="handleUseClick(scope.row)" class="margin_left_5px">
                     <i class="el-icon-document"></i>
                     <span>搴旂敤</span>
                   </span>
-                  <span @click="handleCleanupClick(scope)" class="margin_left_5px">
+                  <!-- <span @click="handleCleanupClick(scope)" class="margin_left_5px">
                     <i class="el-icon-delete"></i>
                     <span>娓呴櫎</span>
-                  </span>
-                </template> -->
+                  </span> -->
+                </template>
               </template>
             </el-table-column>
           </template>
@@ -59,7 +60,12 @@
 <script>
 import CommonFormTableView from "@/components/makepager/CommonFormTableView"
 import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getInventoryAdjustmentList, addInventoryAdjustment } from "@/api/operate/inventoryAdjustment"
+import {
+  getInventoryAdjustmentList,
+  addInventoryAdjustment,
+  updateInventoryAdjustment,
+  finishInventoryAdjustment
+} from "@/api/operate/inventoryAdjustment"
 import { currentTime } from "@/common/config/index"
 export default {
   name: "InventoryAdjustment",
@@ -80,7 +86,8 @@
       locationId: 0,
       productId: 0,
       differenceAmount: 0,
-      Amount: 0
+      amount: 0,
+      operationId: 0
     }
   },
   created() {
@@ -128,31 +135,25 @@
     },
     // 鎿嶄綔杈撳叆
     inputContent(val, prop, row) {
-      console.log("22222222222222")
       console.log(val, prop, row)
-      // this.countId = row.countId
-      // this.tableData.map((item) => {
-      //   if (item.countId === row.countId) {
-      //     item[prop] = val
-      //   }
-      // })
       this.differenceAmount = val
     },
     // 鏂板
     addProductClick() {
       console.log(this.tableData)
+      console.log(this.addTitle)
       this.isSel()
-      this.$refs.tablelistRef.getRuleList()
       if (this.isNoProduct && this.addTitle === "鏂板缓") {
+        this.$refs.tablelistRef.getRuleList()
         this.addTitle = "淇濆瓨"
         this.showDiscard = true
         this.isRowClick = false
+        this.operationId = 0
         this.currentRowId = 0
         this.countId++
         this.tableData.push({
           countId: this.countId,
-          Amount: 0,
-          areaName: "",
+          amount: 0,
           adjustAmount: 0,
           productId: "",
           differenceAmount: 0,
@@ -167,34 +168,29 @@
         this.productCategoryId = 0
         this.productId = 0
       } else {
-        if (this.locationId === 0) {
-          this.$message.error("璇烽�夋嫨浣嶇疆")
-        } else if (this.productId === 0) {
-          this.$message.error("璇烽�夋嫨浜у搧")
-        } else {
-          this.addTitle = "鏂板缓"
-          this.showDiscard = false
-          // let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateListingRules
-          addInventoryAdjustment({
-            // id: this.currentRowId,
-            locationId: this.locationId,
-            Amount: this.Amount,
-            differenceAmount: this.differenceAmount,
-            productId: this.productId
-          })
-            .then((res) => {
-              console.log(res)
-              if (res.code === 200) {
-                // let tipStr = this.currentRowId === 0 ? "娣诲姞鎴愬姛" : "淇敼鎴愬姛"
-                this.$message.success("娣诲姞鎴愬姛")
-                this.getData()
-              }
-            })
-            .catch((err) => {
-              console.log(err)
+        this.addTitle = "鏂板缓"
+        this.showDiscard = false
+        let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
+        requestUrl({
+          amount: this.amount,
+          differenceAmount: this.differenceAmount,
+          locationId: this.locationId,
+          operationId: this.operationId,
+          productId: this.productId
+        })
+          .then((res) => {
+            console.log(res)
+            if (res.code === 200) {
+              let tipStr = this.currentRowId === 0 ? "娣诲姞鎴愬姛" : "淇敼鎴愬姛"
+              this.$message.success(tipStr)
               this.getData()
-            })
-        }
+            }
+          })
+          .catch((err) => {
+            console.log(err)
+            this.getData()
+          })
+        // }
       }
     },
     // 鏄惁閫夋嫨浜у搧
@@ -244,8 +240,19 @@
       }
     },
     // 搴旂敤
-    handleUseClick(scope) {
-      scope.row.isSet = !scope.row.isSet
+    handleUseClick(row) {
+      // scope.row.isSet = !scope.row.isSet
+      finishInventoryAdjustment({
+        locationProductAmountId: row.locationProductAmount,
+        operationId: row.operationId,
+        productId: row.productId
+      }).then((res) => {
+        console.log(res)
+        if (res.code === 200) {
+          this.$message.success("搴旂敤鎴愬姛")
+          this.getData()
+        }
+      })
     },
     // 娓呴櫎
     handleCleanupClick(scope) {
@@ -253,22 +260,31 @@
     },
     // 琛岀偣鍑�
     tableRowClick(row, rowIndex) {
-      console.log(row, rowIndex)
-      this.addTitle = "淇濆瓨"
-      this.showDiscard = true
-      this.isRowClick = true
+      console.log("11111")
       this.isSel()
-      if (!this.isNoProduct) {
-        this.tableData.splice(this.tableData.length - 1, 1)
-      }
-      this.tableData.map((item, index) => {
-        if (index === rowIndex) {
-          item.isEdit = false
-          item.editable = true
-        } else {
-          item.isEdit = true
+      if (!this.isNoProduct && this.currentRowId === 0) {
+        this.$message.error("璇峰畬鎴愬綋鍓嶆柊寤烘垨鍙栨秷鏂板缓")
+      } else {
+        this.currentRowId = row.id
+        this.addTitle = "淇濆瓨"
+        this.showDiscard = true
+        this.isRowClick = true
+        if (!this.isNoProduct) {
+          this.tableData.splice(this.tableData.length - 1, 1)
         }
-      })
+        this.tableData.map((item, index) => {
+          if (index === rowIndex) {
+            item.isEdit = false
+            item.editable = true
+          } else {
+            item.isEdit = true
+          }
+        })
+        this.differenceAmount = row.differenceAmount
+        this.amount = row.amount
+        this.productId = row.productId
+        this.operationId = row.operationId
+      }
     },
     // 鎼滅储
     getList(val) {
@@ -295,4 +311,12 @@
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+::v-deep {
+  .el-table {
+    border-top-left-radius: 12px;
+    border-top-right-radius: 12px;
+    overflow: auto;
+  }
+}
+</style>
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 8b6c479..2dcf44e 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -107,10 +107,9 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col v-if="showOperationType" :span="12">
                 <el-form-item label="鍏ュ簱绫诲瀷" prop="operationTypeId">
                   <el-select
-                    v-if="showOperationType"
                     v-model="editConfig.infomation.operationTypeId"
                     placeholder="璇烽�夋嫨"
                     size="mini"
@@ -120,7 +119,11 @@
                     <el-option v-for="item in operationTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                     </el-option>
                   </el-select>
-                  <el-input v-else v-model="receiptType" disabled style="width: 90%"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col v-else :span="12">
+                <el-form-item label="鍏ュ簱绫诲瀷">
+                  <el-input v-model="receiptType" disabled style="width: 90%"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index f364068..b66f494 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -32,11 +32,9 @@
         <div class="product-box" v-for="item in tableList.tableInfomation" :key="item.id" @click="tableRowClick(item)">
           <div class="left">
             <!-- <el-image style="width: 60px; height: 80px" :src="url"></el-image> -->
-            <el-image class="img-view">
-              <div slot="error" class="image-slot">
-                <i class="el-icon-picture-outline"></i>
-              </div>
-            </el-image>
+            <div class="img-view">
+              <i class="el-icon-picture-outline"></i>
+            </div>
           </div>
           <div class="right">
             <div class="label">
@@ -107,15 +105,15 @@
       url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
       pageSizes: [15, 30],
       keyWord: "",
-      categoryId:null,
+      categoryId: null
     }
   },
   created() {
     this.setTable()
-    let query = this.$route.query;
+    let query = this.$route.query
     if (query) {
-      this.categoryId = query.id ? Number(query.id) : null;
-      this.pagerOptions.currPage=1
+      this.categoryId = query.id ? Number(query.id) : null
+      this.pagerOptions.currPage = 1
     }
     this.getData()
   },
@@ -227,7 +225,7 @@
     async getData() {
       await getProductList({
         keyWord: this.keyWord,
-        categoryId:this.categoryId?this.categoryId:null,
+        categoryId: this.categoryId ? this.categoryId : null,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 114cc63..7738753 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -30,16 +30,11 @@
         </div>
         <p style="margin-top: 30px">绫诲埆</p>
         <el-checkbox-group v-model="checkList" @change="checkListHandler">
-          <el-checkbox
-            v-for="item in categoryList"
-            :key="item.id"
-            :label="item.id"
-            >{{ item.name }}</el-checkbox
-          >
+          <el-checkbox v-for="item in categoryList" :key="item.id" :label="item.id">{{ item.name }}</el-checkbox>
         </el-checkbox-group>
       </div>
-      <div class="con_right">
-        <div class="list-view">
+      <div class="list-view">
+        <div class="table">
           <TableCommonView
             ref="tableListRef"
             :table-list="tableList"
@@ -59,17 +54,11 @@
                     <span>琛ヨ揣</span>
                   </span>
                   <template>
-                    <span
-                      @click="handleLocation(scope)"
-                      class="margin_left_5px"
-                    >
+                    <span @click="handleLocation(scope)" class="margin_left_5px">
                       <i class="el-icon-menu"></i>
                       <span>浣嶇疆</span>
                     </span>
-                    <span
-                      @click="handleForecast(scope)"
-                      class="margin_left_5px"
-                    >
+                    <span @click="handleForecast(scope)" class="margin_left_5px">
                       <i class="el-icon-s-data"></i>
                       <span>棰勬祴</span>
                     </span>
@@ -78,35 +67,22 @@
               </el-table-column>
             </template>
           </TableCommonView>
-          <div class="btn-pager">
-            <PagerView
-              class="page"
-              :pager-options="pagerOptions"
-              :page-size="pageSizes"
-              v-on="pagerEvents"
-            />
-          </div>
+        </div>
+        <div class="btn-pager">
+          <PagerView class="page" :pager-options="pagerOptions" :page-size="pageSizes" v-on="pagerEvents" />
         </div>
       </div>
     </div>
 
     <!-- 缂栬緫 dialog-->
-    <AddOverviewDialog
-      v-if="editConfig.visible"
-      :edit-common-config="editConfig"
-      :add-name="this.$route.params.name"
-    />
+    <AddOverviewDialog v-if="editConfig.visible" :edit-common-config="editConfig" :add-name="this.$route.params.name" />
   </div>
 </template>
 
 <script>
-import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
-import AddOverviewDialog from "@/views/overview/AddOverviewDialog";
-import {
-  getInventoryData,
-  getProductCategoryList,
-  getWarehouseList,
-} from "@/api/reportForm/inventoryRwport";
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
+import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"
 
 export default {
   name: "InboundOutboundDetail",
@@ -130,7 +106,7 @@
           inStorage: "100.00", // 鍏ュ簱
           toStore: "20.00", // 鍑哄簱
           forecast: "0.00", //棰勬祴
-          unit: "浠�", //鍗曚綅
+          unit: "浠�" //鍗曚綅
         },
         {
           product: "鍗楁柟涓濆发12306xxx",
@@ -142,8 +118,8 @@
           inStorage: "0.00",
           toStore: "0.00",
           forecast: "0.00",
-          unit: "浠�",
-        },
+          unit: "浠�"
+        }
       ],
       tableList: {},
       showcol: ["浜у搧绫诲埆", "鍗曚綅鎴愭湰", "鎬讳环鍊�", "鍏ュ簱", "鍑哄簱"],
@@ -152,12 +128,12 @@
       commonDetail: {
         visible: false,
         title: "鏂板缓",
-        infomation: {},
+        infomation: {}
       },
       editConfig: {
         visible: false,
         title: "鏂板缓",
-        infomation: {},
+        infomation: {}
       },
       productId: this.$route.params.id,
       productName: this.$route.params.name,
@@ -172,13 +148,13 @@
     };
   },
   created() {
-    this.setTable();
-    this.getData(); //搴撳瓨鎶ヨ〃
-    this.getStashData(); // 浠撳簱鍒楄〃鏁版嵁
-    this.getProductCategoryList();
+    this.setTable()
+    this.getData() //搴撳瓨鎶ヨ〃
+    this.getStashData() // 浠撳簱鍒楄〃鏁版嵁
+    this.getProductCategoryList()
   },
   mounted() {
-    this.countSums();
+    this.countSums()
   },
   methods: {
     checkListHandler(e) {
@@ -200,17 +176,17 @@
         showcol: this.showcol,
         countcol: this.countcol,
         allcol: [],
-        tableColumn: this.setTableColumn(this.showcol),
-      };
+        tableColumn: this.setTableColumn(this.showcol)
+      }
       // this.tableList.tableInfomation = this.testArr;
-      let allcol = [];
+      let allcol = []
       for (let i = 0; i < this.tableList.tableColumn.length; i++) {
         if (!this.tableList.tableColumn[i].default) {
-          const label = this.tableList.tableColumn[i].label;
-          allcol.push(label);
+          const label = this.tableList.tableColumn[i].label
+          allcol.push(label)
         }
       }
-      this.tableList.allcol = allcol;
+      this.tableList.allcol = allcol
     },
     setTableColumn(showcol) {
       let tableColumn = [
@@ -219,95 +195,95 @@
           prop: "productName",
           default: true,
           width: 300,
-          isShowColumn: true,
+          isShowColumn: true
           // date: true, // 鏄惁涓烘棩鏈熸牸寮�
         },
         {
           label: "浜у搧绫诲埆",
           prop: "productType",
           default: true,
-          isShowColumn: showcol.includes("浜у搧绫诲埆"),
+          isShowColumn: showcol.includes("浜у搧绫诲埆")
         },
         {
           label: "鍗曚綅鎴愭湰",
           prop: "cost",
           default: false,
-          isShowColumn: showcol.includes("鍗曚綅鎴愭湰"),
+          isShowColumn: showcol.includes("鍗曚綅鎴愭湰")
         },
         {
           label: "鎬讳环鍊�",
           prop: "value",
           default: false,
           isShowColumn: showcol.includes("鎬讳环鍊�"),
-          unit: "锟�",
+          unit: "锟�"
         },
         {
           label: "鍦ㄥ簱",
           prop: "amount",
           default: true,
           isShowColumn: true,
-          unit: "",
+          unit: ""
         },
         {
           label: "鍙敤搴撳瓨",
           prop: "availableNumber",
           default: true,
           isShowColumn: true,
-          unit: "",
+          unit: ""
         },
         {
           label: "鍏ュ簱",
           prop: "in",
           default: false,
           isShowColumn: showcol.includes("鍏ュ簱"),
-          unit: "",
+          unit: ""
         },
         {
           label: "鍑哄簱",
           prop: "out",
           isShowColumn: showcol.includes("鍑哄簱"),
           default: false,
-          unit: "",
+          unit: ""
         },
         {
           label: "棰勬祴",
           prop: "forecast",
           isShowColumn: showcol.includes("棰勬祴"),
           default: false,
-          unit: "",
+          unit: ""
         },
         {
           label: "鍗曚綅",
           prop: "unit",
           default: true,
-          isShowColumn: true,
-        },
-      ];
-      return tableColumn;
+          isShowColumn: true
+        }
+      ]
+      return tableColumn
     },
     selTableCol(val) {
-      this.showcol = val;
-      this.tableList.tableColumn = this.setTableColumn(val);
+      this.showcol = val
+      this.tableList.tableColumn = this.setTableColumn(val)
     },
     getList(val) {
-      console.log(val);
+      console.log(val)
     },
     // 琛岀偣鍑�
     tableRowClick(row) {
-      console.log(row);
+      console.log(row)
       // this.editConfig.visible = true;
-      this.editConfig.title = "鏌ョ湅";
-      this.editConfig.infomation = { ...row };
+      this.editConfig.title = "鏌ョ湅"
+      this.editConfig.infomation = { ...row }
     },
     // 鏂板缓
     addBtnClick() {
       // this.editConfig.visible = true;
-      this.editConfig.title = "鏂板缓";
-      this.getData();
+      this.editConfig.title = "鏂板缓"
+      this.getData()
     },
     // 鐘舵��
     getStatus(val) {
-      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚";
+      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
     },
     // 鍘嗗彶
     handleHistoryClick(row) {
@@ -344,7 +320,7 @@
     },
     // 浣嶇疆
     handleLocation() {
-      this.$router.push("/reportForm/locationReport");
+      this.$router.push("/reportForm/locationReport")
     },
     // 棰勬祴
     handleForecast() {},
@@ -374,15 +350,15 @@
         categoryIds: this.categoryListId,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize,
-        warehouseCode: this.warehouseListName,
-      };
+        warehouseCode: this.warehouseListName
+      }
       await getInventoryData(params).then((res) => {
         if (res.code === 200) {
           const list = res.data;
           this.tableList.tableInfomation = list || [];
           this.pagerOptions.totalCount = res.total;
         }
-      });
+      })
     },
     // 鑾峰彇浜у搧绫诲瀷鍒楄〃鏁版嵁
     async getProductCategoryList() {
@@ -392,9 +368,9 @@
         pageSize: this.pagerOptions.pageSize,
       }).then((res) => {
         if (res.code === 200) {
-          this.categoryList = res.data;
+          this.categoryList = res.data
         }
-      });
+      })
     },
     // 璇锋眰浠撳簱鍒楄〃鏁版嵁
     async getStashData() {
@@ -406,45 +382,31 @@
         if (res.data.code === 200) {
           this.warehouseList = res.data.data;
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-.rightContent {
-  height: 100%;
-  background: #e6ecf2;
-  // width: 100%;
-  padding: 10px;
-  .top {
-    margin-bottom: 20px;
-    height: 60px;
-    background: #fff;
-    border-radius: 8px;
+.content_wrap {
+  height: calc(100% - 0px);
+  display: flex;
+  justify-content: space-between;
+  .con_left {
+    width: 200px;
+    .el-checkbox-group {
+      display: flex;
+      flex-direction: column;
+    }
+    .stash {
+      display: flex;
+      flex-direction: column;
+    }
   }
-  .content_wrap {
-    height: calc(100% - 50px);
-    display: flex;
-    justify-content: space-between;
-    .con_left {
-      width: 200px;
-      .el-checkbox-group {
-        display: flex;
-        flex-direction: column;
-      }
-      .stash {
-        display: flex;
-        flex-direction: column;
-      }
-    }
-    .con_right {
-      width: calc(100% - 200px);
-    }
+  .list-view {
+    flex: 1;
   }
 }
-
-// }
 </style>
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 63d46c0..e652ded 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -15,42 +15,35 @@
       </div>
     </div>
     <div class="list-view">
-      <TableCommonView
-        ref="tableListRef"
-        :table-list="tableList"
-        @selTableCol="selTableCol"
-        @tableRowClick="tableRowClick"
-        :showSummary="true"
-      >
-        <template slot="tableButton">
-          <el-table-column label="鎿嶄綔" width="210" align="center">
-            <template slot-scope="scope">
-              <span @click="handleHistoryClick(scope.row)">
-                <i class="el-icon-refresh-left"></i>
-                <span>鍘嗗彶</span>
-              </span>
-              <span @click="handleAddGoods(scope)" class="margin_left_5px">
-                <i class="el-icon-refresh"></i>
-                <span>琛ヨ揣</span>
-              </span>
-            </template>
-          </el-table-column>
-        </template>
-      </TableCommonView>
+      <div class="table">
+        <TableCommonView
+          ref="tableListRef"
+          :table-list="tableList"
+          @selTableCol="selTableCol"
+          @tableRowClick="tableRowClick"
+        >
+          <template slot="tableButton">
+            <el-table-column label="鎿嶄綔" width="210" align="center">
+              <template slot-scope="scope">
+                <span @click="handleHistoryClick(scope.row)">
+                  <i class="el-icon-refresh-left"></i>
+                  <span>鍘嗗彶</span>
+                </span>
+                <span @click="handleAddGoods(scope)" class="margin_left_5px">
+                  <i class="el-icon-refresh"></i>
+                  <span>琛ヨ揣</span>
+                </span>
+              </template>
+            </el-table-column>
+          </template>
+        </TableCommonView>
+      </div>
       <div class="btn-pager">
-        <PagerView
-          class="page"
-          :pager-options="pagerOptions"
-          v-on="pagerEvents"
-        />
+        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
       </div>
     </div>
     <!-- 缂栬緫 -->
-    <AddOverviewDialog
-      v-if="editConfig.visible"
-      :edit-common-config="editConfig"
-      :add-name="this.$route.params.name"
-    />
+    <AddOverviewDialog v-if="editConfig.visible" :edit-common-config="editConfig" :add-name="this.$route.params.name" />
   </div>
 </template>
 
@@ -86,7 +79,7 @@
           inStorage: "00.00",
           toStore: 65432.0,
           forecast: "0.00",
-          unit: "浠�",
+          unit: "浠�"
         },
         {
           product: "HC閿�鍞尯/A鍖�",
@@ -98,19 +91,19 @@
           inStorage: "0.00",
           toStore: 32618.0,
           forecast: "0.00",
-          unit: "浠�",
-        },
+          unit: "浠�"
+        }
       ],
       searchOptions: [],
       commonDetail: {
         visible: false,
         title: "鏂板缓",
-        infomation: {},
+        infomation: {}
       },
       editConfig: {
         visible: false,
         title: "鏂板缓",
-        infomation: {},
+        infomation: {}
       },
       productId: this.$route.params.id,
       productName: this.$route.params.name,
@@ -118,8 +111,8 @@
     };
   },
   created() {
-    this.setTable();
-    this.getData();
+    this.setTable()
+    this.getData()
   },
   methods: {
     setTable() {
@@ -129,16 +122,16 @@
         showcol: this.showcol,
         countcol: this.countcol,
         allcol: [],
-        tableColumn: this.setTableColumn(this.showcol),
-      };
-      let allcol = [];
+        tableColumn: this.setTableColumn(this.showcol)
+      }
+      let allcol = []
       for (let i = 0; i < this.tableList.tableColumn.length; i++) {
         if (!this.tableList.tableColumn[i].default) {
-          const label = this.tableList.tableColumn[i].label;
-          allcol.push(label);
+          const label = this.tableList.tableColumn[i].label
+          allcol.push(label)
         }
       }
-      this.tableList.allcol = allcol;
+      this.tableList.allcol = allcol
     },
     setTableColumn(showcol) {
       let tableColumn = [
@@ -146,26 +139,26 @@
           label: "浣嶇疆",
           prop: "locationName",
           default: true,
-          isShowColumn: true,
+          isShowColumn: true
         },
 
         {
           label: "瀛樺偍绫诲埆",
           prop: "category",
           default: false,
-          isShowColumn: showcol.includes("瀛樺偍绫诲埆"),
+          isShowColumn: showcol.includes("瀛樺偍绫诲埆")
         },
         {
           label: "浜у搧",
           prop: "productName",
           default: true,
-          isShowColumn: true,
+          isShowColumn: true
         },
         {
           label: "浜у搧绫诲埆",
           prop: "productTypeName",
           default: false,
-          isShowColumn: showcol.includes("浜у搧绫诲埆"),
+          isShowColumn: showcol.includes("浜у搧绫诲埆")
         },
         {
           label: "鍦ㄥ簱鏁伴噺",
@@ -186,7 +179,7 @@
           prop: "unit",
           width: 120,
           default: false,
-          isShowColumn: showcol.includes("浠峰��"),
+          isShowColumn: showcol.includes("浠峰��")
         },
         {
           label: "浠峰��",
@@ -200,33 +193,33 @@
       return tableColumn;
     },
     selTableCol(val) {
-      this.showcol = val;
-      this.tableList.tableColumn = this.setTableColumn(val);
+      this.showcol = val
+      this.tableList.tableColumn = this.setTableColumn(val)
     },
     // 璇锋眰鏁版嵁
     async getData() {
       await getLocationData({
         page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize,
+        pageSize: this.pagerOptions.pageSize
       }).then((res) => {
         if (res.code === 200) {
           const list = res.data;
           this.tableList.tableInfomation = list || [];
           this.pagerOptions.totalCount = res.total;
         }
-      });
+      })
     },
 
     // 鎼滅储
     getList(val) {
-      console.log(val);
+      console.log(val)
     },
     // 琛岀偣鍑�
     tableRowClick(row) {
-      console.log(row);
+      console.log(row)
       // this.editConfig.visible = true;
-      this.editConfig.title = "鏌ョ湅";
-      this.editConfig.infomation = { ...row };
+      this.editConfig.title = "鏌ョ湅"
+      this.editConfig.infomation = { ...row }
     },
     // 鏂板缓
     addBtnClick() {
@@ -236,7 +229,7 @@
     },
     // 鐘舵��
     getStatus(val) {
-      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚";
+      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
     },
     // 鍘嗗彶
     handleHistoryClick(row) {
@@ -267,25 +260,10 @@
       });
     },
     // 琛ヨ揣
-    handleAddGoods() {},
-  },
-};
+    handleAddGoods() {}
+  }
+}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-.rightContent {
-  height: 100%;
-  background: #e6ecf2;
-  padding: 10px;
-  // .top {
-  //   margin-bottom: 20px;
-  //   height: 60px;
-  //   background: #fff;
-  //   border-radius: 8px;
-  // }
-  .list-view {
-    height: calc(100% - 150px);
-  }
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/warehouseManage/listingRules/index.vue b/src/views/warehouseManage/listingRules/index.vue
index b84d797..a42b2bc 100644
--- a/src/views/warehouseManage/listingRules/index.vue
+++ b/src/views/warehouseManage/listingRules/index.vue
@@ -342,4 +342,12 @@
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+::v-deep {
+  .el-table {
+    border-top-left-radius: 12px;
+    border-top-right-radius: 12px;
+    overflow: auto;
+  }
+}
+</style>

--
Gitblit v1.8.0