From 9a886d711d8b21adc335fdf8c39350584c7ba6fd Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 14 十月 2025 02:12:14 +0800
Subject: [PATCH] 更新代码，取消MES出库单号同步标识，平库转立库功能，寄售周期判断取消，精品标识等
---
代码管理/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue | 204 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 177 insertions(+), 27 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue"
index a59c06e..906509c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue"
@@ -1,13 +1,82 @@
<template>
<div>
<vol-box
+ v-model="dialogFormVisible"
+ :on-model-close="closeCustomModel"
+ :lazy="true"
+ width="25%"
+ :padding="20"
+ title="閫夋嫨鍑哄簱绾夸綋"
+ >
+ <div>
+ <VolForm
+ ref="myform"
+ :label-width="120"
+ :loadKey="true"
+ :formFields="formFields1"
+ :formRules="formRules1"
+ >
+
+ </VolForm>
+ </div>
+ <template #footer>
+ <!-- <el-button type="primary" size="small" @click="submit">纭</el-button> -->
+ <el-button type="danger" size="small" @click="outbound"
+ >鍑哄簱</el-button
+ >
+ </template>
+ </vol-box>
+ <vol-box
v-model="showDetialBox"
:lazy="true"
- width="75%"
+ width="85%"
:padding="15"
title="鍗曟嵁鏄庣粏淇℃伅"
>
<div class="box-head">
+ <!-- <el-dialog v-model="dialogFormVisible" title="閫夋嫨鍑哄簱绾夸綋" width="500" center>
+ <span>
+ It should be noted that the content will not be aligned in center by
+ default
+ </span>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="outbound">鍑哄簱</el-button>
+ </div>
+ </template>
+ </el-dialog> -->
+
+ <!-- <el-dialog
+ v-model="dialogFormVisible"
+ title="Warning"
+ width="500"
+ align-center
+ >
+ <span>Open the dialog from the center from the screen</span>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="outbound">鍑哄簱</el-button>
+ </div>
+ </template>
+ </el-dialog> -->
+ <!-- <el-dialog v-model="dialogFormVisible" title="閫夋嫨鍑哄簱绾夸綋" width="500">
+ <el-form :model="form" width="500">
+ <div style="width: 300px;margin: 0px auto;">
+ <el-form-item label="璇烽�夋嫨绾夸綋" :label-width="formLabelWidth">
+ <el-select v-model="form.region" placeholder="閫夋嫨绾夸綋">
+ <el-option label="1鍙风嚎" value="5236" />
+ <el-option label="2鍙风嚎" value="5243" />
+ <el-option label="3鍙风嚎" value="5250" />
+ </el-select>
+ </el-form-item>
+ </div>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="outbound">鍑哄簱</el-button>
+ </div>
+ </template>
+ </el-dialog> -->
<el-alert :closable="false" style="width: 100%">
<el-row>
<el-col :span="16">
@@ -25,7 +94,7 @@
type="primary"
size="small"
style="float: right; height: 20px; margin-right: 10px"
- @click="outbound"
+ @click="outSelect"
>鐩存帴鍑哄簱</el-link
>
<el-link
@@ -91,7 +160,7 @@
</el-table>
</div>
</vol-box>
- <pp-stock-select ref="childs" ></pp-stock-select>
+ <stock-select ref="childs" ></stock-select>
<selected-stock
ref="SelectedStock"
@parentCall="parentCall"
@@ -101,8 +170,8 @@
<script>
import VolBox from "@/components/basic/VolBox.vue";
import VolForm from "@/components/basic/VolForm.vue";
-import StockSelect from "./StockSelect.vue";
-import SelectedStock from "./SelectedStock.vue";
+import StockSelect from "./ProStockSelect.vue";
+import SelectedStock from "./ProSelectedStock.vue";
export default {
components: { VolBox, VolForm, StockSelect, SelectedStock },
data() {
@@ -113,6 +182,57 @@
currentRow: null,
selection: [],
tableData: [],
+ dialogFormVisible:false,
+ formLabelWidth: '160px',
+ formFields1: {
+ LineCode: "",
+ Grade: "0",
+ IsFineWorks: "0",
+ },
+ formRules1:[[
+ {
+ dataKey: "line",
+ title: "閫夋嫨绾夸綋",
+ required: true,
+ field: "LineCode",
+ data: [
+ { key: "5236", value: "1鍙风嚎" },
+ { key: "5243", value: "2鍙风嚎" },
+ { key: "5250", value: "3鍙风嚎" },
+ ],
+ type: "select",
+ extra: {
+
+ },
+ }],
+ [
+ {
+ title: "鏄惁浼樺厛",
+ field: "Grade",
+ data: [],
+ required: false,
+ type: "switch",
+ },
+ ],
+ [
+ {
+ title: "鎸囧畾绮惧搧",
+ field: "IsFineWorks",
+ data: [],
+ required: false,
+ type: "switch",
+ },
+ ]],
+ form: {
+ name: '',
+ region: '',
+ date1: '',
+ date2: '',
+ delivery: false,
+ type: [],
+ resource: '',
+ desc: '',
+ },
tableColumns: [
{
prop: "id",
@@ -169,13 +289,33 @@
prop: "pVer",
title: "浜у搧鐗堟湰",
type: "string",
- width: 150,
+ width: 90,
+ },
+ {
+ prop: "outSpecifyVer",
+ title: "鎸囨淳鐗堟湰",
+ type: "string",
+ width: 90,
},
{
prop: "pLot",
title: "浜у搧鎵规",
type: "string",
width: 150,
+ },
+ {
+ prop: "assignStock",
+ title: "鎸囧畾搴撳瓨",
+ type: "icon",
+ width: 90,
+ icon: "el-icon-s-grid",
+ },
+ {
+ prop: "viewDetail",
+ title: "鍑哄簱璇︾粏",
+ type: "icon",
+ width: 90,
+ icon: "el-icon-s-operation",
},
{
prop: "qtyPcs",
@@ -213,25 +353,12 @@
type: "string",
width: 120,
},
+
{
prop: "spareQty",
title: "澶囧搧鏁�",
type: "string",
width: 120,
- },
- // {
- // prop: "assignStock",
- // title: "鎸囧畾搴撳瓨",
- // type: "icon",
- // width: 90,
- // icon: "el-icon-s-grid",
- // },
- {
- prop: "viewDetail",
- title: "鍑哄簱璇︾粏",
- type: "icon",
- width: 90,
- icon: "el-icon-s-operation",
},
{
prop: "creater",
@@ -269,11 +396,11 @@
Foots: "",
total: 0,
// 2020.08.29澧炲姞鑷畾涔夊垎椤垫潯澶у皬
- sizes: [30, 60, 100, 120],
- size: 30, // 榛樿鍒嗛〉澶у皬
+ sizes: [60, 100, 120],
+ size: 60, // 榛樿鍒嗛〉澶у皬
Wheres: [],
page: 1,
- rows: 30,
+ rows: 60,
},
searchFormOptions: [
[
@@ -307,6 +434,12 @@
};
},
methods: {
+ outSelect(){
+ if (this.selection.length === 0) {
+ return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
+ }
+ this.dialogFormVisible=true;
+ },
open(row) {
this.row = row;
this.showDetialBox = true;
@@ -314,7 +447,7 @@
this.getData();
},
getData() {
- var wheres = [{ name: "orderId", value: this.row.id }];
+ var wheres = [{ name: "proOrderId", value: this.row.id }];
var param = {
page: this.paginations.page,
rows: this.paginations.rows,
@@ -359,13 +492,22 @@
if (this.selection.length === 0) {
return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
}
+ //璇烽�夋嫨鍗曟潯鏁版嵁
+ if (this.selection.length > 1) {
+ return this.$message.error("璇烽�夋嫨鍗曟潯鏁版嵁");
+ }
var keys = this.selection.map((item) => item.id); // 鑾峰彇閫変腑琛岀殑id
this.http
- .post("api/Task/OutProductTask?stationCode=5236", keys, "鏁版嵁澶勭悊涓�")
+ .post("api/Task/OutProductTask?stationCode="+this.formFields1.LineCode +"&grade="+this.formFields1.Grade+"&isFineWorks="+this.formFields1.isFineWorks, keys, "鏁版嵁澶勭悊涓�")
.then((x) => {
if (!x.status) return this.$message.error(x.message);
this.$message.success("鎿嶄綔鎴愬姛");
+ this.formFields1.LineCode="";
+ this.formFields1.Grade="0";
+ this.formFields1.isFineWorks="0";
+ this.dialogFormVisible=false;
+ this.$parent.refresh();
this.showDetialBox = false;
this.$emit("parentCall", ($vue) => {
$vue.getData();
@@ -379,12 +521,13 @@
this.currentRow = val;
},
getButtonEnable(propName, row) {
+ console.log(row)
if (propName == "assignStock") {
if (
- row.proOrderDetailStatus !== 0 &&
+ (row.proOrderDetailStatus !== 0 &&
row.proOrderDetailStatus !== 60 &&
row.proOrderDetailStatus !== 70 &&
- row.proOrderDetailStatus !== 80
+ row.proOrderDetailStatus !== 80) || row.qtyPcs==row.lockQtyPcs
) {
return true;
} else {
@@ -423,6 +566,13 @@
}
});
},
+ closeCustomModel() {
+ this.formFields1.LineCode="";
+ this.formFields1.Grade="0";
+ this.formFields1.isFineWorks="0";
+ this.dialogFormVisible=false;
+ this.$parent.refresh();
+ },
getDictionary(row, column) {
if (this.dictionaryList) {
var item = this.dictionaryList.find((x) => x.dicNo == column.bindKey);
--
Gitblit v1.9.3