基础数据bug修改

ywj_dev
郑明梁 2 years ago
parent f723cf41ef
commit bc45eefeb5

@ -80,10 +80,6 @@
<el-button icon="el-icon-view" type="primary" @click="hideThrSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideThrSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="searchErpList"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchErpList"></el-button>
<el-button type="primary" icon="el-icon-search" @click="getSuperSeaech" size="mini"
>国家同步库查询
</el-button
>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
@ -195,6 +191,10 @@
<el-button icon="el-icon-view" type="primary" @click="hideDiSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideDiSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onDiReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onDiReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="serchList"></el-button> <el-button type="primary" icon="el-icon-search" @click="serchList"></el-button>
<el-button type="primary" icon="el-icon-search" @click="getSuperSeaech" size="mini"
>国家同步库查询
</el-button
>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>

@ -1222,8 +1222,8 @@ export default {
nameCode: null nameCode: null
}, },
groupBuyMap: { groupBuyMap: {
true:"集", true:"",
false:"非集" false:"非"
}, },
dispatchMap: { dispatchMap: {
true:"可配送", true:"可配送",

@ -150,7 +150,7 @@ export default {
entrustInv: [ entrustInv: [
{required: true, message: "请输入委托验收人仓库", trigger: "blur"} {required: true, message: "请输入委托验收人仓库", trigger: "blur"}
], ],
entrustUser: [ curInv: [
{required: true, message: "请输入委托验收人", trigger: "blur"} {required: true, message: "请输入委托验收人", trigger: "blur"}
], ],
}, },

@ -151,7 +151,8 @@ export default {
1: "耗材领用", 1: "耗材领用",
2: "产品申购", 2: "产品申购",
3: "采购计划", 3: "采购计划",
4: "盘点转单" 4: "盘点转单",
5: "采购订单"
}, },
orderStatus: { orderStatus: {
1: "草稿", 1: "草稿",
@ -223,10 +224,10 @@ export default {
this.$message.error("单据类型代码不能为空!"); this.$message.error("单据类型代码不能为空!");
return; return;
} }
if (isBlank(this.inputQuery.targetAction)) { // if (isBlank(this.inputQuery.targetAction)) {
this.$message.error("目标单据类型不能为空!") // this.$message.error("")
return; // return;
} // }
if (isBlank(this.inputQuery.enable)) { if (isBlank(this.inputQuery.enable)) {
this.$message.error("请选择启用状态!"); this.$message.error("请选择启用状态!");
return; return;

@ -215,6 +215,10 @@ export default {
this.$message.error("目标出入库单与目标业务单不能同时为空!") this.$message.error("目标出入库单与目标业务单不能同时为空!")
return; return;
} }
if(isBlank(this.inputQuery.supplementAll)){
this.$message.error("补单方式不能为空!")
return;
}
// if (isBlank(this.inputQuery.invCode)) { // if (isBlank(this.inputQuery.invCode)) {
// this.$message.error("") // this.$message.error("")
// return; // return;

@ -108,7 +108,7 @@
<el-divider content-position="left">生成业务单</el-divider> <el-divider content-position="left">生成业务单</el-divider>
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="目标业务单" prop="action"> <el-form-item label="目标业务单">
<el-select v-model="inputQuery.targetBusAction" placeholder="目标业务单" clearable size="small" <el-select v-model="inputQuery.targetBusAction" placeholder="目标业务单" clearable size="small"
style="width: 90%"> style="width: 90%">
<el-option <el-option
@ -202,6 +202,13 @@ export default {
trigger: "blur" trigger: "blur"
} }
], ],
supplementAll: [
{
required: true,
message: "补单方式不能为空",
trigger: "blur"
}
],
// invCode: [ // invCode: [
// { // {
// required: true, // required: true,
@ -300,8 +307,8 @@ export default {
created() { created() {
if (this.inputQuery.originAction == null) { if (this.inputQuery.originAction == null) {
this.isAdd = true; this.isAdd = true;
// this.inputQuery.auditStatus = 2; this.inputQuery.auditStatus = 1;
// this.inputQuery.busAuditStatus = 2; this.inputQuery.busAuditStatus = 1;
} else { } else {
this.getTargetBusType(); this.getTargetBusType();
} }

Loading…
Cancel
Save