From 62dd7a29fb929865cfcd72e8412beb3b5d41a7fc Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期四, 28 九月 2023 15:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'

---
 src/views/overview/AddOverviewDialog.vue             |    6 
 src/views/reportForm/inventoryReport/index.vue       |   59 +++-
 src/components/makepager/TableCommonView.vue         |    4 
 src/router/product/index.js                          |    8 
 vue.config.js                                        |    4 
 src/router/report/index.js                           |    9 
 src/views/reportForm/inboundOutboundDetail/index.vue |  158 +++++++-----
 src/views/reportForm/locationReport/index.vue        |   48 +++
 src/api/reportForm/inventoryRwport.js                |    9 
 src/router/index.js                                  |    5 
 src/views/productManage/product/AddProductDialog.vue |  392 ++++++++++++++++++++++----------
 11 files changed, 468 insertions(+), 234 deletions(-)

diff --git a/src/api/reportForm/inventoryRwport.js b/src/api/reportForm/inventoryRwport.js
index bef274f..114eb10 100644
--- a/src/api/reportForm/inventoryRwport.js
+++ b/src/api/reportForm/inventoryRwport.js
@@ -26,4 +26,13 @@
     method: "post",
     data
   })
+}
+
+//鎶ヨ〃鍘嗗彶
+export function getHistory(data) {
+  return request({
+    url: "/api-wms/v1/forms/getHistory",
+    method: "post",
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 8fcc0fe..31e9b0c 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -54,9 +54,9 @@
             <span
               class="Badge"
               :class="{
-                greenSlot: scope.row.status == '4',
+                greenSlot: scope.row.status == '4'||scope.row.status ==  '瀹屾垚',
                 redSlot: scope.row.status == '5',
-                blueSlot: scope.row.status == '3',
+                blueSlot: scope.row.status == '3'||scope.row.status ==  '灏辩华',
                 graySlot: scope.row.status == '1',
               }"
               >{{
diff --git a/src/router/index.js b/src/router/index.js
index badfb9b..8dc1323 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -109,12 +109,13 @@
 const router = createRouter()
 
 router.afterEach((to, from, next) => {
+  console.log(to,"to")
   if ((to.path === "/overview/overviewList" || to.path === "/productManage/productList") && to.params.name) {
     console.log(from, next)
     to.meta.title = to.params.name
     document.title = to.meta.title
-  } else if (to.path === "/reportForm/inOutboundDetail" && to.params.name) {
-    to.meta.title = "鍑哄叆搴撴槑缁�"
+  } else if (to.name === "inboundOutboundDetail") {
+    to.meta.title = to.params.name + "/鍑哄叆搴撴槑缁�"
     document.title = to.meta.title
   }
 })
diff --git a/src/router/product/index.js b/src/router/product/index.js
index 4b807b0..2a5e8ce 100644
--- a/src/router/product/index.js
+++ b/src/router/product/index.js
@@ -1,7 +1,7 @@
 // const type from '@/router/deployCode'
 
 const product = (resolve) => require(["@/views/productManage/product/index"], resolve) // 浜у搧
-const inOutboundDetail = (resolve) => require(["@/views/reportForm/inboundOutboundDetail/index"], resolve) // 鍑哄叆搴撴槑缁�
+const inboundOutboundDetail = (resolve) => require(["@/views/reportForm/inboundOutboundDetail/index"], resolve) // 鍑哄叆搴撴槑缁�
 const productCategory = (resolve) => require(["@/views/productManage/productCategory/index"], resolve) // 浜у搧绫诲埆
 const productList = (resolve) => require(["@/views/productManage/productCategory/ProductList"], resolve) // 浜у搧绫诲埆-浜у搧
 const overviewList = (resolve) => require(["@/views/overview/OverviewListView"], resolve) // 姒傝堪-浜у搧鍒楄〃
@@ -24,9 +24,9 @@
     }
   },
   {
-    path: "/reportForm/inOutboundDetail",
-    name: "inOutboundDetail",
-    component: inOutboundDetail,
+    path: "/reportForm/inboundOutboundDetail",
+    name: "inboundOutboundDetail",
+    component: inboundOutboundDetail,
     meta: {
       title: "鍑哄叆搴撴槑缁�"
     }
diff --git a/src/router/report/index.js b/src/router/report/index.js
index 2ee2f53..32a54ff 100644
--- a/src/router/report/index.js
+++ b/src/router/report/index.js
@@ -2,6 +2,7 @@
 
 const inventoryReport = (resolve) => require(["@/views/reportForm/inventoryReport/index"], resolve) // 搴撳瓨鎶ヨ〃
 const locationReport = (resolve) => require(["@/views/reportForm/locationReport/index"], resolve) // 浣嶇疆鎶ヨ〃
+const inboundOutboundDetail = (resolve) => require(["@/views/reportForm/inboundOutboundDetail/index"], resolve) // 鍘嗗彶璁板綍
 
 const appconfig = [
   {
@@ -19,6 +20,14 @@
     meta: {
       title: "浣嶇疆鎶ヨ〃"
     }
+  },
+  {
+    path: "/reportForm/inboundOutboundDetail",
+    name: "inboundOutboundDetail",
+    component: inboundOutboundDetail,
+    meta: {
+      title: "鍑哄叆搴撴槑缁�"
+    }
   }
 ]
 
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 0a83a4f..8b6c479 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -411,7 +411,7 @@
         this.showEdit = false
         this.showFooter = true
         this.isValidateClick = false
-      } else if (this.editConfig.infomation.status === 4) {
+      } else if (this.editConfig.infomation.status === 4||this.editConfig.infomation.status === "瀹屾垚") {
         this.showButton = true
         this.showEdit = false
         this.isDelClick = true
@@ -423,6 +423,7 @@
         this.showFooter = false
         this.isValidateClick = false
       } else {
+        // 灏辩华---
         this.showButton = true
         this.showEdit = true
         this.showFooter = false
@@ -432,7 +433,8 @@
         this.list[0].status = "active"
       } else {
         this.list.map((item) => {
-          if (item.value === this.editConfig.infomation.status) {
+          console.log(item,this.editConfig.infomation.status,"鎵撳嵃淇℃伅")
+          if (item.value === this.editConfig.infomation.status||item.label===this.editConfig.infomation.status) {
             item.status = "active"
           } else {
             item.status = "todo"
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index b939663..d92daeb 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -18,7 +18,14 @@
             <i class="el-icon-s-tools"></i>
             <span>鍔ㄤ綔</span>
           </span>
-          <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
+          <el-button
+            v-if="showEdit"
+            plain
+            size="mini"
+            style="margin-left: 15px"
+            @click="editClick"
+            >缂栬緫</el-button
+          >
         </div>
       </div>
       <!-- 鍐呭 -->
@@ -46,9 +53,15 @@
           <div class="basic-info-view">
             <el-row>
               <el-col :span="23">
-                <div style="margin-left: 20px"><span style="color: #f56c6c">*</span>浜у搧鍚嶇О</div>
+                <div style="margin-left: 20px">
+                  <span style="color: #f56c6c">*</span>浜у搧鍚嶇О
+                </div>
                 <el-form-item label="" prop="name" label-width="20px">
-                  <el-input v-model="editConfig.infomation.name" placeholder="" :disabled="!showFooter"></el-input>
+                  <el-input
+                    v-model="editConfig.infomation.name"
+                    placeholder=""
+                    :disabled="!showFooter"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <!-- <el-col :span="4">
@@ -81,7 +94,11 @@
             <div v-if="activeName === 'first'">
               <div class="purchase-view">
                 <div class="left">
-                  <el-form-item label="浜у搧绫诲瀷" prop="productType" style="margin-left: 20px">
+                  <el-form-item
+                    label="浜у搧绫诲瀷"
+                    prop="productType"
+                    style="margin-left: 20px"
+                  >
                     <el-select
                       v-model="editConfig.infomation.productType"
                       placeholder="璇烽�夋嫨"
@@ -89,11 +106,20 @@
                       style="width: 85%"
                       :disabled="!showFooter"
                     >
-                      <el-option v-for="item in productTypeOptions" :key="item.id" :label="item.name" :value="item.id">
+                      <el-option
+                        v-for="item in productTypeOptions"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="寮�绁ㄧ瓥鐣�" prop="invoicingStrategy" style="margin-left: 20px">
+                  <el-form-item
+                    label="寮�绁ㄧ瓥鐣�"
+                    prop="invoicingStrategy"
+                    style="margin-left: 20px"
+                  >
                     <el-select
                       v-model="editConfig.infomation.invoicingStrategy"
                       placeholder="璇烽�夋嫨"
@@ -101,13 +127,26 @@
                       style="width: 85%"
                       :disabled="!showFooter"
                     >
-                      <el-option v-for="item in strategyOptions" :key="item.id" :label="item.name" :value="item.id">
+                      <el-option
+                        v-for="item in strategyOptions"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      >
                       </el-option>
                     </el-select>
-                    <div class="font_size_13" style="color: gray">鍙偍瀛樼殑浜у搧鏄偍绠＄悊搴撳瓨姘村钩鐨勫疄鐗╅」鐩��</div>
-                    <div class="font_size_13" style="color: gray">鎮ㄥ彲浠ュ湪鍙戣揣鍓嶄负鍏跺紑鍏风粨绠楀崟銆�</div>
+                    <div class="font_size_13" style="color: gray">
+                      鍙偍瀛樼殑浜у搧鏄偍绠＄悊搴撳瓨姘村钩鐨勫疄鐗╅」鐩��
+                    </div>
+                    <div class="font_size_13" style="color: gray">
+                      鎮ㄥ彲浠ュ湪鍙戣揣鍓嶄负鍏跺紑鍏风粨绠楀崟銆�
+                    </div>
                   </el-form-item>
-                  <el-form-item label="鐗╂枡绫诲瀷" prop="model" style="margin-left: 20px">
+                  <el-form-item
+                    label="鐗╂枡绫诲瀷"
+                    prop="model"
+                    style="margin-left: 20px"
+                  >
                     <el-select
                       v-model="editConfig.infomation.model"
                       placeholder="璇烽�夋嫨"
@@ -117,11 +156,20 @@
                       :popper-append-to-body="false"
                       :disabled="!showFooter"
                     >
-                      <el-option v-for="item in materialTypeList" :key="item.id" :label="item.name" :value="item.id">
+                      <el-option
+                        v-for="item in materialTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="鍗曚綅" prop="unit" style="margin-left: 20px">
+                  <el-form-item
+                    label="鍗曚綅"
+                    prop="unit"
+                    style="margin-left: 20px"
+                  >
                     <el-input
                       v-model="editConfig.infomation.unit"
                       placeholder="璇疯緭鍏�"
@@ -129,7 +177,11 @@
                       :disabled="!showFooter"
                     ></el-input>
                   </el-form-item>
-                  <el-form-item label="浜у搧鏍囩" prop="productTagName" style="margin-left: 20px">
+                  <el-form-item
+                    label="浜у搧鏍囩"
+                    prop="productTagName"
+                    style="margin-left: 20px"
+                  >
                     <el-input
                       v-model="editConfig.infomation.productTagName"
                       placeholder="璇疯緭鍏�"
@@ -139,7 +191,11 @@
                   </el-form-item>
                 </div>
                 <div class="right">
-                  <el-form-item label="閿�鍞环鏍�" prop="salePrice" style="margin-left: 20px">
+                  <el-form-item
+                    label="閿�鍞环鏍�"
+                    prop="salePrice"
+                    style="margin-left: 20px"
+                  >
                     <span>锟�</span>
                     <el-input-number
                       v-model.trim="editConfig.infomation.salePrice"
@@ -151,7 +207,11 @@
                       :disabled="!showFooter"
                     ></el-input-number>
                   </el-form-item>
-                  <el-form-item label="閿�椤圭◣" prop="customerTaxes" style="margin-left: 20px">
+                  <el-form-item
+                    label="閿�椤圭◣"
+                    prop="customerTaxes"
+                    style="margin-left: 20px"
+                  >
                     <el-input-number
                       v-model="editConfig.infomation.customerTaxes"
                       placeholder="璇疯緭鍏�"
@@ -161,7 +221,11 @@
                       :disabled="!showFooter"
                     ></el-input-number>
                   </el-form-item>
-                  <el-form-item label="鎴愭湰" prop="cost" style="margin-left: 20px">
+                  <el-form-item
+                    label="鎴愭湰"
+                    prop="cost"
+                    style="margin-left: 20px"
+                  >
                     <span>锟�</span>
                     <el-input-number
                       v-model.trim="editConfig.infomation.cost"
@@ -173,7 +237,11 @@
                       :disabled="!showFooter"
                     ></el-input-number>
                   </el-form-item>
-                  <el-form-item label="浜у搧绫诲埆" prop="categoryId" style="margin-left: 20px">
+                  <el-form-item
+                    label="浜у搧绫诲埆"
+                    prop="categoryId"
+                    style="margin-left: 20px"
+                  >
                     <el-select
                       v-model="editConfig.infomation.categoryId"
                       placeholder="璇烽�夋嫨"
@@ -190,7 +258,11 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="鍐呴儴鍙傝��" prop="internalReference" style="margin-left: 20px">
+                  <el-form-item
+                    label="鍐呴儴鍙傝��"
+                    prop="internalReference"
+                    style="margin-left: 20px"
+                  >
                     <el-input
                       v-model.trim="editConfig.infomation.internalReference"
                       placeholder="璇疯緭鍏�"
@@ -199,7 +271,11 @@
                       :disabled="!showFooter"
                     ></el-input>
                   </el-form-item>
-                  <el-form-item label="鏉＄爜" prop="barcode" style="margin-left: 20px">
+                  <el-form-item
+                    label="鏉＄爜"
+                    prop="barcode"
+                    style="margin-left: 20px"
+                  >
                     <el-input
                       v-model.trim="editConfig.infomation.barcode"
                       placeholder="璇疯緭鍏�"
@@ -212,7 +288,12 @@
               </div>
               <div class="all">
                 <div class="second-label">鍐呴儴璇存槑</div>
-                <el-form-item label="" prop="internalNotes" style="margin-left: 20px" label-width="0px">
+                <el-form-item
+                  label=""
+                  prop="internalNotes"
+                  style="margin-left: 20px"
+                  label-width="0px"
+                >
                   <el-input
                     v-model.trim="editConfig.infomation.internalNotes"
                     placeholder="璇疯緭鍏�"
@@ -244,7 +325,12 @@
                   </el-form-item>
                 </div> -->
                 <div class="left">
-                  <el-form-item label="璐熻矗浜�" prop="principal" style="margin-left: 20px" label-width="80px">
+                  <el-form-item
+                    label="璐熻矗浜�"
+                    prop="principal"
+                    style="margin-left: 20px"
+                    label-width="80px"
+                  >
                     <el-select
                       v-model="editConfig.infomation.principal"
                       placeholder="璇烽�夋嫨"
@@ -252,11 +338,21 @@
                       style="width: 85%"
                       :disabled="!showFooter"
                     >
-                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.name" :value="item.name">
+                      <el-option
+                        v-for="item in memberOptions"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.name"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="閲嶉噺" prop="weight" style="margin-left: 20px" label-width="80px">
+                  <el-form-item
+                    label="閲嶉噺"
+                    prop="weight"
+                    style="margin-left: 20px"
+                    label-width="80px"
+                  >
                     <el-input-number
                       v-model="editConfig.infomation.weight"
                       placeholder="璇疯緭鍏�"
@@ -268,7 +364,12 @@
                     ></el-input-number>
                     <span> kg</span>
                   </el-form-item>
-                  <el-form-item label="浣撶Н" prop="volume" style="margin-left: 20px" label-width="80px">
+                  <el-form-item
+                    label="浣撶Н"
+                    prop="volume"
+                    style="margin-left: 20px"
+                    label-width="80px"
+                  >
                     <el-input-number
                       v-model="editConfig.infomation.volume"
                       placeholder="璇疯緭鍏�"
@@ -338,7 +439,12 @@
               <div class="purchase-view">
                 <div class="left">
                   <div class="second-label">鏀惰揣璇存槑</div>
-                  <el-form-item label="" prop="inStorageExplain" style="margin-left: 20px" label-width="0px">
+                  <el-form-item
+                    label=""
+                    prop="inStorageExplain"
+                    style="margin-left: 20px"
+                    label-width="0px"
+                  >
                     <el-input
                       v-model.trim="editConfig.infomation.inStorageExplain"
                       placeholder="姝よ鏄庢坊鍔犲埌鏀惰揣璁㈠崟涓�(渚嬪锛屼骇鍝佸湪浠撳簱鐨勫瓨鍌ㄤ綅缃�)"
@@ -352,7 +458,12 @@
                 </div>
                 <div class="right">
                   <div class="second-label">鍑哄簱鍗曡鏄�</div>
-                  <el-form-item label="" prop="outStorageExplain" style="margin-left: 20px" label-width="0px">
+                  <el-form-item
+                    label=""
+                    prop="outStorageExplain"
+                    style="margin-left: 20px"
+                    label-width="0px"
+                  >
                     <el-input
                       v-model.trim="editConfig.infomation.outStorageExplain"
                       placeholder="姝ら�氱煡宸叉坊鍔犲埌閫佽揣鍗曚腑"
@@ -368,9 +479,16 @@
               <div class="purchase-view">
                 <div class="left">
                   <div class="second-label">鍐呴儴璋冩嫧璇存槑</div>
-                  <el-form-item label="" prop="internalTransferExplain" style="margin-left: 20px" label-width="0px">
+                  <el-form-item
+                    label=""
+                    prop="internalTransferExplain"
+                    style="margin-left: 20px"
+                    label-width="0px"
+                  >
                     <el-input
-                      v-model.trim="editConfig.infomation.internalTransferExplain"
+                      v-model.trim="
+                        editConfig.infomation.internalTransferExplain
+                      "
                       placeholder="姝よ鏄庢坊鍔犲埌鍐呴儴璋冩嫧璁㈠崟涓�(渚嬪锛屽湪浠撳簱涓綍澶勬彁鍙栦骇鍝�)"
                       size="mini"
                       type="textarea"
@@ -484,8 +602,12 @@
       </el-form>
       <!-- 灏� -->
       <div v-if="showFooter" slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
-        <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
+        <el-button type="primary" size="small" @click="saveClick('form')"
+          >淇濆瓨</el-button
+        >
+        <el-button size="small" @click="editConfig.visible = false"
+          >鍙栨秷</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -493,10 +615,14 @@
 
 <script>
 // import CommonFormTableView from "@/components/makepager/CommonFormTableView"
-import { getProductCategoryList } from "@/api/product/productCategory"
-import { getProductList, addProduct, updateProduct } from "@/api/product/product"
+import { getProductCategoryList } from "@/api/product/productCategory";
+import {
+  getProductList,
+  addProduct,
+  updateProduct,
+} from "@/api/product/product";
 
-let inputElement = null
+let inputElement = null;
 export default {
   name: "AddProductDialog",
   props: {
@@ -506,10 +632,10 @@
         return {
           visible: false,
           title: "鏂板缓",
-          infomation: {}
-        }
-      }
-    }
+          infomation: {},
+        };
+      },
+    },
   },
   components: {},
   computed: {},
@@ -519,20 +645,24 @@
       editConfig: this.editCommonConfig,
       rules: {
         name: [{ required: true, message: "璇疯緭鍏ヤ骇鍝佸悕绉�", trigger: "blur" }],
-        model: [{ required: true, message: "璇烽�夋嫨鐗╂枡绫诲瀷", trigger: "change" }],
-        salePrice: [{ required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" }],
-        unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }]
+        model: [
+          { required: true, message: "璇烽�夋嫨鐗╂枡绫诲瀷", trigger: "change" },
+        ],
+        salePrice: [
+          { required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" },
+        ],
+        unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
       },
       memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
       productCategoryOptions: [], // 浜у搧绫诲埆
       productTypeOptions: [
         { name: "鑳芥秷鑰�", id: 1 },
         { name: "鏈嶅姟", id: 2 },
-        { name: "鍙簱瀛樹骇鍝�", id: 3 }
+        { name: "鍙簱瀛樹骇鍝�", id: 3 },
       ], // 浜у搧绫诲瀷
       strategyOptions: [
         { name: "璁㈣喘鏁伴噺", id: 1 },
-        { name: "浜や粯鏁伴噺", id: 2 }
+        { name: "浜や粯鏁伴噺", id: 2 },
       ], // 寮�绁ㄧ瓥鐣�
       selectProductOptions: [], // 鍙�変骇鍝�
       showButton: true,
@@ -557,15 +687,15 @@
         { name: "鎴愬搧", id: "鎴愬搧" },
         { name: "杈呮枡", id: "杈呮枡" },
         { name: "鑰楁潗", id: "鑰楁潗" },
-        { name: "鍏朵粬", id: "鍏朵粬" }
-      ]
-    }
+        { name: "鍏朵粬", id: "鍏朵粬" },
+      ],
+    };
   },
   created() {
-    this.getProductCategoryList()
-    this.getProductList()
-    this.setTableForm()
-    this.setBottonView()
+    this.getProductCategoryList();
+    this.getProductList();
+    this.setTableForm();
+    this.setBottonView();
   },
   methods: {
     // 鑾峰彇浜у搧绫诲埆
@@ -573,73 +703,74 @@
       await getProductCategoryList({
         keyWord: "",
         page: 0,
-        pageSize: 0
+        pageSize: 0,
       }).then((res) => {
         if (res.code === 200) {
-          this.productCategoryOptions = res.data
+          this.productCategoryOptions = res.data;
         }
-      })
+      });
     },
     // 鑾峰彇鍙�変骇鍝�
     async getProductList() {
       await getProductList({
         keyWord: "",
         page: 1,
-        pageSize: 20
+        pageSize: 20,
       }).then((res) => {
         if (res.code === 200) {
           const list = res.data.map((item) => {
             return {
               id: item.id,
-              name: item.name
-            }
-          })
-          this.selectProductOptions = list || []
+              name: item.name,
+            };
+          });
+          this.selectProductOptions = list || [];
         }
-      })
+      });
     },
     // 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
     setBottonView() {
       if (this.editConfig.title === "鏂板缓") {
-        this.showButton = false
-        this.showEdit = false
-        this.showFooter = true
-        this.addProduct = true
+        this.showButton = false;
+        this.showEdit = false;
+        this.showFooter = true;
+        this.addProduct = true;
       } else {
-        this.showEdit = true
-        this.showFooter = false
-        this.addProduct = false
+        this.showEdit = true;
+        this.showFooter = false;
+        this.addProduct = false;
       }
     },
     // 鍏抽棴
     handleClose() {
-      this.editConfig.visible = false
+      this.editConfig.visible = false;
     },
     // 缂栬緫
     editClick() {
-      this.showEdit = false
-      this.showButton = false
-      this.showFooter = true
-      this.setTableForm()
+      this.showEdit = false;
+      this.showButton = false;
+      this.showFooter = true;
+      this.setTableForm();
     },
     // 淇濆瓨
     saveClick(formName) {
-      console.log(this.editConfig.infomation)
+      console.log(this.editConfig.infomation);
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          let requestUrl = this.editConfig.title === "鏂板缓" ? addProduct : updateProduct
+          let requestUrl =
+            this.editConfig.title === "鏂板缓" ? addProduct : updateProduct;
           requestUrl({
-            ...this.editConfig.infomation
+            ...this.editConfig.infomation,
           }).then((res) => {
-            console.log(res)
-            this.editConfig.visible = false
+            console.log(res);
+            this.editConfig.visible = false;
             if (res.code === 200) {
-              this.$message.success("娣诲姞鎴愬姛")
-              this.$parent.getData()
+              this.$message.success("娣诲姞鎴愬姛");
+              this.$parent.getData();
             }
-          })
+          });
         }
-      })
+      });
     },
     // 鍒犻櫎
     delClick() {},
@@ -655,33 +786,33 @@
           { label: "鍏徃", prop: "total", select: true },
           { label: "鏁伴噺", prop: "total", inputFloat: true },
           { label: "浠锋牸", prop: "price", inputFloat: true },
-          { label: "甯佺", prop: "total", select: true }
+          { label: "甯佺", prop: "total", select: true },
           // { label: "浜よ揣鎻愬墠鏃堕棿", prop: "total", inputNumber: true }
-        ]
-      }
+        ],
+      };
     },
     // 浜у搧鍒楄〃杈撳叆
     inputContent(val, prop, row) {
-      this.productId = row.productId
+      this.productId = row.productId;
       this.tableData.map((item) => {
         if (item.productId === row.productId) {
-          item[prop] = val
+          item[prop] = val;
         }
-      })
+      });
     },
     // 浜у搧鏂板
     addProductClick() {
-      console.log(this.tableData)
+      console.log(this.tableData);
       for (let i = 0; i < this.tableData.length; i++) {
         if (this.tableData[i].name.length === 0) {
-          this.isNoProduct = true
-          break
+          this.isNoProduct = true;
+          break;
         } else {
-          this.isNoProduct = false
+          this.isNoProduct = false;
         }
       }
       if (!this.isNoProduct) {
-        this.productId++
+        this.productId++;
         this.tableData.push({
           productId: this.productId,
           id: 0,
@@ -690,81 +821,96 @@
           name: "",
           number: "",
           price: 0,
-          total: 0
-        })
+          total: 0,
+        });
       }
     },
     // 浜у搧鍒犻櫎
     handleDelClick(scope) {
-      console.log(scope)
-      this.tableData.splice(scope.$index, 1)
+      console.log(scope);
+      this.tableData.splice(scope.$index, 1);
     },
     // 涓婁紶鍥剧墖
     toGetImg() {
       if (this.showFooter) {
         if (inputElement === null) {
           // 鐢熸垚鏂囦欢涓婁紶鐨勬帶浠�
-          inputElement = document.createElement("input")
-          inputElement.setAttribute("type", "file")
-          inputElement.style.display = "none"
+          inputElement = document.createElement("input");
+          inputElement.setAttribute("type", "file");
+          inputElement.style.display = "none";
           if (window.addEventListener) {
-            inputElement.addEventListener("change", this.uploadFile, false)
+            inputElement.addEventListener("change", this.uploadFile, false);
           } else {
-            inputElement.attachEvent("onchange", this.uploadFile)
+            inputElement.attachEvent("onchange", this.uploadFile);
           }
-          document.body.appendChild(inputElement)
+          document.body.appendChild(inputElement);
         }
-        inputElement.click()
+        inputElement.click();
       }
     },
     uploadFile(el) {
       if (el && el.target && el.target.files && el.target.files.length > 0) {
-        console.log(el)
-        const files = el.target.files[0]
-        const isLt2M = files.size / 1024 / 1024 < 2
-        const size = files.size / 1024 / 1024
-        console.log(size)
+        console.log(el);
+        const files = el.target.files[0];
+        const isLt2M = files.size / 1024 / 1024 < 2;
+        const size = files.size / 1024 / 1024;
+        console.log(size);
         // 鍒ゆ柇涓婁紶鏂囦欢鐨勫ぇ灏�
         if (!isLt2M) {
-          this.$message.error("涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!")
+          this.$message.error("涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!");
         } else if (files.type.indexOf("image") === -1) {
           //濡傛灉涓嶆槸鍥剧墖鏍煎紡
-          this.$message.error("璇烽�夋嫨鍥剧墖鏂囦欢")
+          this.$message.error("璇烽�夋嫨鍥剧墖鏂囦欢");
         } else {
-          const that = this
-          const reader = new FileReader() // 鍒涘缓璇诲彇鏂囦欢瀵硅薄
-          reader.readAsDataURL(el.target.files[0]) // 鍙戣捣寮傛璇锋眰锛岃鍙栨枃浠�
+          const that = this;
+          const reader = new FileReader(); // 鍒涘缓璇诲彇鏂囦欢瀵硅薄
+          reader.readAsDataURL(el.target.files[0]); // 鍙戣捣寮傛璇锋眰锛岃鍙栨枃浠�
           reader.onload = function () {
             // 璇诲彇瀹屾垚鍚庯紝灏嗙粨鏋滆祴鍊肩粰img鐨剆rc
-            that.imageSrc = this.result
-            console.log(this.result)
+            that.imageSrc = this.result;
+            console.log(this.result);
             // 鏁版嵁浼犲埌鍚庡彴
             //const formData = new FormData()
             //formData.append('file', files); // 鍙互浼犲埌鍚庡彴鐨勬暟鎹�
-          }
+          };
         }
       }
     },
     // 杩涘嚭鐐瑰嚮
     inOutBoundClick() {
       if (this.editConfig.title !== "鏂板缓") {
-        console.log(this.editConfig.infomation)
+        console.log(this.editConfig.infomation);
         this.$router.push({
-          name: "inOutboundDetail",
-          params: { name: this.editConfig.infomation.name, id: this.editConfig.infomation.id }
-        })
+          name: "inboundOutboundDetail",
+          params: {
+            name: this.editConfig.infomation.name,
+            id: this.editConfig.infomation.id,
+            pageName:"浜у搧",
+            paramsKey: {
+              amount: "amount", //鏁伴噺
+              productName:"productName", //浜у搧鍚嶇О
+              status: "status", // 鐘舵��
+              contactedName: "admin",  //瀹屾垚鑰�
+              date: "operationDate", // 鏃ユ湡
+              fromLocation: "from", // 浠�
+              number: "number", //鍗曞彿
+              toLocation: "to",  //鑷�
+              unit: "unit", //鍗曚綅
+            },
+          },
+        });
       }
     },
     // 鍙攢鍞�/鍙噰璐�
     checkboxChange(val, param) {
       if (val === "閲囪喘") {
-        this.showProcure = param
+        this.showProcure = param;
       } else if (val === "閿�鍞�") {
-        this.showSale = param
+        this.showSale = param;
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 31bd7f2..0531503 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -18,18 +18,28 @@
         @tableRowClick="tableRowClick"
       ></TableCommonView>
       <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>
 
 <script>
-import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getProductOperatonList } from "@/api/product/product"
-import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
+import { getHistory } from "@/api/reportForm/inventoryRwport";
+import { getProductOperatonList } from "@/api/product/product";
+
+import AddOverviewDialog from "@/views/overview/AddOverviewDialog";
 
 export default {
   name: "InboundOutboundDetail",
@@ -45,15 +55,16 @@
       commonDetail: {
         visible: false,
         title: "鏂板缓",
-        infomation: {}
+        infomation: {},
       },
       editConfig: {
         visible: false,
         title: "鏂板缓",
-        infomation: {}
+        infomation: {},
       },
-      params: {}
-    }
+      productId: this.$route.params.id,
+      productName: this.$route.params.name,
+    };
   },
   created() {
     this.setTable()
@@ -77,128 +88,139 @@
         selectBox: true,
         showcol: this.showcol,
         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 = [
         {
           label: "鏃ユ湡",
-          prop: "operationDate",
+          prop: this.$route.params.paramsKey.date,
           isShowColumn: true,
           default: true,
-          date: true
+          date: true,
         },
         {
           label: "鍗曞彿",
-          prop: "number",
+          prop: this.$route.params.paramsKey.number,
           isShowColumn: true,
-          default: true
+          default: true,
         },
         {
           label: "浜у搧",
-          prop: "productName",
+          prop: this.$route.params.paramsKey.productName,
           isShowColumn: true,
-          default: true
+          default: true,
         },
         {
           label: "浠�",
-          prop: "from",
+          prop: this.$route.params.paramsKey.fromLocation,
           isShowColumn: true,
-          default: true
+          default: true,
         },
         {
           label: "鑷�",
-          prop: "to",
+          prop: this.$route.params.paramsKey.toLocation,
           isShowColumn: true,
-          default: true
+          default: true,
         },
         {
           label: "鏁伴噺",
-          prop: "amount",
+          prop: this.$route.params.paramsKey.amount,
           isShowColumn: true,
-          default: true
+          default: true,
         },
         {
           label: "鍗曚綅",
-          prop: "unit",
+          prop: this.$route.params.paramsKey.unit,
           isShowColumn: true,
-          default: true
+          default: true,
         },
         {
           label: "鐘舵��",
-          prop: "status",
+          prop: this.$route.params.paramsKey.status,
           width: 120,
           isShowColumn: showcol.includes("鐘舵��"),
           default: false,
           status: true,
           isCallMethod: true,
-          getCallMethod: this.getStatus
+          getCallMethod: this.getStatus,
         },
         {
           label: "瀹屾垚鑰�",
-          prop: "admin",
+          prop: this.$route.params.paramsKey.contactedName,
           isShowColumn: showcol.includes("瀹屾垚鑰�"),
-          default: false
-        }
-      ]
-      return tableColumn
+          default: false,
+        },
+      ];
+      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 getProductOperatonList({
-        productId: this.params.id,
-        page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
-      }).then((res) => {
-        if (res.code === 200) {
-          const list = res.data.map((item) => {
-            return {
-              ...item,
-              from: item.fromLocation.name,
-              to: item.toLocation.name,
-              productName: this.params.name
-            }
-          })
-          this.tableList.tableInfomation = list || []
-          this.pagerOptions.totalCount = res.total
-        }
-      })
+      if (this.$route.params.pageName == "浜у搧") {
+        await getProductOperatonList({
+          productId: this.productId,
+          page: this.pagerOptions.currPage,
+          pageSize: this.pagerOptions.pageSize,
+        }).then((res) => {
+          if (res.code === 200) {
+            const list = res.data.map((item) => {
+              return {
+                ...item,
+                from: item.fromLocation.name,
+                to: item.toLocation.name,
+                productName: this.productName,
+              };
+            });
+            this.tableList.tableInfomation = list || [];
+            this.pagerOptions.totalCount = res.total;
+          }
+        });
+      } else if (this.$route.params.pageName == "鎶ヨ〃") {
+        await getHistory(this.$route.params.product).then((res) => {
+          if (res.code === 200) {
+            this.tableList.tableInfomation = res.data;
+          }
+        });
+      }
     },
+    //浜у搧璺宠浆璇锋眰鏁版嵁
+
     // 鎼滅储
     getList(val) {
-      console.log(val)
+      console.log(val);
     },
     // 琛岀偣鍑�
     tableRowClick(row) {
-      console.log(row)
-      this.editConfig.visible = true
-      this.editConfig.title = "鏌ョ湅"
-      this.editConfig.infomation = { ...row }
+      console.log(row,"琛宺ow")
+      this.editConfig.visible = true;
+      this.editConfig.title = "鏌ョ湅";
+      this.editConfig.infomation = { ...row };
     },
     // 鏂板缓
     addBtnClick() {
-      this.editConfig.visible = true
-      this.editConfig.title = "鏂板缓"
+      // this.editConfig.visible = true
+      this.editConfig.title = "鏂板缓";
     },
     // 鐘舵��
     getStatus(val) {
-      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
-    }
-  }
-}
+      console.log(val,"val鐘舵��")
+      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚";
+    },
+  },
+};
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 8c4d60f..114cc63 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -167,7 +167,8 @@
       warehouseListName: "", // 浠撳簱鍚嶇О
       stashRadio: "1",
       pageSizes: [15, 30],
-      oldRadioBtn:"",
+      oldRadioBtn: "",
+      metaTitle: this.$route.meta.title,
     };
   },
   created() {
@@ -182,18 +183,16 @@
   methods: {
     checkListHandler(e) {
       this.categoryListId = e;
-      this.getData()
-      console.log(this.categoryListId, e, " 閫変腑鐨勪骇鍝乮d");
+      this.getData();
     },
     radioHandleChange(e) {
-      this.warehouseListName=e
-      this.getData()
-      console.log(e, "鍗曢��");
+      this.warehouseListName = e;
+      this.getData();
     },
     setTable() {
       if (this.isIconIndex === "1") {
-        this.pageSizes = [30, 60]
-        this.pagerOptions.pageSize = 30
+        this.pageSizes = [30, 60];
+        this.pagerOptions.pageSize = 30;
       }
       this.tableList = {
         tableInfomation: [],
@@ -312,13 +311,36 @@
     },
     // 鍘嗗彶
     handleHistoryClick(row) {
-      console.log(row)
-      this.$router.push("/operate/allot");
+      this.$router.push({
+        name: "inboundOutboundDetail",
+        params: {
+          name: this.metaTitle,
+          product: {
+            page: this.pagerOptions.currPage,
+            pageSize: this.pagerOptions.pageSize,
+            produceId: row.produceId,
+            productName: row.productName,
+            unit: row.unit,
+          },
+          pageName:"鎶ヨ〃",
+          paramsKey: {
+            amount: "amount",
+            status: "status", //鐘舵��
+            productName:"productName", //浜у搧鍚嶇О
+            contactedName: "contactedName",
+            date: "date",
+            fromLocation: "fromLocation",
+            number: "number",
+            toLocation: "toLocation",
+            unit: "unit",
+          },
+        },
+      });
     },
+
     // 琛ヨ揣
     handleAddGoods(row) {
-      console.log(row)
-
+      console.log(row);
     },
     // 浣嶇疆
     handleLocation() {
@@ -342,7 +364,6 @@
           unit: item.unit, //鍗曚綅
         };
         this.testArr.push(obj);
-        console.log(this.testArr, "this");
       });
     },
 
@@ -357,10 +378,9 @@
       };
       await getInventoryData(params).then((res) => {
         if (res.code === 200) {
-          console.log(res.data, "鎺ュ彛璇锋眰鎴愬姛");
-          const list = res.data
-          this.tableList.tableInfomation = list || []
-          this.pagerOptions.totalCount = res.total
+          const list = res.data;
+          this.tableList.tableInfomation = list || [];
+          this.pagerOptions.totalCount = res.total;
         }
       });
     },
@@ -369,7 +389,7 @@
       await getProductCategoryList({
         keyWord: "",
         page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
+        pageSize: this.pagerOptions.pageSize,
       }).then((res) => {
         if (res.code === 200) {
           this.categoryList = res.data;
@@ -381,11 +401,10 @@
       await getWarehouseList({
         keyword: "",
         page: this.pagerOptions.currPage,
-        pageSize: this.pagerOptions.pageSize
+        pageSize: this.pagerOptions.pageSize,
       }).then((res) => {
         if (res.data.code === 200) {
           this.warehouseList = res.data.data;
-          console.log(this.warehouseList, "warehouseList");
         }
       });
     },
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index dca6235..63d46c0 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -56,7 +56,7 @@
 
 <script>
 import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
-import { getLocationData,} from "@/api/locationApi/locationApi";
+import { getLocationData } from "@/api/locationApi/locationApi";
 import AddOverviewDialog from "@/views/overview/AddOverviewDialog";
 
 export default {
@@ -74,7 +74,7 @@
       //   { label: "棰勭暀鏁伴噺", unit: "" },
       //   { label: "浠峰��", unit: "锟�" },
       // ],
-      countcol:["鍦ㄥ簱鏁伴噺","棰勭暀鏁伴噺","浠峰��"],
+      countcol: ["鍦ㄥ簱鏁伴噺", "棰勭暀鏁伴噺", "浠峰��"],
       testArr: [
         {
           product: "HC/閿�鍞尯/b鍖�",
@@ -114,6 +114,7 @@
       },
       productId: this.$route.params.id,
       productName: this.$route.params.name,
+      metaTitle: this.$route.meta.title,
     };
   },
   created() {
@@ -171,14 +172,14 @@
           prop: "amount",
           isShowColumn: true,
           default: true,
-          unit:""
+          unit: "",
         },
         {
           label: "棰勭暀鏁伴噺",
           prop: "availableStore",
           isShowColumn: true,
           default: true,
-          unit:""
+          unit: "",
         },
         {
           label: "鍗曚綅",
@@ -193,7 +194,7 @@
           width: 120,
           default: false,
           isShowColumn: showcol.includes("浠峰��"),
-          unit:"锟�"
+          unit: "锟�",
         },
       ];
       return tableColumn;
@@ -209,10 +210,9 @@
         pageSize: this.pagerOptions.pageSize,
       }).then((res) => {
         if (res.code === 200) {
-          console.log(res.data,"鎺ュ彛璇锋眰鎴愬姛")
-          const list = res.data
-          this.tableList.tableInfomation = list || []
-          this.pagerOptions.totalCount = res.total
+          const list = res.data;
+          this.tableList.tableInfomation = list || [];
+          this.pagerOptions.totalCount = res.total;
         }
       });
     },
@@ -232,14 +232,40 @@
     addBtnClick() {
       this.editConfig.visible = true;
       this.editConfig.title = "鏂板缓";
-      this.getData()
+      this.getData();
     },
     // 鐘舵��
     getStatus(val) {
       return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚";
     },
     // 鍘嗗彶
-    handleHistoryClick() {},
+    handleHistoryClick(row) {
+      this.$router.push({
+        name: "inboundOutboundDetail",
+        params: {
+          name: this.metaTitle,
+          pageName:"鎶ヨ〃",
+          product: {
+            page: this.pagerOptions.currPage,
+            pageSize: this.pagerOptions.pageSize,
+            produceId: row.produceId,
+            productName: row.productName,
+            unit: row.unit,
+          },
+          paramsKey: {
+            amount: "amount",
+            productName:"productName",
+            status: "status",
+            contactedName: "contactedName",
+            date: "date",
+            fromLocation: "fromLocation",
+            number: "number",
+            toLocation: "toLocation",
+            unit: "unit",
+          },
+        },
+      });
+    },
     // 琛ヨ揣
     handleAddGoods() {},
   },
diff --git a/vue.config.js b/vue.config.js
index fe24245..03ba48d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,12 +14,12 @@
   devServer: {
     proxy: {
       "/api-s": {
-        target: "http://192.168.20.119:8005",
+        target: "http://192.168.20.118:8005",
         ws: true,
         changeOrigin: true
       },
       "/api-wms": {
-        target: "http://192.168.20.119:8005",
+        target: "http://192.168.20.118:8005",
         ws: true,
         changeOrigin: true
       }

--
Gitblit v1.8.0