1.部分弹窗添加遮罩层,防止误操作关闭窗口

2.修改单据查询往来信息逻辑,精确数据查询范围
master
x_z 3 years ago
parent fa59021fa6
commit ef482a470b

@ -31,3 +31,16 @@ export function insertBussinessType(query) {
data: query data: query
}); });
} }
/**
* 查询单据往来单位信息类型
* @param query
* @returns {*}
*/
export function getCorpType(query) {
return axios({
url: "/udims/basic/busType/getCorpType",
method: 'get',
params: query,
});
}

@ -129,7 +129,13 @@
:total="total" :total="total"
></el-pagination> ></el-pagination>
<el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%"> <el-dialog
title="错误信息"
:visible.sync="dialogVisible"
width="30%"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<span>{{ errorDetail }}</span> <span>{{ errorDetail }}</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false" <el-button type="primary" @click="dialogVisible = false"
@ -149,13 +155,10 @@
<el-input v-model="unitquery.key" placeholder="搜索" clearable></el-input> <el-input v-model="unitquery.key" placeholder="搜索" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button-group>
type="primary" <el-button type="primary" icon="el-icon-refresh" @click="resetUnitQuery()"></el-button>
icon="search" <el-button type="primary" icon="search" @click.native.stop="getUnitList()">查询</el-button>
@click.native.stop="getUnitList(1)" </el-button-group>
>查询
</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -203,6 +206,8 @@
:visible.sync="codeDetailVisible" :visible.sync="codeDetailVisible"
width="80%" width="80%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
> >
<codeDetail <codeDetail
:idQuery="idQuery" :idQuery="idQuery"
@ -223,6 +228,7 @@ import {unitListBykey} from "../../api/warehouse/unit";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import codeDetail from "./errorCode"; import codeDetail from "./errorCode";
import {getBusTypeByUser} from "../../api/warehouse/BusRole"; import {getBusTypeByUser} from "../../api/warehouse/BusRole";
import {getCorpType} from "@/api/basic/bussinessType";
const formJson = { const formJson = {
site_id: "", site_id: "",
@ -326,12 +332,19 @@ export default {
this.curIndex = row.id; this.curIndex = row.id;
this.dialogTableVisible = true; this.dialogTableVisible = true;
this.curOrderId = row.orderId; this.curOrderId = row.orderId;
this.unitquery = { getCorpType({action: row.action}).then((res) => {
key: "", if (res.code === 20000) {
page: 1, this.unitquery = {
limit: 10 key: "",
} corpType: res.data,
this.getUnitList(); page: 1,
limit: 10
}
this.getUnitList();
} else {
this.$message.error("查询往来单位错误");
}
})
}, },
closeDetailDialog(val) { closeDetailDialog(val) {
this.codeDetailVisible = false; this.codeDetailVisible = false;
@ -343,6 +356,10 @@ export default {
}).catch((error) => { }).catch((error) => {
}); });
}, },
resetUnitQuery() {
this.unitlist = [];
this.unitquery = {key: "", page: 1, limit: 20};
},
getUnitList(page) { getUnitList(page) {
this.loading = true; this.loading = true;
if (page != null) { if (page != null) {

@ -111,7 +111,13 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%"> <el-dialog
title="错误信息"
:visible.sync="dialogVisible"
width="30%"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<span>{{ errorDetail }}</span> <span>{{ errorDetail }}</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false" <el-button type="primary" @click="dialogVisible = false"
@ -123,19 +129,18 @@
title="选择往来单位" title="选择往来单位"
:visible.sync="dialogTableVisible" :visible.sync="dialogTableVisible"
width="70%" width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
> >
<el-form :inline="true" :model="unitquery" class="query-form" size="mini"> <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="unitquery.key" placeholder="搜索"></el-input> <el-input v-model="unitquery.key" placeholder="搜索" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button-group>
type="primary" <el-button type="primary" icon="el-icon-refresh" @click="resetUnitQuery()"></el-button>
icon="search" <el-button type="primary" icon="search" @click.native.stop="getUnitList()">查询</el-button>
@click.native.stop="getUnitList()" </el-button-group>
>查询
</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -179,6 +184,8 @@
:visible.sync="codeDetailVisible" :visible.sync="codeDetailVisible"
width="80%" width="80%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
> >
<codeDetail <codeDetail
:idQuery="idQuery" :idQuery="idQuery"
@ -206,6 +213,7 @@ import {getBusTypeByUser} from "../../api/warehouse/BusRole";
import {unitListBykey} from "../../api/warehouse/unit"; import {unitListBykey} from "../../api/warehouse/unit";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import codeDetail from "./errorCode"; import codeDetail from "./errorCode";
import {getCorpType} from "@/api/basic/bussinessType";
const formJson = { const formJson = {
site_id: "", site_id: "",
@ -298,16 +306,27 @@ export default {
this.curIndex = row.id; this.curIndex = row.id;
this.dialogTableVisible = true; this.dialogTableVisible = true;
this.curOrderId = row.orderId; this.curOrderId = row.orderId;
this.unitquery = { getCorpType({action: row.action}).then((res) => {
key: "", if (res.code === 20000) {
page: 1, this.unitquery = {
limit: 10 key: "",
} corpType: res.data,
this.getUnitList(); page: 1,
limit: 10
}
this.getUnitList();
} else {
this.$message.error("查询往来单位错误");
}
})
}, },
closeDetailDialog(val) { closeDetailDialog(val) {
this.codeDetailVisible = false; this.codeDetailVisible = false;
}, },
resetUnitQuery() {
this.unitlist = [];
this.unitquery = {key: "", page: 1, limit: 20};
},
getUnitList() { getUnitList() {
this.loading = true; this.loading = true;
unitListBykey(this.unitquery) unitListBykey(this.unitquery)

@ -285,6 +285,8 @@
:visible.sync="codeDetailVisible" :visible.sync="codeDetailVisible"
width="80%" width="80%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
> >
<codeDetail <codeDetail
:idQuery="idQuery" :idQuery="idQuery"

@ -420,6 +420,8 @@
:visible.sync="codeDetailVisible" :visible.sync="codeDetailVisible"
width="80%" width="80%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
> >
<codeDetail <codeDetail
:idQuery="idQuery" :idQuery="idQuery"

Loading…
Cancel
Save