1.修改单据类型弹窗页面样式,缩小弹窗比例

2.修复耗材字典页面编辑无效问题
3.待处理单据查询参数调整,修复无法查询到数据的问题
master
x_z 3 years ago
parent 169a2c9cb0
commit dd9467279a

@ -103,7 +103,7 @@
<el-dialog <el-dialog
title="编辑扫码单据类型" title="编辑扫码单据类型"
:visible.sync="modifyDialogVisible" :visible.sync="modifyDialogVisible"
width="70%" width="50%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="modifyDialogVisible" v-if="modifyDialogVisible"

@ -116,12 +116,15 @@
</div> </div>
</el-col> </el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item" style="margin-top: 6px"> <div class="text item" style="margin-top: 6px">
<el-checkbox v-model="inputQuery.enable"></el-checkbox> <el-checkbox v-model="inputQuery.enable"></el-checkbox>
<el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2"> <el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2">
</el-checkbox> </el-checkbox>
<el-checkbox v-model="inputQuery.secCheckEnable"></el-checkbox> <el-checkbox v-model="inputQuery.secCheckEnable"></el-checkbox>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>

@ -619,7 +619,7 @@
</el-col> </el-col>
<el-col :span="3" class="el-col"> <el-col :span="3" class="el-col">
<el-form-item prop="name"> <el-form-item prop="name">
<el-checkbox :disabled="!checked" v-model="editQuery.isDisable" class="text item itemTag" <el-checkbox :disabled="!checked" v-model="editQuery.disable" class="text item itemTag"
@change="diableChange" @change="diableChange"
>是否禁用 >是否禁用
</el-checkbox> </el-checkbox>
@ -832,15 +832,22 @@ export default {
}, },
diableChange() { diableChange() {
let query = { let query = {
relId: this.editQuery.id relId: this.editQuery.id,
isDisable: this.editQuery.disable
} }
console.log(this.editQuery)
disableUdi(query) disableUdi(query)
.then((response) => { .then((response) => {
if (response.code != 20000) { if (response.code != 20000) {
this.editQuery.isDisable = false; this.editQuery.disable = false;
this.$message.error(response.message); this.$message.error(response.message);
} else {
if (this.editQuery.disable){
this.$message.success("已禁用");
} else {
this.$message.success("已取消禁用");
}
} }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -850,11 +857,17 @@ export default {
onAddSubmit() { onAddSubmit() {
this.checked = false; this.checked = false;
this.relevanceEdit = { this.relevanceEdit = {
id: this.editQuery.id,
diType: this.editQuery.diType,
versionNumber: this.editQuery.versionNumber,
zxxsbzbhsydysl: this.editQuery.zxxsbzbhsydysl, zxxsbzbhsydysl: this.editQuery.zxxsbzbhsydysl,
uuid: this.editQuery.uuid, uuid: this.editQuery.uuid,
isUseDy: this.editQuery.isUseDy, isUseDy: this.editQuery.isUseDy,
thirdId: this.editQuery.thirdId, thirdId: this.editQuery.thirdId,
manufactory: this.editQuery.manufactory manufactory: this.editQuery.manufactory,
isDisable: this.editQuery.isDisable,
sptm: this.editQuery.sptm,
ybbm: this.editQuery.ybbm
}; };
if (this.isUseDyValue === true) { if (this.isUseDyValue === true) {
this.relevanceEdit.isUseDy = 1; this.relevanceEdit.isUseDy = 1;

@ -221,7 +221,7 @@ export default {
id: "", id: "",
mainAction: null, mainAction: null,
status: 1, status: 1,
receiveStatus: 0, receiveStatus: null,
action: null, action: null,
page: 1, page: 1,
limit: 20 limit: 20

@ -776,7 +776,7 @@
}, },
getStockOrderDetailList(row) { getStockOrderDetailList(row) {
if (this.$isNotBlank(row)) { if (this.$isNotBlank(row)) {
this.detailQuery.orderIdFk = row.orderId; this.detailQuery.orderId = row.orderId;
} }
this.detailLoading = true; this.detailLoading = true;
stockOrderDetail(this.detailQuery) stockOrderDetail(this.detailQuery)

Loading…
Cancel
Save