From 774e6e650b6235a9e34dfecab65c4322c1767714 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 16:48:15 +0800
Subject: [PATCH] feat: 库存管理 查询条件梳理
---
admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue | 367 +++++++++++++++++++++++++---------------------------
1 files changed, 177 insertions(+), 190 deletions(-)
diff --git a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
index 54f2d7d..9925dc5 100644
--- a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
+++ b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
@@ -13,140 +13,206 @@
<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>
- <my-import
- :import-setting="importSetting"
- :dialog-show="importSetting.dialogShow"
- :dialog-title="importSetting.dialogTitle"
- />
</div>
</template>
<script>
-import MyTableV2 from "@/components/myTable/myTableV2";
-import MyButton from "@/components/myButton/myButton";
+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 {getBaseUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
+import * as DateFormatter from '@/utils/DateFormatter';
export default {
- name: "index",
- components: {MyButton, MyTableV2, edit, myImport},
+ name: 'index',
+ components: {MyButton, MyTableV2},
data() {
return {
// 鎼滅储妗�
items: [
{
- type: 'text',
- dataIndex: 'name',
- label: '鐩樼偣鍗曞彿',
- placeholder: '璇疯緭鍏�',
- defaultValue: ''
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
+ cascader: [{key:'warehouseId',queryKey: 'agencyId'},{key:'goodsTemplateId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
},
- // {
- // type: 'select',
- // dataIndex: 'status',
- // label: '绫诲瀷',
- // placeholder: '璇烽�夋嫨',
- // defaultValue: '1',
- // options: [
- // {
- // label: '鍚敤',
- // value: '1'
- // },
- // {
- // label: '绂佺敤',
- // value: '0'
- // }
- // ]
- // },
+ {
+ type: 'select',
+ dataIndex: 'warehouseId',
+ label: '鐩樼偣浠撳簱',
+ placeholder: '璇烽�夋嫨',
+ defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'warehouseName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/warehouse/select/tenant_warehouse',
+ },
+ },
+ {
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
+ label: '鐗╁搧鍚嶇О',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ options: [],
+ cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
+ },
+ {
+ type: 'select',
+ dataIndex: 'baseGoodsModelsId',
+ label: '瑙勬牸鍨嬪彿',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'modelName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel',
+ },
+ },
+ {
+ type: 'select',
+ dataIndex: 'warehouseId',
+ label: '绫诲瀷',
+ placeholder: '璇烽�夋嫨',
+ defaultValue: '',
+ options: [
+ {
+ label: '鍏ㄩ儴',
+ value: '',
+ },
+ {
+ label: '鐩樼泩',
+ value: '1',
+ },
+ {
+ label: '鐩樹簭',
+ value: '2',
+ },
+ ],
+ },
+ {
+ type: 'select',
+ dataIndex: 'warehouseId',
+ label: '鍑哄叆搴撶被鍨�',
+ placeholder: '璇烽�夋嫨',
+ defaultValue: '',
+ options: [
+ {
+ label: '鍏ㄩ儴',
+ value: '',
+ },
+ {
+ label: '鐩樼泩鍏ュ簱',
+ value: '1',
+ },
+ {
+ label: '鐩樹簭鍑哄簱',
+ value: '2',
+ },
+ ],
+ },
{
type: 'text',
- dataIndex: 'name',
- label: '浠诲姟鍚嶇О',
+ dataIndex: 'businessFormCode',
+ label: '鍗曞彿',
placeholder: '璇疯緭鍏�',
- defaultValue: ''
+ defaultValue: '',
+ },
+ {
+ type: 'text',
+ dataIndex: 'operatorName',
+ label: '鎿嶄綔浜�',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ },
+ {
+ type: 'date-picker',
+ dataIndex: 'startTime',
+ label: '鏃堕棿',
+ defaultValue: '',
+ },
+ {
+ type: 'date-picker',
+ dataIndex: 'endTime',
+ label: '鑷�',
+ defaultValue: '',
},
],
// 鏍戞暟鎹�
treeDataList: [],
// 鎼滅储鏉′欢
- filterFrom: {
- tenantId: null,
- userName: null,
- userPhone: null,
- status: 1
- },
- // 瀵煎叆
- importSetting: {
- dialogTitle: '瀵煎叆',
- dialogShow: false,
- fileSettings: {
- data: {},
- uploadUrl: getBaseUrl()+"/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
- accept: '.xls', // 鏍煎紡
- type: 'text', // 鍥炴樉褰㈠紡
- loading: false // 瀵煎叆鏁堟灉
- },
- /* 妯℃澘涓嬭浇 */
- templateSettings: {
- templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
- },
- onSuccess: null
- },
- editSetting: {
- title: '',
- id: '',
- orgId: '',
- show: false,
- },
+ filterFrom: {},
// 琛ㄦ牸鏁版嵁
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/inventory/list/PdDetail', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
- columnsCtrl: {// 鍒楁帶鍒舵寜閽�
- show: false
+ columnsCtrl: {
+ // 鍒楁帶鍒舵寜閽�
+ show: false,
},
- generalExport: {// 閫氱敤瀵煎嚭鎸夐挳
- show: false
+ generalExport: {
+ // 閫氱敤瀵煎嚭鎸夐挳
+ show: false,
},
// 鑷畾涔夊伐鍏锋潯鎸夐挳
- custom: [
- ]
+ custom: [],
},
// 鍒椾俊鎭�
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: 'warehouseName', align: 'left', width: 140},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 130},
+ {title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 120},
+ {title: '绫诲瀷', field: 'inventoryResultType', align: 'center'},
+ {title: '搴撳瓨鏁伴噺', field: 'initCounts', align: 'left'},
+ {title: '鐩樼偣鏁伴噺', field: 'inventoryCounts', align: 'left'},
+ {title: '寮傚父鏁伴噺', field: 'errorCounts', align: 'left'},
+ {
+ title: '鍑哄叆搴撶被鍨�',
+ field: 'inventoryType',
+ align: 'center',
+ width: 100,
+ formatter: (row) => {
+ return {
+ value: row.inventoryType,
+ type: row.inventoryType && row.inventoryType.includes('鐩樼泩') ? 'success' : 'danger'
+ };
+ },
+ },
+ {title: '鍑哄叆搴撳崟鍙�', field: 'warehouseFormCode', align: 'center', width: 130},
+ {title: '鏈烘瀯', field: 'agencyName', align: 'left', width: 130},
+ {title: '鎿嶄綔浜�', field: 'operatorName', align: 'center', width: 90},
+ {
+ title: '鎿嶄綔鏃堕棿',
+ field: 'operatorTime',
+ align: 'center',
+ width: 160,
+ formatter: (row) => {
+ return {value: row.operatorTime ? DateFormatter.LongToDateTime(row.operatorTime) : '-'};
+ },
+ },
+ ],
// 鎿嶄綔淇℃伅
operation: {
- show: true, // 鏄剧ず鎿嶄綔鍒�
+ show: false, // 鏄剧ず鎿嶄綔鍒�
width: '150', // 鍒楀
- attr: [
- {
- title: '璇︽儏',
- events: (row) => {
- this.showAudit(row);
- },
- },
- ],
+ attr: [],
},
paging: {
show: true, // 鏄剧ず鍒嗛〉
@@ -155,118 +221,39 @@
small: false,
pageNum: 1,
pageSize: 10,
- total: 0
- }
- }
+ total: 0,
+ },
+ },
},
- }
+ };
+ },
+
+ computed: {
+ ...mapGetters(['userInfo']),
},
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)
- },
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
- this.$refs.myTable.search(pageNum)
+ this.$refs.myTable.search(pageNum);
} else {
- this.$refs.myTable.search()
+ this.$refs.myTable.search();
}
},
fifterForm(params) {
- this.filterFrom = Object.assign(this.filterFrom, params)
- this.search(1)
- }
- }
-}
+ this.filterFrom = Object.assign(this.filterFrom, params);
+ this.search(1);
+ },
+ },
+};
</script>
-<style scoped>
-
-</style>
+<style scoped></style>
--
Gitblit v1.9.1