diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 02f27e04..e4c53f00 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -69,47 +69,48 @@ </el-col> </el-row> <el-row> + <el-col :span="11"> - <el-form-item prop="action" label="单据类型:"> + <el-form-item prop="invCode" label="当前仓库:"> <el-select - v-model="orderFormData.action" - placeholder="请选择单据类型" - :disabled="corpOrderIdDisabled" + v-model="orderFormData.invCode" + placeholder="当前仓库" style="width: 90%" - @change="actionChange" + :disabled="corpOrderIdDisabled" + @change="changeInv" + filterable > <el-option - v-for="item in busTypeOptions" + v-for="item in curInvOptions" :key="item.name" :label="item.name" - :value="item.action" + :value="item.code" > <span style="float: left">{{ item.name }}</span> + <span style="float: right; color: #8492a6; font-size: 13px">{{ + item.warehouseName + }}</span> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="11"> - <el-form-item prop="invCode" label="当前仓库:"> + <el-form-item prop="action" label="单据类型:"> <el-select - v-model="orderFormData.invCode" - placeholder="当前仓库" - style="width: 90%" + v-model="orderFormData.action" + placeholder="请选择单据类型" :disabled="corpOrderIdDisabled" - @change="changeInv" - filterable + style="width: 90%" + @change="actionChange" > <el-option - v-for="item in curInvOptions" + v-for="item in busTypeOptions" :key="item.name" :label="item.name" - :value="item.code" + :value="item.action" > <span style="float: left">{{ item.name }}</span> - <span style="float: right; color: #8492a6; font-size: 13px">{{ - item.warehouseName - }}</span> </el-option> </el-select> </el-form-item> @@ -797,7 +798,11 @@ export default { cQuery.corpType = 2; } else if (this.curAction.corpType == 0) { cQuery.corpType = 2; - } else return; + } else if (this.curAction.corpType == 1) { + cQuery.corpType = 1; + cQuery.outType = 2; + } else + return; getBasicUnitMaintains(cQuery) .then((response) => { this.loading = false; @@ -817,7 +822,10 @@ export default { if ((this.curAction.checkEnable && this.curAction.checkWebNew != 0) || this.viewType == 1) { //单据类型需要一次校验 或 单据类型为1,显示业务单据页面 this.bizShow = true; - } else this.bizShow = false; + } else { + this.bizShow = false; + } + if ( this.curAction.corpType == 0 || this.curAction.corpType == 2 || @@ -1183,7 +1191,7 @@ export default { }, submit(val) { - if(this.$isBlank(this.orderFormData.action)){ + if (this.$isBlank(this.orderFormData.action)) { this.$message.warning("单据类型不能为空!"); return }