|
|
|
|
@ -3,12 +3,12 @@
|
|
|
|
|
|
|
|
|
|
<el-card v-if="!changeViewDisabled">
|
|
|
|
|
|
|
|
|
|
<el-alert
|
|
|
|
|
style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
|
|
|
|
|
:title="msgTip"
|
|
|
|
|
:closable="false"
|
|
|
|
|
type="warning">
|
|
|
|
|
</el-alert>
|
|
|
|
|
<!-- <el-alert-->
|
|
|
|
|
<!-- style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"-->
|
|
|
|
|
<!-- :title="msgTip"-->
|
|
|
|
|
<!-- :closable="false"-->
|
|
|
|
|
<!-- type="warning">-->
|
|
|
|
|
<!-- </el-alert>-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
|
|
|
|
|
@ -225,12 +225,12 @@
|
|
|
|
|
|
|
|
|
|
<el-card v-if="changeViewDisabled">
|
|
|
|
|
|
|
|
|
|
<el-alert
|
|
|
|
|
style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
|
|
|
|
|
:title="msgTip"
|
|
|
|
|
:closable="false"
|
|
|
|
|
type="warning">
|
|
|
|
|
</el-alert>
|
|
|
|
|
<!-- <el-alert-->
|
|
|
|
|
<!-- style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"-->
|
|
|
|
|
<!-- :title="msgTip"-->
|
|
|
|
|
<!-- :closable="false"-->
|
|
|
|
|
<!-- type="warning">-->
|
|
|
|
|
<!-- </el-alert>-->
|
|
|
|
|
|
|
|
|
|
<div style="min-height: 400px;">
|
|
|
|
|
<!-- 分割线 -->
|
|
|
|
|
@ -394,7 +394,7 @@ import bindWorkDialog from "@/views/collect/bindWorkDialog";
|
|
|
|
|
import prescribeOriginPanel from "./PannelOrderBiz";
|
|
|
|
|
import prescribeOriginDiPanel from "./PannelOrderBiz";
|
|
|
|
|
import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
|
|
|
|
|
import {deleteByOrder, orderPage,orderTop} from "@/api/collect/collectOrder";
|
|
|
|
|
import {deleteByOrder, orderPage, orderTop} from "@/api/collect/collectOrder";
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: "prescribePanel",
|
|
|
|
|
@ -509,47 +509,56 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
handleClick(index) {
|
|
|
|
|
// this.$router.push({ path: '/tagCodeBlank', query: { workplaceId: this.list[index].workPlaceCode , billNo: this.list[index].billNo }});
|
|
|
|
|
this.$router.push({ query: { ...this.$route.query, billNo: this.list[index].billNo }, path: this.$route.path })
|
|
|
|
|
|
|
|
|
|
let temp = this.list[index];
|
|
|
|
|
if (temp != null && temp.invAlert == 2) {
|
|
|
|
|
this.$message.warning("工位存量不足，请及时上货！");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.$router.push({query: {...this.$route.query, billNo: this.list[index].billNo}, path: this.$route.path})
|
|
|
|
|
this.callParentMethod(index)
|
|
|
|
|
},
|
|
|
|
|
callParentMethod(index) {
|
|
|
|
|
let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.list[index].workPlaceCode + "&billNo=" + this.list[index].billNo
|
|
|
|
|
// 触发自定义事件 'parent-method'
|
|
|
|
|
this.$emit('parent-method', "DealOrder",url); // someData 是你想要传递给父组件的数据
|
|
|
|
|
this.$emit('parent-method', "DealOrder", url); // someData 是你想要传递给父组件的数据
|
|
|
|
|
},
|
|
|
|
|
linkPage(_this, row) {
|
|
|
|
|
|
|
|
|
|
if (row != null && row.invAlert == 2) {
|
|
|
|
|
_this.$message.warning("工位存量不足，请及时上货！");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo
|
|
|
|
|
window.open(url, '_blank');
|
|
|
|
|
},
|
|
|
|
|
//置顶
|
|
|
|
|
orderTop(_this, row) {
|
|
|
|
|
let data = row;
|
|
|
|
|
orderTop({id:data.id}).then(res => {
|
|
|
|
|
if (res.code == 20000){
|
|
|
|
|
orderTop({id: data.id}).then(res => {
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
_this.$message.success("置顶成功")
|
|
|
|
|
_this.getList()
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
_this.$message.error(res.message)
|
|
|
|
|
_this.getList()
|
|
|
|
|
}
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
|
// .then((response) => {
|
|
|
|
|
// if (response.code == 20000) {
|
|
|
|
|
// this.getList();
|
|
|
|
|
// this.$message.success("指定成功")
|
|
|
|
|
// } else if (response.code == 520) {
|
|
|
|
|
// this.$message.error(response.message);
|
|
|
|
|
// this.getList();
|
|
|
|
|
// } else {
|
|
|
|
|
// this.$message.error(response.message);
|
|
|
|
|
// this.getList();
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
// .catch(() => {
|
|
|
|
|
// });
|
|
|
|
|
// .then((response) => {
|
|
|
|
|
// if (response.code == 20000) {
|
|
|
|
|
// this.getList();
|
|
|
|
|
// this.$message.success("指定成功")
|
|
|
|
|
// } else if (response.code == 520) {
|
|
|
|
|
// this.$message.error(response.message);
|
|
|
|
|
// this.getList();
|
|
|
|
|
// } else {
|
|
|
|
|
// this.$message.error(response.message);
|
|
|
|
|
// this.getList();
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
// .catch(() => {
|
|
|
|
|
// });
|
|
|
|
|
},
|
|
|
|
|
//界面配置相关------------
|
|
|
|
|
executeFuc(row, type, clickFuc, value) {
|
|
|
|
|
@ -608,7 +617,7 @@ export default {
|
|
|
|
|
this.loading = false
|
|
|
|
|
this.list = res.data.list || []
|
|
|
|
|
this.total = res.data.total || 0
|
|
|
|
|
if (this.filterQuery.workPlaceCode != null){
|
|
|
|
|
if (this.filterQuery.workPlaceCode != null) {
|
|
|
|
|
this.changeInvRemind(this.filterQuery.workPlaceCode)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -685,7 +694,7 @@ export default {
|
|
|
|
|
.then((response) => {
|
|
|
|
|
_this.loading = false;
|
|
|
|
|
_this.options.findWorkPlace = response.data || [];
|
|
|
|
|
if (_this.options.findWorkPlace .length == 1){
|
|
|
|
|
if (_this.options.findWorkPlace.length == 1) {
|
|
|
|
|
_this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
@ -696,7 +705,6 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
if (this.$route.query.workplaceId != null) {
|
|
|
|
|
@ -704,7 +712,7 @@ export default {
|
|
|
|
|
this.filterQuery.workPlaceCode = this.$route.query.workplaceId
|
|
|
|
|
this.showType = 2
|
|
|
|
|
}
|
|
|
|
|
this.findWorkPlace(this,"");
|
|
|
|
|
this.findWorkPlace(this, "");
|
|
|
|
|
getHead("prescribeAllot", "1").then((re) => {
|
|
|
|
|
// 处理返回的数据
|
|
|
|
|
this.tableObj = re.data;
|
|
|
|
|
|
yewj
7 months ago