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

Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

Browse Source 
# Conflicts:
#	src/views/collect/IoCreateOrder.vue
#	src/views/collect/IoCreateOrderBlank.vue
20240912_adapter_z
anthonywj 1 year ago
parent 7ae5c17e35 4dc436eaf1
commit 9dbf996f51
3 changed files with 104 additions and 113 deletions
Show Stats Download Patch File Download Diff File

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

@ -366,7 +366,7 @@ export default {
let query = { let query = {
key: val, key: val,
status: 1, status: 1,
invCode: this.formData.invCode, // invCode: this.formData.invCode,
page: 1, page: 1,
limit: 100, limit: 100,
} }

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

@ -8,7 +8,7 @@
> >
<el-card style="margin: 5px;"> <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"> <el-col :span="24" align="right">
<div class="inv-hos-title"> <div class="inv-hos-title">
<span <span
@ -29,17 +29,13 @@
</el-col> </el-col>
</el-row> </el-row>
<el-alert
style="margin-top: 15px;font-size: 20px"
:title="msgTip"
:closable="false"
type="warning">
</el-alert>
<el-alert
style="margin-top: 15px"
:title="msgTip"
:closable="false"
type="warning">
</el-alert>
<div class="scroll-alert" style="margin-top: 15px;">
<div class="scroll-text">{{ msgTip }}</div>
</div>
<el-row> <el-row>
<el-button-group <el-button-group
@ -289,7 +285,7 @@ import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi";
import dialogInvProduct from "@/views/inout/DialogSelectInvProduct"; import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
import {listPage} from "@/api/basic/sysWorkplaceManage"; import {listPage} from "@/api/basic/sysWorkplaceManage";
import {printSplitLabel} from "@/api/collect/splitCreateOrder"; import {printSplitLabel} from "@/api/collect/splitCreateOrder";
import {findInvRemind} from "@/api/inout/splitCode"; import { findInvRemind } from "@/api/inout/splitCode";
export default { export default {
name: "ioCreateOrder", name: "ioCreateOrder",
@ -340,7 +336,7 @@ export default {
data() { data() {
return { return {
isLinkDisabled: false, isLinkDisabled: false,
userInfo: { userInfo:{
inv: this.$store.getters.locInvName, inv: this.$store.getters.locInvName,
deptName: this.$store.getters.locDeptName, deptName: this.$store.getters.locDeptName,
userName: this.$store.getters.name, userName: this.$store.getters.name,
@ -491,7 +487,7 @@ export default {
isSuccess: false, isSuccess: false,
result: "", result: "",
scanResultType: "success", scanResultType: "success",
msgTip: "工位存量提醒：", msgTip: "当前工位存量提醒：",
splitType: null, splitType: null,
}; };
}, },
@ -503,47 +499,47 @@ export default {
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
}, },
methods: { methods: {
changeInvRemind(val) { changeInvRemind(val){
let post = { let post = {
workPlaceCode: val workPlaceCode: val
} }
findInvRemind(post).then((response) => { findInvRemind(post).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.msgTip = response.data this.msgTip = response.data
} else { }else {
} }
}) })
.catch(() => { .catch(() => {
}); });
}, },
successCloseData() { successCloseData(){
let workPlaceCode = this.orderFormData.workPlaceCode let workPlaceCode = this.orderFormData.workPlaceCode
this.orderFormData = { this.orderFormData ={
billNo: null, billNo: null,
corpOrderId: null, corpOrderId: null,
action: null, action: null,
invCode: null, invCode: null,
fromCorp: null, fromCorp: null,
fromCorpName: null, fromCorpName: null,
fromName: null, fromName: null,
fromInvCode: null, fromInvCode: null,
remark: null, remark: null,
fromType: 2, fromType: 2,
errMsg: null, errMsg: null,
checkPreInOrders: null, checkPreInOrders: null,
checkPreInInvCode: null, checkPreInInvCode: null,
checkPreInSpaceCode: null, checkPreInSpaceCode: null,
curSpaceCode: null, curSpaceCode: null,
preSpaceCode: null, preSpaceCode: null,
preCurSpaceCode: null, //单据 preCurSpaceCode: null, //单据
sickerAdNum: null, sickerAdNum: null,
workPlaceCode: null, workPlaceCode: null,
fifoSplit: 1, fifoSplit: 1,
} }
this.orderFormData.workPlaceCode = workPlaceCode this.orderFormData.workPlaceCode = workPlaceCode
this.scanCode = ""; this.scanCode= "";
this.corpOrderIdDisabled = false; this.corpOrderIdDisabled = false;
this.refreshCodesPanel() this.refreshCodesPanel()
}, },
@ -667,9 +663,9 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
// this.$message.success("成功"); // this.$message.success("成功");
const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails(); const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
this.clearOrder(); this.clearOrder();
} else { } else {
// this.$message.error(response.message); // this.$message.error(response.message);
@ -1213,9 +1209,9 @@ export default {
this.retractLoading = false this.retractLoading = false
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("撤回成功！"); this.$message.success("撤回成功！");
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -1241,9 +1237,9 @@ export default {
this.codeLoading = false this.codeLoading = false
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -1256,9 +1252,9 @@ export default {
this.checkLoading = false this.checkLoading = false
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -1319,7 +1315,7 @@ export default {
this.$message.success("提交成功,等待处理，请刷新后查看！"); this.$message.success("提交成功,等待处理，请刷新后查看！");
this.successCloseData() this.successCloseData()
console.log(this.closeDialog()) console.log(this.closeDialog())
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1344,7 +1340,7 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.successCloseData() this.successCloseData()
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1366,7 +1362,7 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.successCloseData() this.successCloseData()
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1409,7 +1405,7 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.successCloseData() this.successCloseData()
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
@ -1434,9 +1430,9 @@ export default {
saveOrderWeb(tQuery).then((response) => { saveOrderWeb(tQuery).then((response) => {
this.saveLoading = false this.saveLoading = false
if (response.code === 20000) { if (response.code === 20000) {
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -1755,7 +1751,7 @@ export default {
}, },
created() { created() {
this.init(); this.init();
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null){
this.corpOrderIdDisabled = true this.corpOrderIdDisabled = true
this.isLinkDisabled = true this.isLinkDisabled = true
this.workplaceId = this.$route.query.workplaceId this.workplaceId = this.$route.query.workplaceId

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

@ -8,7 +8,7 @@
> >
<el-card style="margin: 5px;"> <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"> <el-col :span="24" align="right">
<div class="inv-hos-title"> <div class="inv-hos-title">
<span <span
@ -29,17 +29,13 @@
</el-col> </el-col>
</el-row> </el-row>
<el-alert <el-alert
style="margin-top: 15px" style="margin-top: 15px;font-size: 20px"
:title="msgTip" :title="msgTip"
:closable="false" :closable="false"
type="warning"> type="warning">
</el-alert> </el-alert>
<div class="scroll-alert" style="margin-top: 15px;">
<div class="scroll-text">{{ msgTip }}</div>
</div>
<el-row> <el-row>
<el-button-group <el-button-group
@ -289,7 +285,7 @@ import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi";
import dialogInvProduct from "@/views/inout/DialogSelectInvProduct"; import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
import {listPage} from "@/api/basic/sysWorkplaceManage"; import {listPage} from "@/api/basic/sysWorkplaceManage";
import {printSplitLabel} from "@/api/collect/splitCreateOrder"; import {printSplitLabel} from "@/api/collect/splitCreateOrder";
import {findInvRemind} from "@/api/inout/splitCode"; import { findInvRemind } from "@/api/inout/splitCode";
export default { export default {
name: "ioCreateOrder", name: "ioCreateOrder",
@ -340,7 +336,7 @@ export default {
data() { data() {
return { return {
isLinkDisabled: false, isLinkDisabled: false,
userInfo: { userInfo:{
inv: this.$store.getters.locInvName, inv: this.$store.getters.locInvName,
deptName: this.$store.getters.locDeptName, deptName: this.$store.getters.locDeptName,
userName: this.$store.getters.name, userName: this.$store.getters.name,
@ -491,8 +487,7 @@ export default {
isSuccess: false, isSuccess: false,
result: "", result: "",
scanResultType: "success", scanResultType: "success",
msgTip: "工位存量提醒：", msgTip: "当前工位存量提醒：",
splitType: null,
}; };
}, },
components: { components: {
@ -503,14 +498,14 @@ export default {
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
}, },
methods: { methods: {
changeInvRemind(val) { changeInvRemind(val){
let post = { let post = {
workPlaceCode: val workPlaceCode: val
} }
findInvRemind(post).then((response) => { findInvRemind(post).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.msgTip = response.data this.msgTip = response.data
} else { }else {
} }
}) })
@ -518,9 +513,9 @@ export default {
}); });
}, },
successCloseData() { successCloseData(){
let workPlaceCode = this.orderFormData.workPlaceCode let workPlaceCode = this.orderFormData.workPlaceCode
this.orderFormData = { this.orderFormData ={
billNo: null, billNo: null,
corpOrderId: null, corpOrderId: null,
action: null, action: null,
@ -543,7 +538,7 @@ export default {
fifoSplit: 1, fifoSplit: 1,
} }
this.orderFormData.workPlaceCode = workPlaceCode this.orderFormData.workPlaceCode = workPlaceCode
this.scanCode = ""; this.scanCode= "";
this.corpOrderIdDisabled = false; this.corpOrderIdDisabled = false;
this.refreshCodesPanel() this.refreshCodesPanel()
}, },
@ -667,7 +662,7 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
// this.$message.success("成功"); // this.$message.success("成功");
const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails(); const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
this.clearOrder(); this.clearOrder();
@ -911,7 +906,7 @@ export default {
let query = { let query = {
key: val, key: val,
status: 1, status: 1,
invCode: this.orderFormData.invCode, // invCode: this.orderFormData.invCode,
page: 1, page: 1,
limit: 100, limit: 100,
} }
@ -1213,7 +1208,7 @@ export default {
this.retractLoading = false this.retractLoading = false
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("撤回成功！"); this.$message.success("撤回成功！");
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1241,7 +1236,7 @@ export default {
this.codeLoading = false this.codeLoading = false
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1256,7 +1251,7 @@ export default {
this.checkLoading = false this.checkLoading = false
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1319,7 +1314,7 @@ export default {
this.$message.success("提交成功,等待处理，请刷新后查看！"); this.$message.success("提交成功,等待处理，请刷新后查看！");
this.successCloseData() this.successCloseData()
console.log(this.closeDialog()) console.log(this.closeDialog())
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1344,7 +1339,7 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.successCloseData() this.successCloseData()
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1366,7 +1361,7 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.successCloseData() this.successCloseData()
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1409,7 +1404,7 @@ export default {
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.successCloseData() this.successCloseData()
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
@ -1434,7 +1429,7 @@ export default {
saveOrderWeb(tQuery).then((response) => { saveOrderWeb(tQuery).then((response) => {
this.saveLoading = false this.saveLoading = false
if (response.code === 20000) { if (response.code === 20000) {
if (this.closeDialog != undefined) { if(this.closeDialog != undefined){
this.closeDialog(); this.closeDialog();
} }
} else { } else {
@ -1755,7 +1750,7 @@ export default {
}, },
created() { created() {
this.init(); this.init();
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null){
this.corpOrderIdDisabled = true this.corpOrderIdDisabled = true
this.isLinkDisabled = true this.isLinkDisabled = true
this.workplaceId = this.$route.query.workplaceId this.workplaceId = this.$route.query.workplaceId
@ -1767,31 +1762,31 @@ export default {
<style scoped> <style scoped>
.scroll-alert { /*.scroll-alert {*/
width: 100%; /* 或者你需要的宽度 */ /* width: 100%; !* 或者你需要的宽度 *!*/
overflow: hidden; /* overflow: hidden;*/
white-space: nowrap; /* white-space: nowrap;*/
box-sizing: border-box; /* box-sizing: border-box;*/
/*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*/ /* !*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*!*/
background-color: rgba(255, 235, 59, 0.1); /* 类似于 Element UI 警告框的背景色 */ /* background-color: rgba(255, 235, 59, 0.1); !* 类似于 Element UI 警告框的背景色 *!*/
padding: 10px; /* padding: 10px;*/
position: relative; /* position: relative;*/
} /*}*/
.scroll-text { /*.scroll-text {*/
display: inline-block; /* display: inline-block;*/
padding-left: 100%; /* 初始位置在容器右侧 */ /* padding-left: 100%; !* 初始位置在容器右侧 *!*/
animation: scroll 10s linear infinite; /* 滚动动画 */ /* animation: scroll 10s linear infinite; !* 滚动动画 *!*/
} /*}*/
@keyframes scroll { /*@keyframes scroll {*/
from { /* from {*/
transform: translateX(0); /* transform: translateX(0);*/
} /* }*/
to { /* to {*/
transform: translateX(-100%); /* transform: translateX(-100%);*/
} /* }*/
} /*}*/
.query-form-item { .query-form-item {
margin-right: 5px; margin-right: 5px;

Write Preview
Loading…
Cancel
Save