UDI
/
udims-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修复部分页面查询字段与后端不对应的问题

Browse Source 
2.弹窗统一添加遮罩层，避免点击空白处误操作关闭弹窗问题
master
x_z 3 years ago
parent 02a6436900
commit f1f47e571a
16 changed files with 119 additions and 31 deletions
Show Stats Download Patch File Download Diff File

7
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -434,7 +434,12 @@
</div>
</el-dialog>
<el-dialog title="关联仓库" :visible.sync="thrWareHouseVisible">
<el-dialog
title="关联仓库"
:visible.sync="thrWareHouseVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-table
:data="thrWarehouseData"
style="width: 100%;margin-top: 10px;"

2
src/views/inventory/InvPreProductsDetail.vue
Unescape Escape View File

@ -48,6 +48,8 @@
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="getCodeList"
>查询
</el-button

4
src/views/userManage/admin/authAdmin.vue
Unescape Escape View File

@ -176,7 +176,7 @@
<el-radio :label="1">正常</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="showRole" label="角色">
<!--<el-form-item v-if="showRole" label="角色">
<el-checkbox-group v-model="formData.roles">
<el-checkbox
v-for="item in roles"
@ -187,7 +187,7 @@
</el-checkbox
>
</el-checkbox-group>
</el-form-item>
</el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm" size="small">取消</el-button>

3
src/views/userManage/param/systemPDFModule.vue
Unescape Escape View File

@ -794,7 +794,8 @@ export default {
if (this.selectTemplateQuery.type == 1) {
let query = {
id: this.selectTemplateQuery.busRlId,
templateId: data.templateId
templateId: data.templateId,
customerId: store.getters.customerId
};
updateDetailRel(query)
.then(response => {

2
src/views/userManage/param/systemPDFTemplate.vue
Unescape Escape View File

@ -323,6 +323,8 @@
title="字段说明"
:visible.sync="centerDialogVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
center>
<span style="white-space: pre-wrap;">{{ currentRow }}</span>
<span slot="footer" class="dialog-footer">

9
src/views/warehouse/AdditionalOrder.vue
Unescape Escape View File

@ -138,7 +138,14 @@
</el-table-column>
</el-table>
</el-card>
<el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%" :append-to-body="true">
<el-dialog
title="错误信息"
:visible.sync="dialogVisible"
width="30%"
:append-to-body="true"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<span>{{ errorDetail }}</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false"

2
src/views/warehouse/DialogSelectRl.vue
Unescape Escape View File

@ -69,8 +69,8 @@
title="产品信息编辑"
:visible.sync="editDialogVisible"
:close-on-click-modal="false"
append-to-body
:close-on-press-escape="false"
append-to-body
width="70%"
v-if="editDialogVisible"
>

6
src/views/warehouse/InvProducts.vue
Unescape Escape View File

@ -7,7 +7,7 @@
<el-input v-model="filterQuery.nameCode" placeholder="最小销售产品标识" :clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" :clearable="true"></el-input>
<el-input v-model="filterQuery.productsName" placeholder="产品名称" :clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号" :clearable="true"></el-input>
@ -116,7 +116,7 @@ export default {
data() {
return {
filterQuery: {
cpmctymc: null,
productsName: null,
nameCode: null,
relIdFk: null,
batchNo: null,
@ -158,7 +158,7 @@ export default {
path: ""
});
this.filterQuery = {
cpmctymc: null,
productsName: null,
nameCode: null,
relIdFk: null,
batchNo: null,

4
src/views/warehouse/addOrder.vue
Unescape Escape View File

@ -208,6 +208,8 @@
v-if="dialogTableVisible"
width="70%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<DialogSelectUnit
:codeId="curRow"
@ -221,6 +223,8 @@
width="80%"
v-if="selectRlVisible"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<selectRlDialog
:curRow="curRow"

16
src/views/warehouse/codeReplace.vue
Unescape Escape View File

@ -7,7 +7,8 @@
<el-form-item>
<el-button-group>
<el-button type="primary" icon="search" @click="getCodeList"
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="search"
>查询
</el-button
>
@ -65,6 +66,8 @@
:visible.sync="replaceVisible"
:append-to-body="true"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
@ -191,7 +194,6 @@ export default {
return {
query: {
code: "",
corpOrderId: "",
page: 1,
limit: 20,
},
@ -229,12 +231,8 @@ export default {
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.query = {
code: "",
corpOrderId: "",
page: 1,
limit: 20,
};
@ -255,7 +253,10 @@ export default {
this.query.page = val;
this.getCodeList();
},
search() {
this.query.page = 1;
this.getCodeList();
},
getCodeList() {
this.loading = true;
this.query.orderId = this.idQuery.id;
@ -370,7 +371,6 @@ export default {
this.query = Object.assign(this.query, query);
this.query.limit = parseInt(this.query.limit);
this.query.corpOrderId = query.id;
// 加载表格数据
this.getCodeList();

4
src/views/warehouse/errorCode.vue
Unescape Escape View File

@ -79,6 +79,8 @@
v-if="dialogTableVisible"
width="70%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<DialogSelectUnit
:codeId="curRow"
@ -92,6 +94,8 @@
width="80%"
v-if="selectRlVisible"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<selectRlDialog
:curRow="curRow"

14
src/views/warehouse/ioFinishOrder.vue
Unescape Escape View File

@ -239,6 +239,8 @@
title="选择往来单位"
:visible.sync="dialogTableVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item">
@ -279,6 +281,8 @@
:visible.sync="addDialogVisible"
width="80%"
v-if="addDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<selectErpOrder
v-on:closeManuDialog="closeManuDialog"
@ -291,6 +295,8 @@
:visible.sync="codeDetailVisible"
width="80%"
v-if="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<codeDetail
:idQuery="idQuery"
@ -298,7 +304,13 @@
></codeDetail>
</el-dialog>
<el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
<el-dialog
title="校验信息"
:visible.sync="errDialogVisible"
width="30%"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<span>{{ errorDetail }}</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="errDialogVisible = false"

10
src/views/warehouse/ioUdiTrace.vue
Unescape Escape View File

@ -145,6 +145,8 @@
:visible.sync="codeDetailVisible"
width="80%"
v-if="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<codeDetail
:idQuery="idQuery"
@ -152,7 +154,13 @@
></codeDetail>
</el-dialog>
<el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
<el-dialog
title="校验信息"
:visible.sync="errDialogVisible"
width="30%"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<span>{{ errorDetail }}</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="errDialogVisible = false"

26
src/views/warehouse/stockOrderDelSearch.vue
Unescape Escape View File

@ -27,7 +27,8 @@
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
@ -223,7 +224,12 @@
</el-card>
<el-dialog v-bind:width="'25%'" :visible.sync="salesListNoFormVisible">
<el-dialog
v-bind:width="'25%'"
:visible.sync="salesListNoFormVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :model="batchForm">
<label></label>
<el-form-item label="销售清单：" :label-width="formLabelWidth">
@ -236,7 +242,12 @@
</div>
</el-dialog>
<el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible">
<el-dialog
v-bind:width="'25%'"
:visible.sync="firstSalesInvNoFormVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :model="batchForm">
<label></label>
<el-form-item label="销售发票第一票：" :label-width="formLabelWidth">
@ -249,7 +260,12 @@
</div>
</el-dialog>
<el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible">
<el-dialog
v-bind:width="'25%'"
:visible.sync="secSalesInvNoFormVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :model="batchForm">
<label></label>
<el-form-item label="销售发票第二票：" :label-width="formLabelWidth">
@ -613,7 +629,7 @@ export default {
},
printOrder(row) {
let tQuery = {
queryId: row.orderId,
orderId: row.orderId,
moduleId: 4
};
this.loading = true;

11
src/views/warehouse/stockOrderDelete.vue
Unescape Escape View File

@ -10,7 +10,8 @@
>
<el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-input style="width: 300px" v-model="query.orderId" placeholder="单据号" clearable></el-input>
<el-input style="width: 300px" v-model="query.orderId" placeholder="单据号"
clearable></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
@ -170,7 +171,13 @@
></codeReplace>
</el-dialog>
<el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
<el-dialog
title="校验信息"
:visible.sync="errDialogVisible"
width="30%"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<span>{{ errorDetail }}</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="errDialogVisible = false">关 闭</el-button>

30
src/views/warehouse/stockOrderSearch.vue
Unescape Escape View File

@ -28,7 +28,8 @@
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
@ -212,7 +213,12 @@
</el-pagination>
</el-card>
<el-dialog v-bind:width="'25%'" :visible.sync="salesListNoFormVisible">
<el-dialog
v-bind:width="'25%'"
:visible.sync="salesListNoFormVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :model="batchForm">
<label></label>
<el-form-item label="销售清单：" :label-width="formLabelWidth">
@ -225,7 +231,12 @@
</div>
</el-dialog>
<el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible">
<el-dialog
v-bind:width="'25%'"
:visible.sync="firstSalesInvNoFormVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :model="batchForm">
<label></label>
<el-form-item label="销售发票第一票：" :label-width="formLabelWidth">
@ -238,7 +249,12 @@
</div>
</el-dialog>
<el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible">
<el-dialog
v-bind:width="'25%'"
:visible.sync="secSalesInvNoFormVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :model="batchForm">
<label></label>
<el-form-item label="销售发票第二票：" :label-width="formLabelWidth">
@ -293,6 +309,8 @@
width="60%"
v-if="distributionVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<stockOrderDistribution
:closeDialog="closeDialog"
@ -306,6 +324,8 @@
:before-close="hideDetailForm"
width="85%"
top="5vh"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :model="detailFormData" :rules="detailFormRules" ref="dataForm">
@ -732,7 +752,7 @@ export default {
},
printOrder(row) {
let tQuery = {
queryId: row.id,
orderId: row.orderId,
moduleId: 4
};
this.loading = true;

Write Preview
Loading…
Cancel
Save