UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11/20 库存明细优化 盘点增加loading

Browse Source
20240912_adapter
wangwei 5 months ago
parent ce4853e6d5
commit 30d31ca372
5 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File

8
src/views/drugInventory/InvProducts.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px" > <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px" >
<!-- <el-row> <!-- <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="扫码查询:"> <el-form-item label="扫码查询:">
@ -143,6 +143,7 @@
</el-row> --> </el-row> -->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <template v-for="(item, index) in queryList" >
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -208,12 +209,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -419,7 +421,7 @@ export default {
name: "InvProducts", name: "InvProducts",
data() { data() {
return { return {
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
nameCode: null, nameCode: null,
cpmctymc: null, cpmctymc: null,

8
src/views/inventory/InvPreProducts.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="18">--> <!-- <el-col :span="18">-->
<!-- <el-form-item class="query-form-item" label="扫码查询:">--> <!-- <el-form-item class="query-form-item" label="扫码查询:">-->
@ -143,6 +143,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <template v-for="(item, index) in queryList" >
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -208,12 +209,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -404,7 +406,7 @@ export default {
name: "InvPreProducts", name: "InvPreProducts",
data() { data() {
return { return {
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
nameCode: null, nameCode: null,
cpmctymc: null, cpmctymc: null,

8
src/views/inventory/InvProducts.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px" > <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px" >
<!-- <el-row> <!-- <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="扫码查询:"> <el-form-item label="扫码查询:">
@ -143,6 +143,7 @@
</el-row> --> </el-row> -->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <template v-for="(item, index) in queryList" >
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -208,12 +209,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -419,7 +421,7 @@ export default {
name: "InvProducts", name: "InvProducts",
data() { data() {
return { return {
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
nameCode: null, nameCode: null,
cpmctymc: null, cpmctymc: null,

8
src/views/inventory/InvSupPreInProducts.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="18">--> <!-- <el-col :span="18">-->
<!-- <el-form-item class="query-form-item" label="扫码查询:">--> <!-- <el-form-item class="query-form-item" label="扫码查询:">-->
@ -143,6 +143,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <template v-for="(item, index) in queryList" >
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -208,12 +209,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -396,7 +398,7 @@ export default {
name: "InvPreProducts", name: "InvPreProducts",
data() { data() {
return { return {
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
nameCode: null, nameCode: null,
cpmctymc: null, cpmctymc: null,

25
src/views/inventory/count/InvCountOrderAudit.vue
Unescape Escape View File

@ -603,30 +603,55 @@ export default {
closeOnClickModal: false,//点击遮罩关闭弹窗 closeOnClickModal: false,//点击遮罩关闭弹窗
distinguishCancelAndClose: true,//区分取消与关闭 distinguishCancelAndClose: true,//区分取消与关闭
}).then(() => { }).then(() => {
// 显示加载状态
const loading = _this.$loading({
lock: true,
text: '审核中...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
params.status = 2; //审核通过 params.status = 2; //审核通过
updateCountOrderStatus(params).then((res) => { updateCountOrderStatus(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
_this.$message.success("审核通过"); _this.$message.success("审核通过");
_this.getList(); _this.getList();
_this.onRestDetail(); _this.onRestDetail();
// 关闭加载状态
loading.close();
} else { } else {
// 关闭加载状态
loading.close();
_this.$message.error(res.message); _this.$message.error(res.message);
} }
}).catch(() => { }).catch(() => {
// 关闭加载状态
loading.close();
}); });
}).catch((action) => { }).catch((action) => {
if (action === 'cancel') { if (action === 'cancel') {
//驳回 //驳回
params.status = 0; //驳回到上一个状态 params.status = 0; //驳回到上一个状态
const loading = _this.$loading({
lock: true,
text: '驳回中...',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
updateCountOrderStatus(params).then((res) => { updateCountOrderStatus(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
_this.$message.warning("已驳回"); _this.$message.warning("已驳回");
_this.getList(); _this.getList();
_this.onRestDetail(); _this.onRestDetail();
// 关闭加载状态
loading.close();
} else { } else {
// 关闭加载状态
loading.close();
_this.$message.error(res.message); _this.$message.error(res.message);
} }
}).catch(() => { }).catch(() => {
// 关闭加载状态
loading.close();
}); });
} else { } else {
//关闭弹窗 //关闭弹窗

Write Preview
Loading…
Cancel
Save