UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 业务类型窗口名、上货页面获取工位

Browse Source
20240912_adapter_z
chenhc 8 months ago
parent 1785bc97d3
commit c829947bb9
4 changed files with 105 additions and 57 deletions
Show Stats Download Patch File Download Diff File

2
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -260,7 +260,7 @@
<el-dialog
title="选择作业单据类型"
title="选择业务类型"
:visible.sync="selectBusTypeDisabled"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/collect/DealOrderBlank.vue
Unescape Escape View File

@ -260,7 +260,7 @@
<el-dialog
title="选择作业单据类型"
title="选择业务类型"
:visible.sync="selectBusTypeDisabled"
:close-on-click-modal="false"
:close-on-press-escape="false"

1
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -1800,6 +1800,7 @@ export default {
this.corpOrderIdDisabled = true
this.isLinkDisabled = true
this.workplaceId = this.$route.query.workplaceId
this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId)
}
},

157
src/views/collect/IoCreateOrderBlank.vue
Unescape Escape View File

@ -8,7 +8,7 @@
>
<el-card style="margin: 5px;">
<el-row :gutter="0" v-if="isLinkDisabled">
<el-row :gutter="0" v-if="isLinkDisabled">
<el-col :span="24" align="right">
<div class="inv-hos-title">
<span
@ -30,7 +30,7 @@
</el-row>
<el-alert
style="margin-top: 15px;font-size: 20px"
style="margin-top: 15px;margin-bottom: 10px;font-size: 20px;"
:title="msgTip"
:closable="false"
type="warning">
@ -41,18 +41,27 @@
<el-button-group
style="display: flex; margin: 0px 0 15px 0; float: right"
>
<!-- <el-button size="mini" type="primary" @click.native="saveOrder()" :loading="saveLoading"-->
<!-- >草稿保存-->
<!-- </el-button>-->
<!--<el-button size="mini" type="primary" @click.native="saveOrder()" :loading="saveLoading"-->
<!--&gt;草稿保存-->
<!--</el-button>-->
<el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
>选入草稿单据
</el-button>
<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
>草稿保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
v-if="splitType=='out'"
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
>上货完成
</el-button>
<el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
v-if="splitType=='return'"
v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
>退货完成
</el-button>
<el-button size="mini" type="primary" @click.native="printLabel()" :loading="submitLoading"
style="border-radius: 5%;"
>打印二维码
</el-button>
@ -251,6 +260,23 @@
></codesPanel>
</el-tab-pane>
</el-tabs>
<el-dialog
title="选入草稿单据"
:visible.sync="chooseDraftOrderVisible"
width="80%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="chooseDraftOrderVisible"
>
<chooseDraftOrderDialog
:rowData="rowData"
:closeChooseDialog="closeChooseDialog"
:handleChoose="handleChoose"
>
</chooseDraftOrderDialog>
</el-dialog>
</div>
</template>
@ -285,7 +311,8 @@ import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi";
import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
import {printSplitLabel} from "@/api/collect/splitCreateOrder";
import { findInvRemind } from "@/api/inout/splitCode";
import {findInvRemind} from "@/api/inout/splitCode";
import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
export default {
name: "ioCreateOrder",
@ -336,7 +363,7 @@ export default {
data() {
return {
isLinkDisabled: false,
userInfo:{
userInfo: {
inv: this.$store.getters.locInvName,
deptName: this.$store.getters.locDeptName,
userName: this.$store.getters.name,
@ -479,6 +506,7 @@ export default {
//库存选入
selectInvProductVisible: false,
chooseDraftOrderVisible: false,
invQueryData: {
invCode: null,
},
@ -488,6 +516,8 @@ export default {
result: "",
scanResultType: "success",
msgTip: "当前工位存量提醒：",
splitType: null,
rowData: {}
};
},
components: {
@ -495,17 +525,17 @@ export default {
codeDetailPanel,
editCodeDialog,
DialogCreateOrderSelect,
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct,chooseDraftOrderDialog
},
methods: {
changeInvRemind(val){
changeInvRemind(val) {
let post = {
workPlaceCode: val
}
findInvRemind(post).then((response) => {
if (response.code === 20000) {
this.msgTip = response.data
}else {
} else {
}
})
@ -513,9 +543,9 @@ export default {
});
},
successCloseData(){
successCloseData() {
let workPlaceCode = this.orderFormData.workPlaceCode
this.orderFormData ={
this.orderFormData = {
billNo: null,
corpOrderId: null,
action: null,
@ -538,7 +568,7 @@ export default {
fifoSplit: 1,
}
this.orderFormData.workPlaceCode = workPlaceCode
this.scanCode= "";
this.scanCode = "";
this.corpOrderIdDisabled = false;
this.refreshCodesPanel()
},
@ -662,7 +692,7 @@ export default {
if (response.code === 20000) {
// this.$message.success("成功");
const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
if(this.closeDialog != undefined){
if (this.closeDialog != undefined) {
this.closeDialog();
}
this.clearOrder();
@ -944,7 +974,6 @@ export default {
}
this.originCode = "";
this.sictomText = "";
this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
this.codeFormData.batchNo = "";
this.codeFormData.produceDate = "";
this.codeFormData.expireDate = "";
@ -1208,7 +1237,7 @@ export default {
this.retractLoading = false
if (response.code == 20000) {
this.$message.success("撤回成功！");
if(this.closeDialog != undefined){
if (this.closeDialog != undefined) {
this.closeDialog();
}
} else {
@ -1236,7 +1265,7 @@ export default {
this.codeLoading = false
if (response.code === 20000) {
this.$message.success("提交成功");
if(this.closeDialog != undefined){
if (this.closeDialog != undefined) {
this.closeDialog();
}
} else {
@ -1251,7 +1280,7 @@ export default {
this.checkLoading = false
if (response.code === 20000) {
this.$message.success("提交成功");
if(this.closeDialog != undefined){
if (this.closeDialog != undefined) {
this.closeDialog();
}
} else {
@ -1314,7 +1343,7 @@ export default {
this.$message.success("提交成功,等待处理，请刷新后查看！");
this.successCloseData()
console.log(this.closeDialog())
if(this.closeDialog != undefined){
if (this.closeDialog != undefined) {
this.closeDialog();
}
} else {
@ -1339,7 +1368,7 @@ export default {
if (response.code === 20000) {
this.$message.success("提交成功");
this.successCloseData()
if(this.closeDialog != undefined){
if (this.closeDialog != undefined) {
this.closeDialog();
}
} else {
@ -1361,7 +1390,7 @@ export default {
if (response.code === 20000) {
this.$message.success("提交成功");
this.successCloseData()
if(this.closeDialog != undefined){
if (this.closeDialog != undefined) {
this.closeDialog();
}
} else {
@ -1404,7 +1433,7 @@ export default {
if (response.code === 20000) {
this.$message.success("提交成功");
this.successCloseData()
if(this.closeDialog != undefined){
if (this.closeDialog != undefined) {
this.closeDialog();
}
@ -1414,11 +1443,29 @@ export default {
});
}
},
saveOrder() {
//选入草稿单据
chooseDraftOrder(){
if (this.$isBlank(this.orderFormData.workPlaceCode)) {
this.$message.warning("请选择工位！");
return;
}
this.rowData.workPlaceCode = this.orderFormData.workPlaceCode
this.rowData.fifoSplit = this.orderFormData.fifoSplit
this.chooseDraftOrderVisible = true
},
closeChooseDialog(){
this.chooseDraftOrderVisible = false
},
handleChoose(billNo){
this.orderFormData.billNo = billNo
this.refreshCodesPanel();
},
draftOrder() {
let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData))
);
tQuery.billNo = this.orderFormData.billNo;
tQuery.orderType = 2;
console.log("tQuery:");
console.log(tQuery);
if (this.orderFormData.billNo == null) {
@ -1426,12 +1473,12 @@ export default {
return;
}
this.saveLoading = true
saveOrderWeb(tQuery).then((response) => {
this.saveLoading = false
if (response.code === 20000) {
if(this.closeDialog != undefined){
this.closeDialog();
}
this.$message.success("保存成功")
this.successCloseData()
} else {
this.$message.error(response.message);
}
@ -1439,7 +1486,6 @@ export default {
this.saveLoading = false
});
},
// 刷新表单
resetForm() {
if (this.$refs["dataForm"]) {
@ -1750,10 +1796,11 @@ export default {
},
created() {
this.init();
if (this.$route.query.workplaceId != null){
if (this.$route.query.workplaceId != null) {
this.corpOrderIdDisabled = true
this.isLinkDisabled = true
this.workplaceId = this.$route.query.workplaceId
this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId)
}
},
@ -1762,31 +1809,31 @@ export default {
<style scoped>
/*.scroll-alert {*/
/* width: 100%; !* 或者你需要的宽度 *!*/
/* overflow: hidden;*/
/* white-space: nowrap;*/
/* box-sizing: border-box;*/
/* !*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*!*/
/* background-color: rgba(255, 235, 59, 0.1); !* 类似于 Element UI 警告框的背景色 *!*/
/* padding: 10px;*/
/* position: relative;*/
/*}*/
/*.scroll-text {*/
/* display: inline-block;*/
/* padding-left: 100%; !* 初始位置在容器右侧 *!*/
/* animation: scroll 10s linear infinite; !* 滚动动画 *!*/
/*}*/
/*@keyframes scroll {*/
/* from {*/
/* transform: translateX(0);*/
/* }*/
/* to {*/
/* transform: translateX(-100%);*/
/* }*/
/*}*/
.scroll-alert {
width: 100%; /* 或者你需要的宽度 */
overflow: hidden;
white-space: nowrap;
box-sizing: border-box;
/*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*/
background-color: rgba(255, 235, 59, 0.1); /* 类似于 Element UI 警告框的背景色 */
padding: 10px;
position: relative;
}
.scroll-text {
display: inline-block;
padding-left: 100%; /* 初始位置在容器右侧 */
animation: scroll 10s linear infinite; /* 滚动动画 */
}
@keyframes scroll {
from {
transform: translateX(0);
}
to {
transform: translateX(-100%);
}
}
.query-form-item {
margin-right: 5px;

Write Preview
Loading…
Cancel
Save