From 62b6a7fac3f2acde70b578431147c4a01f19c182 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 15 四月 2024 09:07:05 +0800
Subject: [PATCH] bug修改
---
admin-web/src/views/stock/inventorycount/inventorytask/index.vue | 132 +++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 62 deletions(-)
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
index 4e02bcb..95a42e1 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
@@ -10,25 +10,26 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
+ <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" />
+ <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
<inventory
- v-if="inventorySetting.show"
- :setting="inventorySetting"
- @close="inventorySetting.show = false"
- @search="search"
+ v-if="inventorySetting.show"
+ :setting="inventorySetting"
+ @close="inventorySetting.show = false"
+ @search="search"
/>
- <detail v-if="inventoryDetail.show" :setting="inventoryDetail" @close="inventoryDetail.show = false" @search="search" />
+ <detail v-if="inventoryDetail.show" :setting="inventoryDetail" @close="inventoryDetail.show = false"
+ @search="search"/>
</el-card>
</el-container>
</el-container>
<my-import
- :import-setting="importSetting"
- :dialog-show="importSetting.dialogShow"
- :dialog-title="importSetting.dialogTitle"
+ :import-setting="importSetting"
+ :dialog-show="importSetting.dialogShow"
+ :dialog-title="importSetting.dialogTitle"
/>
</div>
</template>
@@ -40,17 +41,17 @@
import edit from './edit';
import inventory from './inventory';
import detail from './detail';
-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, inventoryDel } from '@/api/stock/inventory';
+import {getBaseUrl} from '@/utils/base';
+import {inventoryDel, inventoryListApi,isAddInventory} from '@/api/stock/inventory';
import * as DateFormatter from '@/utils/DateFormatter';
-import { mapGetters } from 'vuex';
+import {mapGetters} from 'vuex';
+import listPage from '@/views/mixins/listPage';
export default {
name: 'index',
- components: { MyButton, MyTableV2, edit, myImport, inventory,detail },
+ mixins: [listPage],
+ components: {MyButton, MyTableV2, edit, myImport, inventory, detail},
data() {
return {
// 鎼滅储妗�
@@ -70,12 +71,27 @@
defaultValue: '',
},
{
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
+ cascader: [{key:'warehouseId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'select',
dataIndex: 'warehouseId',
- label: '鐩樼偣浠撳簱',
+ label: '浠撳簱',
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
+ optionsConfig: {
+ label: 'warehouseName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/warehouse/select/tenant_warehouse'
+ },
},
{
type: 'date-picker',
@@ -129,7 +145,7 @@
orgId: '',
show: false,
},
- inventoryDetail:{
+ inventoryDetail: {
title: '',
id: '',
orgId: '',
@@ -162,18 +178,18 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鐩樼偣鍗曞彿', field: 'businessFormCode', align: 'left' },
- { title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'left' },
- { title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'left' },
- { title: '鐩樼偣浜�', field: 'operatorName', align: 'left' },
- { title: '鐩戠洏浜�', field: 'operatorName2', align: 'left' },
+ {title: '鐩樼偣鍗曞彿', field: 'businessFormCode', align: 'center', width: 130},
+ {title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'left', minWidth: 140},
+ {title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130},
+ {title: '鐩樼偣浜�', field: 'operatorName', align: 'center', width: 120},
+ {title: '鐩戠洏浜�', field: 'operatorName2', align: 'center', width: 120},
{
title: '鐩樼偣鏃堕棿',
field: 'inventoryDate',
align: 'center',
width: 160,
formatter: (row) => {
- return { value: row.inventoryDate ? DateFormatter.LongToDateTime(row.inventoryDate) : '-' };
+ return {value: row.inventoryDate ? DateFormatter.LongToDateTime(row.inventoryDate) : '-'};
},
},
{
@@ -182,13 +198,14 @@
align: 'center',
width: 160,
formatter: (row) => {
- return { value: DateFormatter.LongToDateTime(row.createTime) };
+ return {value: DateFormatter.LongToDateTime(row.createTime)};
},
},
{
title: '鐘舵��',
field: 'states',
- align: 'left',
+ align: 'center',
+ width: 90,
type: 'primary',
formatter: (row) => {
return {
@@ -263,7 +280,7 @@
},
},
{
- title: '鐢熶骇鐩樼偣琛�',
+ title: '鐢熸垚鐩樼偣琛�',
type: 'primary',
hidden: (row) => {
if (row.states != 2) {
@@ -271,7 +288,7 @@
}
},
events: (row) => {
- this.showInventoryDetail(row);
+ this.handleExport('inventoryExport', `鐩樼偣琛�-${row.businessFormCode}`, {id: row.id});
},
},
],
@@ -293,17 +310,6 @@
...mapGetters(['userInfo']),
},
created() {
- selectTenantWarehouse({ agencyId: this.userInfo.tenantId }).then((res) => {
- this.items.forEach((v) => {
- if (v.label == '鐩樼偣浠撳簱') {
- v.options = res.map((item) => {
- item.label = item.warehouseName;
- item.value = item.id;
- return item;
- });
- }
- });
- });
},
methods: {
//瀵煎叆
@@ -321,20 +327,33 @@
},
del(row) {
this.$modal
- .confirm('鏄惁纭鍒犻櫎鍗曞彿涓猴細' + row.businessFormCode + ' 鐨勬暟鎹悧锛�')
- .then(() => {
- inventoryDel({ id: row.id }).then((res) => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
+ .confirm('鏄惁纭鍒犻櫎鍗曞彿涓猴細' + row.businessFormCode + ' 鐨勬暟鎹悧锛�')
+ .then(() => {
+ inventoryDel({id: row.id}).then((res) => {
+ this.$message.success('鍒犻櫎鎴愬姛锛�');
+ this.search();
+ });
+ })
+ .catch(() => {
});
- })
- .catch(() => {});
},
showAdd() {
- this.editSetting.id = null;
- this.editSetting.info = null;
- this.editSetting.title = '鏂板';
- this.editSetting.show = true;
+ // 鍏堟煡璇㈡槸鍚﹁兘澧炲姞鏂扮殑鐩樼偣浠诲姟
+ // 缂栬緫鎺ュ彛
+ isAddInventory().then((res) => {
+ if(res == 0){
+ this.$message.warning('褰撳墠鏈夋湭瀹屾垚鐨勭洏鐐逛换鍔★紒');
+ }else if(res == -1){
+ this.$message.warning('褰撳墠浠撳簱鏃犵墿鍝侊紒');
+ }else{
+ this.editSetting.id = null;
+ this.editSetting.info = null;
+ this.editSetting.title = '鏂板';
+ this.editSetting.show = true;
+ }
+ }).catch(()=>{
+ //this.loading = false
+ });
},
showAudit(row) {
this.editSetting.id = row.id;
@@ -358,21 +377,10 @@
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
- this.$refs.myTable.search(pageNum);
+ this.$refs.myTable.search({pageNum});
} else {
this.$refs.myTable.search();
}
- },
- 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