From a6acf1f8924a8fabaa4b74f6771ddbe41ab6b204 Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 20 十一月 2023 18:47:09 +0800
Subject: [PATCH] 盘点编辑

---
 admin-web/src/views/stock/inventorycount/inventorytask/index.vue |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
index 411bdbd..dbe6bdf 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
@@ -42,8 +42,9 @@
 import myImport from '@/views/components/myImport';
 import { getBaseUrl } from '@/utils/base';
 import { selectTenantWarehouse } from '@/api/baseSetting/finsystenant';
-import { inventoryListApi } from '@/api/stock/inventory';
+import { inventoryListApi,inventoryDel } from '@/api/stock/inventory';
 import * as DateFormatter from '@/utils/DateFormatter';
+import {mapGetters} from 'vuex'
 
 export default {
   name: 'index',
@@ -76,13 +77,13 @@
         },
         {
           type: 'date-picker',
-          dataIndex: 'incomeTimeStart',
+          dataIndex: 'startTime',
           label: '鐩樼偣鏃堕棿',
           defaultValue: '',
         },
         {
           type: 'date-picker',
-          dataIndex: 'incomeTimeEnd',
+          dataIndex: 'endTime',
           label: '鑷�',
           defaultValue: '',
         },
@@ -154,9 +155,9 @@
         // 鍒椾俊鎭�
         columns: [
           { title: '鐩樼偣鍗曞彿', field: 'businessFormCode', align: 'left' },
-          { title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'center' },
-          { title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'center' },
-          { title: '鐩樼偣浜�', field: 'operatorName', align: 'center' },
+          { title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'left' },
+          { title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'left' },
+          { title: '鐩樼偣浜�', field: 'operatorName', align: 'left' },
           { title: '鐩戠洏浜�', field: 'operatorName2', align: 'left' },
           {
             title: '鐩樼偣鏃堕棿',
@@ -192,17 +193,38 @@
         // 鎿嶄綔淇℃伅
         operation: {
           show: true, // 鏄剧ず鎿嶄綔鍒�
-          width: '150', // 鍒楀
+          width: '220', // 鍒楀
           attr: [
             {
               title: '缂栬緫',
+              hidden:(row)=>{
+                if(row.states!=0){
+                  return true
+                }
+              },
               events: (row) => {
                 this.showAudit(row);
               },
             },
             {
+              title: '鍒犻櫎',
+              hidden:(row)=>{
+                if(row.states!=0){
+                  return true
+                }
+              },
+              events: (row) => {
+                this.del(row);
+              },
+            },
+            {
               title: '鐩樼偣',
               type: 'success',
+              hidden:(row)=>{
+                if(row.states!=0){
+                  return true
+                }
+              },
               events: (row) => {
                 this.showInventory(row);
               },
@@ -222,13 +244,16 @@
       },
     };
   },
+  computed:{
+    ...mapGetters(['userInfo'])
+  },
   created() {
-    selectTenantWarehouse().then((res) => {
+    selectTenantWarehouse({agencyId: this.userInfo.tenantId}).then((res) => {
       this.items.forEach((v) => {
         if (v.label == '鐩樼偣浠撳簱') {
           v.options = res.map((item) => {
             item.label = item.warehouseName;
-            item.vlaue = item.id;
+            item.value = item.id;
             return item;
           });
         }
@@ -251,9 +276,9 @@
     },
     del(row) {
       this.$modal
-        .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
+        .confirm('鏄惁纭鍒犻櫎鍗曞彿涓猴細' + row.businessFormCode + ' 鐨勬暟鎹悧锛�')
         .then(() => {
-          finsystenant.del({ id: row.id }).then((res) => {
+          inventoryDel({ id: row.id }).then((res) => {
             this.$message.success('鍒犻櫎鎴愬姛锛�');
             this.search();
           });
@@ -289,6 +314,13 @@
     },
     fifterForm(params) {
       this.filterFrom = Object.assign(this.filterFrom, params);
+      
+      if (this.filterFrom.startTime) {
+        this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
+      }
+      if (this.filterFrom.endTime) {
+        this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
+      }
       this.search(1);
     },
   },

--
Gitblit v1.9.1