From b6a04be0a4cbf5d5a44006a09b83f52a71dfce27 Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期五, 17 十一月 2023 10:19:48 +0800
Subject: [PATCH] 部门管理，仓库管理库管员，库存管理
---
admin-web/src/views/stock/inventorycount/inventorytask/index.vue | 116 +++++++++++++++++++++++++--------------------------------
1 files changed, 51 insertions(+), 65 deletions(-)
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
index 97040e4..a8ce8af 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
@@ -41,6 +41,8 @@
import * as finsystenant from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
import { getBaseUrl } from '@/utils/base';
+import { selectTenantWarehouse } from '@/api/baseSetting/finsystenant';
+import {inventoryListApi} from '@/api/stock/inventory'
export default {
name: 'index',
@@ -51,16 +53,36 @@
items: [
{
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'businessFormCode',
label: '鐩樼偣鍗曞彿',
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
{
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'businessFormName',
label: '浠诲姟鍚嶇О',
placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ },
+ {
+ type: 'select',
+ dataIndex: 'warehouseId',
+ label: '鐩樼偣浠撳簱',
+ placeholder: '璇烽�夋嫨',
+ defaultValue: '',
+ options: [],
+ },
+ {
+ type: 'date-picker',
+ dataIndex: 'incomeTimeStart',
+ label: '鐩樼偣鏃堕棿',
+ defaultValue: '',
+ },
+ {
+ type: 'date-picker',
+ dataIndex: 'incomeTimeEnd',
+ label: '鑷�',
defaultValue: '',
},
],
@@ -107,7 +129,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + inventoryListApi(), // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {
@@ -130,14 +152,14 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鐩樼偣鍗曞彿', field: 'name', align: 'left' },
- { title: '浠诲姟鍚嶇О', field: 'code', align: 'center' },
- { title: '鐩樼偣浠撳簱', field: 'lv', align: 'center' },
- { title: '鐩樼偣浜�', field: 'lv', align: 'center' },
- { title: '鐩戠洏浜�', field: 'summary', align: 'left' },
- { title: '鐩樼偣鏃堕棿', field: 'summary', align: 'left' },
- { title: '鍒涘缓鏃堕棿', field: 'summary', align: 'left' },
- { title: '鐘舵��', field: 'summary', align: 'left' },
+ { title: '鐩樼偣鍗曞彿', field: 'businessFormCode', align: 'left' },
+ { title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'center' },
+ { title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'center' },
+ { title: '鐩樼偣浜�', field: 'operatorName', align: 'center' },
+ { title: '鐩戠洏浜�', field: 'operatorName2', align: 'left' },
+ { title: '鐩樼偣鏃堕棿', field: 'inventoryDate', align: 'left' },
+ { title: '鍒涘缓鏃堕棿', field: 'createTime', align: 'left' },
+ { title: '鐘舵��', field: 'states', align: 'left' },
],
// 鎿嶄綔淇℃伅
operation: {
@@ -152,7 +174,7 @@
},
{
title: '鐩樼偣',
- type:'success',
+ type: 'success',
events: (row) => {
this.showInventory(row);
},
@@ -173,8 +195,17 @@
};
},
created() {
- // 鑾峰彇鏈烘瀯鏍�
- this.initTreeData();
+ selectTenantWarehouse().then(res=>{
+ this.items.forEach(v=>{
+ if(v.label=='鐩樼偣浠撳簱') {
+ v.options = res.map(item=>{
+ item.label=item.warehouseName
+ item.vlaue=item.id
+ return item
+ })
+ }
+ })
+ })
},
methods: {
//瀵煎叆
@@ -190,41 +221,14 @@
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();
+ .then(() => {
+ finsystenant.del({ id: row.id }).then((res) => {
+ this.$message.success('鍒犻櫎鎴愬姛锛�');
+ this.search();
+ });
})
.catch(() => {});
},
@@ -240,30 +244,12 @@
this.editSetting.title = '缂栬緫';
this.editSetting.show = true;
},
+ // 鐩樼偣
showInventory(row) {
this.inventorySetting.id = row.id;
this.inventorySetting.info = JSON.stringify(row);
this.inventorySetting.title = '鐩樼偣';
this.inventorySetting.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);
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
--
Gitblit v1.9.1