From 6843b10472482b305b5580cc2f5cdbb97fb9a203 Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 13 十一月 2023 17:31:43 +0800
Subject: [PATCH] 调拨,库存盘点,报废管理,台账管理

---
 admin-web/src/views/stock/scrap/itemScrapping/index.vue |  177 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 98 insertions(+), 79 deletions(-)

diff --git a/admin-web/src/views/stock/scrap/itemScrapping/index.vue b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
index 0c7be3d..5263192 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/index.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
@@ -9,22 +9,25 @@
         <el-row style="margin-top: 15px">
           <el-col>
             <!--鍒楄〃-->
-            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
-              <el-row class="card" :gutter="5">
+            <div class="table-tool-bar" style="margin-bottom: 15px">
+              <my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
+            </div>
+            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }">
+              <el-row class="card" :gutter="5" v-loading="loading">
                 <el-col v-for="(item, index) in list" :key="index" class="cm-item">
                   <el-card class="card-data">
                     <div class="card-container">
                       <div class="card-header">
                         <div class="card-header-left">
-                          <span>璋冩嫧鍗曞彿锛�</span>
+                          <span>鎶ュ簾鍗曞彿锛�</span>
                           <span class="value">{{ item.businessFormCode }}</span>
                           <div class="states" :class="item.states == 1 ? '' : 'states-success'">
-                            {{ item.states == 1 ? '寰呰皟鎷�' : '宸茶皟鎷�' }}
+                            {{ item.states == 1 ? '寰呮姤搴�' : '宸叉姤搴�' }}
                           </div>
                         </div>
                         <div class="card-header-right">
                           <el-button site="form" type="success" size="mini" @click="handleExport(item)"
-                            >瀵煎嚭璋冩嫧鍑哄簱鍗�</el-button
+                            >瀵煎嚭鎶ュ簾鍗�</el-button
                           >
                           <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
                             >鏌ョ湅璇︽儏</el-button
@@ -32,21 +35,19 @@
                         </div>
                       </div>
                       <div class="one-hed">
-                        <div class="box"><span class="span-two">鎺ユ敹鏈烘瀯锛�</span>{{ item.agencyId }}</div>
-                        <div class="box"><span class="span-two">鐢宠浜猴細</span>{{ item.buyerName }}</div>
-                        <div class="box"><span class="span-two">鐢宠璋冩嫧鏃堕棿锛�</span>{{ item.procureTime }}</div>
-                        <div class="box"><span class="span-two">鎺ユ敹鏃堕棿锛�</span>{{ item.procureTime }}</div>
-                        <div class="box"><span class="span-two">璋冩嫧鏈烘瀯锛�</span>{{ item.procureTime }}</div>
-                        <div class="box"><span class="span-two">璋冩嫧浜猴細</span>{{ item.procureTime }}</div>
-                        <div class="box"><span class="span-two">璋冩嫧鏃堕棿锛�</span>{{ item.procureTime }}</div>
+                        <div class="box"><span class="span-two">鏈烘瀯锛�</span>{{ item.agencyId }}</div>
+                        <div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.buyerName }}</div>
+                        <div class="box">
+                          <span class="span-two">鎶ュ簾鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
+                        </div>
                       </div>
                       <div class="card-end">
-                        <div v-for="(just, index) in item.models" :key="index" class="item">
-                          <div class="name">{{ just.baseGoodsModelsId }}</div>
+                        <div v-for="(just, index) in item.fromProcureTemplateInfoList" :key="index" class="item">
+                          <div class="name">{{ just.goodsTemplateName }}</div>
                           <div class="value-box">
                             <div class="value-box-item">
                               <span class="label">鏁伴噺锛�</span>
-                              <span class="value">{{ just.counts }}</span>
+                              <span class="value">{{ just.count }}</span>
                               <span class="unit">{{ just.unit }}</span>
                             </div>
                           </div>
@@ -72,8 +73,19 @@
       </el-card>
     </el-container>
     <!--娣诲姞/缂栬緫寮圭獥-->
-    <edit ref="editRef"></edit>
-    <detail ref="detailRef"></detail>
+    <edit
+      v-if="editSetting.show"
+      :setting="editSetting"
+      ref="editRef"
+      @close="editSetting.show = false"
+      @search="refreshData"
+    ></edit>
+    <detail
+      v-if="detailSetting.show"
+      :setting="detailSetting"
+      @close="detailSetting.show = false"
+      ref="detailRef"
+    ></detail>
     <my-import
       :import-setting="importSetting"
       :dialog-show="importSetting.dialogShow"
@@ -84,12 +96,14 @@
 
 <script>
 import { procureList, procureDel, procureIncome } from '@/api/stock/procure/purchaseOrder';
+import { getTree } from '@/api/baseSetting/finsystenant';
 import MyButton from '@/components/myButton/myButton';
 import SettingIplatform from '@/utils/settingIplatform';
 import myImport from '@/views/components/myImport';
 import edit from './edit';
 import detail from './detail';
 import { getBaseUrl } from '@/utils/base';
+import * as DateFormatter from '@/utils/DateFormatter';
 
 export default {
   name: 'index',
@@ -104,7 +118,7 @@
         {
           type: 'text',
           dataIndex: 'businessFormCode',
-          label: '璋冩嫧鍗曞彿',
+          label: '鎶ュ簾鍗曞彿',
           placeholder: '璇疯緭鍏�',
           defaultValue: '',
         },
@@ -116,50 +130,23 @@
           defaultValue: '',
         },
         {
-          type: 'select',
-          dataIndex: 'name',
+          type: 'cascader',
+          dataIndex: 'agencyId',
           label: '鏈烘瀯',
           placeholder: '璇烽�夋嫨',
+          optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
           defaultValue: '',
           options: [],
         },
         {
-          type: 'text',
-          dataIndex: 'buyerName',
-          label: '鍒涘缓浜�',
-          placeholder: '璇疯緭鍏�',
-          defaultValue: '',
-        },
-        {
-          type: 'select',
-          dataIndex: 'states',
-          label: '鐘舵��',
-          placeholder: '璇烽�夋嫨',
-          defaultValue: '',
-          options: [
-            {
-              label: '鍏ㄩ儴',
-              value: '',
-            },
-            {
-              label: '寰呰皟鎷�',
-              value: '1',
-            },
-            {
-              label: '宸茶皟鎷�',
-              value: '2',
-            },
-          ],
-        },
-        {
           type: 'date-picker',
-          dataIndex: 'val1',
-          label: '璋冩嫧鏃堕棿',
+          dataIndex: 'incomeTimeStart',
+          label: '鎶ュ簾鏃堕棿',
           defaultValue: '',
         },
         {
           type: 'date-picker',
-          dataIndex: 'val2',
+          dataIndex: 'incomeTimeEnd',
           label: '鑷�',
           defaultValue: '',
         },
@@ -197,6 +184,11 @@
         orgId: '',
         show: false,
       },
+      detailSetting: {
+        title: '璇︽儏',
+        id: '',
+        show: false,
+      },
       pageNum: 1,
       pageSize: 10,
       total: 0,
@@ -205,6 +197,12 @@
   computed: {
     clientHeight() {
       return document.documentElement.clientHeight;
+    },
+  },
+  filters: {
+    formatTime(time) {
+      if (!time) return;
+      return DateFormatter.LongToDateTime(time);
     },
   },
   created() {
@@ -224,6 +222,7 @@
         console.log(this.list);
       });
     },
+
     //瀵煎叆
     importOrg() {
       this.importSetting.dialogShow = true;
@@ -240,57 +239,77 @@
     // 瀵煎嚭
     handleExport() {},
     // 鏂板
-    addtable() {
-      this.$refs.editRef.open();
+    handleAdd() {
+      this.editSetting.id = null;
+      this.editSetting.info = null;
+      this.editSetting.title = '鏂板';
+      this.editSetting.show = true;
     },
     // 缂栬緫
     handleEdit(row) {
-      this.$refs.editRef.open(row.id);
+      this.editSetting.id = row.id;
+      this.editSetting.info = null;
+      this.editSetting.title = '缂栬緫';
+      this.editSetting.show = true;
     },
     // 璇︽儏
     handleDetail(row) {
-      this.$refs.detailRef.open(row.id);
+      this.detailSetting.id = row.id;
+      this.detailSetting.show = true;
     },
-    // 璋冩嫧
+    // 鎶ュ簾
     handleIncome(row) {
-      this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode}  璋冩嫧鍚�?`, '閲囪喘璋冩嫧')
-        .then(function () {
-          procureIncome({ id: row.id }).then((res) => {
-            this.$message.success('璋冩嫧鎴愬姛锛�');
-          });
-        })
-        .then((res) => {
-          this.search();
-        })
-        .catch(() => {});
+      this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode}  鎶ュ簾鍚�?`, '鎶ュ簾鎶ュ簾').then(() => {
+        procureIncome({ id: row.id })
+          .then((res) => {
+            this.$message.success('鎶ュ簾鎴愬姛锛�');
+            this.search();
+          })
+          .catch(() => {});
+      });
     },
     del(row) {
-      this.$modal
-        .confirm('鏄惁纭鍒犻櫎璋冩嫧鍗曞彿涓�"' + row.businessFormCode + '"鐨勬暟鎹悧锛�')
-        .then(function () {
-          procureDel({ id: row.id }).then((res) => {});
-        })
-        .then((res) => {
-          this.$message.success('鍒犻櫎鎴愬姛锛�');
-          this.search();
-        })
-        .catch(() => {});
+      this.$modal.confirm('鏄惁纭鍒犻櫎鎶ュ簾鍗曞彿涓�"' + row.businessFormCode + '"鐨勬暟鎹悧锛�').then(() => {
+        procureDel({ id: row.id })
+          .then((res) => {
+            this.$message.success('鍒犻櫎鎴愬姛锛�');
+            this.search();
+          })
+          .catch(() => {});
+      });
     },
     // 鍒嗛〉
     handleSizeChange(pageSize) {
       this.pageSize = pageSize;
-      this.search({ pageNum: 1 });
+      this.search(1);
     },
     handleCurrentChange(pageNum) {
-      this.myTable.paging.page.pageNum = pageNum;
-      this.search({ pageNum: pageNum });
+      this.pageNum = pageNum;
+      this.search(pageNum);
     },
     // 鏌ヨtable鍒楄〃
     search(pageNum) {
+      if (pageNum) {
+        this.pageNum = pageNum;
+      }
       this.fetchData();
+    },
+    refreshData() {
+      this.pageNum = 1;
+      this.pageSize = 10;
+      this.search();
     },
     fifterForm(params) {
       this.filterFrom = Object.assign(this.filterFrom, params);
+      if (this.filterFrom.incomeTimeStart) {
+        this.filterFrom.incomeTimeStart = this.filterFrom.incomeTimeStart.replace(/\-/g, '');
+      }
+      if (this.filterFrom.incomeTimeEnd) {
+        this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
+      }
+      if (this.filterFrom.agencyId.length) {
+        this.filterFrom.agencyId = this.filterFrom.agencyId[this.filterFrom.agencyId.length - 1];
+      }
       this.search(1);
     },
   },

--
Gitblit v1.9.1