From 7763948ad5ff19ee0a45b09cbb9f53ee86eb4975 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 22 三月 2024 15:58:24 +0800
Subject: [PATCH] 新建入库、库存调拨、新建出库报错问题修改

---
 src/views/operate/scrap/index.vue |   89 +++++++++++++++++++++++++++++++-------------
 1 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/src/views/operate/scrap/index.vue b/src/views/operate/scrap/index.vue
index 87c6af0..ae4d460 100644
--- a/src/views/operate/scrap/index.vue
+++ b/src/views/operate/scrap/index.vue
@@ -16,20 +16,31 @@
           :table-list="tableList"
           :show-checkcol="false"
           @tableRowClick="tableRowClick"
-        ></TableCommonView>
+        >
+          <template slot="tableButton">
+            <el-table-column fixed="right" label="鎿嶄綔" width="100">
+              <template slot-scope="scope">
+                <el-button @click="examineClick(scope.row)" type="text" size="small">鏌ョ湅</el-button>
+                <el-button type="text" v-if="scope.row.status != 4" size="small" @click="editClick(scope.row)"
+                  >缂栬緫</el-button
+                >
+              </template>
+            </el-table-column>
+          </template>
+        </TableCommonView>
       </div>
       <div class="btn-pager">
         <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
       </div>
     </div>
     <!-- 鏂板缓/缂栬緫 -->
-    <AddScrapDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+    <AddScrapDialog v-if="editConfig.visible" :editCommonConfig="editConfig" />
   </div>
 </template>
 
 <script>
 import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getProductList } from "@/api/product/product"
+import { getDisuseList } from "@/api/operate/scrap"
 // import DetailProduct from "@/views/productManage/product/DetailProduct"
 import AddScrapDialog from "@/views/operate/scrap/AddScrapDialog"
 
@@ -46,8 +57,10 @@
       editConfig: {
         visible: false,
         title: "鏂板缓",
-        infomation: {}
-      }
+        infomation: {},
+        showEdit: false
+      },
+      keyword: ""
     }
   },
   created() {
@@ -55,10 +68,23 @@
     this.getData()
   },
   methods: {
+    // 鏌ョ湅
+    examineClick(row) {
+      this.editConfig.title = "鏌ョ湅"
+      this.editConfig.infomation = { ...row }
+      this.editConfig.visible = true
+    },
+    editClick(row) {
+      console.log(row, "缂栬緫")
+      this.editConfig.title = "缂栬緫"
+      this.editConfig.infomation = { ...row }
+      this.editConfig.visible = true
+    },
     setTable() {
       this.tableList = {
         tableInfomation: [],
-        selectBox: true,
+        selectBox: false,
+        selectIndex: true,
         showcol: this.showcol,
         allcol: [],
         tableColumn: this.setTableColumn(this.showcol)
@@ -76,44 +102,44 @@
       console.log(showcol)
       let tableColumn = [
         {
-          label: "鍗曞彿",
-          prop: "id",
+          label: "鎶ュ簾鍗曞彿",
+          prop: "number",
           isShowColumn: true,
           default: true
         },
         {
           label: "鏃ユ湡",
-          prop: "deviceName",
+          prop: "operationDate",
           isShowColumn: true,
           default: true
         },
         {
           label: "浜у搧",
-          prop: "id",
+          prop: "productName",
           isShowColumn: true,
           default: true
         },
         {
           label: "鏁伴噺",
-          prop: "deviceId",
+          prop: "amount",
           isShowColumn: true,
           default: false
         },
         {
           label: "璁￠噺鍗曚綅",
-          prop: "shopName",
+          prop: "unit",
           isShowColumn: true,
           default: false
         },
         {
           label: "婧愪綅缃�",
-          prop: "preTime",
+          prop: "from",
           isShowColumn: true,
           default: false
         },
         {
           label: "鎶ュ簾浣嶇疆",
-          prop: "status",
+          prop: "to",
           isShowColumn: true,
           default: false
         },
@@ -122,8 +148,10 @@
           prop: "status",
           width: 120,
           isShowColumn: true,
-          default: true,
-          status: true
+          default: false,
+          status: true,
+          isCallMethod: true,
+          getCallMethod: this.getStatus
         }
       ]
       return tableColumn
@@ -133,41 +161,48 @@
       this.tableList.tableColumn = this.setTableColumn(val)
     },
     // 璇锋眰鏁版嵁
-    async getData(val, content) {
-      await getProductList({
-        [val]: content,
+    async getData() {
+      await getDisuseList({
+        number: this.keyword,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
-        if (res.data.code === 200) {
-          const list = res.data.data.list.map((item) => {
+        if (res.code === 200) {
+          const list = res.data.map((item) => {
             return {
               ...item,
-              supplierNumber: item.supplier.number,
-              status: "鑽夌",
-              preTime: "2023-09-04 11:20:00"
+              from: item.fromLocation.name,
+              to: item.toLocation.name
             }
           })
           this.tableList.tableInfomation = list || []
-          this.pagerOptions.totalCount = res.data.data.total
+          this.pagerOptions.totalCount = res.total
         }
       })
     },
     // 鎼滅储
     getList(val) {
+      this.keyword = val
       console.log(val)
+      this.pagerOptions.currPage = 1
+      this.getData()
     },
     // 琛岀偣鍑�
     tableRowClick(row) {
       console.log(row)
-      this.editConfig.visible = true
-      this.editConfig.title = "缂栬緫"
+      // this.editConfig.visible = true;
+      // this.editConfig.title = "缂栬緫";
       this.editConfig.infomation = { ...row }
     },
     // 鏂板缓
     addBtnClick() {
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
+      this.editConfig.infomation = {}
+    },
+    // 鐘舵��
+    getStatus(val) {
+      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
     }
   }
 }

--
Gitblit v1.8.0