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/scrapDetails/index.vue |  162 ++++++++++++++++-------------------------------------
 1 files changed, 49 insertions(+), 113 deletions(-)

diff --git a/admin-web/src/views/stock/scrap/scrapDetails/index.vue b/admin-web/src/views/stock/scrap/scrapDetails/index.vue
index 2936cd9..257a248 100644
--- a/admin-web/src/views/stock/scrap/scrapDetails/index.vue
+++ b/admin-web/src/views/stock/scrap/scrapDetails/index.vue
@@ -13,8 +13,6 @@
               <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
             </el-col>
           </el-row>
-          <!--娣诲姞/缂栬緫寮圭獥-->
-          <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
         </el-card>
       </el-container>
     </el-container>
@@ -23,6 +21,12 @@
       :dialog-show="importSetting.dialogShow"
       :dialog-title="importSetting.dialogTitle"
     />
+    <detail
+      v-if="detailSetting.show"
+      :setting="detailSetting"
+      @close="detailSetting.show = false"
+      ref="detailRef"
+    ></detail>
   </div>
 </template>
 
@@ -30,14 +34,14 @@
 import MyTableV2 from "@/components/myTable/myTableV2";
 import MyButton from "@/components/myButton/myButton";
 import SettingIplatform from '@/utils/settingIplatform';
-import edit from './edit'
 import * as finsystenant from '@/api/baseSetting/finsystenant'
 import myImport from '@/views/components/myImport'
+import detail from '../itemScrapping/detail';
 import {getBaseUrl} from '@/utils/base';
 
 export default {
   name: "index",
-  components: {MyButton, MyTableV2, edit, myImport},
+  components: {MyButton, MyTableV2, myImport,detail},
   data() {
     return {
       // 鎼滅储妗�
@@ -50,23 +54,6 @@
           defaultValue: ''
         },
         {
-          type: 'select',
-          dataIndex: 'status',
-          label: '绫诲瀷',
-          placeholder: '璇烽�夋嫨',
-          defaultValue: '1',
-          options: [
-            {
-              label: '鍚敤',
-              value: '1'
-            },
-            {
-              label: '绂佺敤',
-              value: '0'
-            }
-          ]
-        },
-        {
           type: 'text',
           dataIndex: 'name',
           label: '鐗╁搧鍚嶇О',
@@ -74,11 +61,40 @@
           defaultValue: ''
         },
         {
+          type: 'select',
+          dataIndex: 'warehouseId',
+          label: '瑙勬牸鍨嬪彿',
+          placeholder: '璇烽�夋嫨',
+          defaultValue: '',
+          options: [],
+        },
+        {
+          type: 'cascader',
+          dataIndex: 'agencyId',
+          label: '鏈烘瀯',
+          placeholder: '璇烽�夋嫨',
+          optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+          defaultValue: '',
+          options: [],
+        },
+        {
           type: 'text',
           dataIndex: 'name',
           label: '鍒涘缓浜�',
           placeholder: '璇疯緭鍏�',
           defaultValue: ''
+        },
+        {
+          type: 'date-picker',
+          dataIndex: 'incomeTimeStart',
+          label: '鎶ュ簾鏃堕棿',
+          defaultValue: '',
+        },
+        {
+          type: 'date-picker',
+          dataIndex: 'incomeTimeEnd',
+          label: '鑷�',
+          defaultValue: '',
         },
       ],
       // 鏍戞暟鎹�
@@ -133,12 +149,10 @@
         },
         // 鍒椾俊鎭�
         columns: [
-          {title: '绫诲瀷', field: 'name', align: 'left',},
-          {title: '鍗曞彿', field: 'code', align: 'center'},
-          {title: '鐗╁搧鍚嶇О', field: 'lv', align: 'center', },
+          {title: '鍗曞彿', field: 'name', align: 'left',},
+          {title: '鐗╁搧鍚嶇О', field: 'code', align: 'center'},
           {title: '瑙勬牸鍨嬪彿', field: 'lv', align: 'center', },
-          {title: '鍑哄叆搴撴暟閲�', field: 'summary', align: 'left',},
-          {title: '閲戦', field: 'summary', align: 'left',},
+          {title: '鎶ュ簾鏁伴噺', field: 'lv', align: 'center', },
           {title: '鎵�灞炴満鏋�', field: 'summary', align: 'left',},
           {title: '鍒涘缓浜�', field: 'summary', align: 'left',},
           {title: '鎿嶄綔鏃堕棿', field: 'summary', align: 'left',},
@@ -151,7 +165,7 @@
             {
               title: '璇︽儏',
               events: (row) => {
-                this.showAudit(row);
+                this.showDetail(row);
               },
             },
           ],
@@ -167,97 +181,19 @@
           }
         }
       },
+      detailSetting: {
+        title: '璇︽儏',
+        id: '',
+        show: false,
+      },
     }
   },
   created() {
-    // 鑾峰彇鏈烘瀯鏍�
-    this.initTreeData()
   },
   methods: {
-    //瀵煎叆
-    importOrg() {
-        this.importSetting.dialogShow = true
-        this.importSetting.onSuccess = (response, callBack) => {
-            if (response.code===1){
-              this.$message.success(response.msg)
-              this.search(1)
-            }else{
-              this.$message.warning(response.msg)
-            }
-            callBack()
-        }
-    },
-    // 宸︿晶鏍戝垵濮嬪寲
-    initTreeData() {
-      finsystenant.getTree().then(res => {
-        const content = res || []
-        this.treeDataList.splice(0, this.treeDataList.length)
-        this.treeDataList = content
-        if (content.length > 0) {
-          this.importSetting.fileSettings.data = {pid: content[0].id}
-        }
-      })
-    },
-    updState(row) {
-      let vm = this
-      let text = row.status == 0 ? "鍚敤" : "绂佺敤";
-      vm.$modal.confirm('纭瑕�' + text + '"' + row.name + '"鍚楋紵').then(function () {
-        let params = Object.assign({}, row)
-        params.status = row.status == 1 ? 0 : 1
-        finsystenant.edit(params).then(res => {
-          if (res) {
-            row.status = row.status === 1 ? 0 : 1
-            vm.$modal.msgSuccess(text + "鎴愬姛");
-            vm.search()
-          }
-        })
-      })
-    },
-    del(row) {
-      this.$modal
-        .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
-        .then(function () {
-          finsystenant.del({id: row.id}).then((res) => {
-          });
-        })
-        .then((res) => {
-          this.$message.success('鍒犻櫎鎴愬姛锛�');
-          this.search()
-        })
-        .catch(() => {
-        });
-    },
-    showAdd() {
-      // if (!this.editSetting.orgId) {
-      //   this.$message.warning('璇峰厛閫夋嫨宸︿晶鏈烘瀯')
-      // } else {
-        this.editSetting.id = null;
-        this.editSetting.info = null;
-        this.editSetting.title = '鏂板';
-        this.editSetting.show = true;
-      // }
-    },
-    showAudit(row) {
-      this.editSetting.id = row.id;
-      this.editSetting.info = JSON.stringify(row);
-      this.editSetting.title = '缂栬緫';
-      this.editSetting.show = true;
-    },
-    nodeClick(param) {
-      param = param || {}
-      this.p = Object.assign({}, {
-        id: param.id,
-        name: param.name
-      })
-      if (this.p.id != undefined && this.p.id != null) {
-        this.filterFrom.tenantId = this.p.id
-        this.editSetting.orgId = this.p.id
-      } else {
-        this.filterFrom.tenantId = null
-        this.editSetting.orgId = null
-      }
-      this.importSetting.fileSettings.data = {pid: param.id}
-      this.search(1)
+    showDetail(row) {
+      this.detailSetting.id = row.id;
+      this.detailSetting.show = true;
     },
     // 鏌ヨtable鍒楄〃
     search(pageNum) {

--
Gitblit v1.9.1