From 6697f708b99c9b63e00a7e490f91d1cb4fa64450 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 28 四月 2026 16:33:45 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro
---
src/views/productionManagement/workOrderManagement/index.vue | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index 6def04c..d60132a 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -12,6 +12,15 @@
prefix-icon="Search" />
</div>
<div class="search-item">
+ <span class="search_title">鐢熶骇璁㈠崟鍙凤細</span>
+ <el-input v-model="searchForm.productOrderNpsNo"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ @change="handleQuery"
+ clearable
+ prefix-icon="Search" />
+ </div>
+ <div class="search-item">
<el-button type="primary"
@click="handleQuery">鎼滅储</el-button>
</div>
@@ -31,7 +40,6 @@
</template>
</PIMTable>
</div>
-
<!-- 娴佽浆鍗″脊绐� -->
<el-dialog v-model="transferCardVisible"
title="娴佽浆鍗�"
@@ -107,7 +115,6 @@
@click="printTransferCard">鎵撳嵃娴佽浆鍗�</el-button>
</div>
</el-dialog>
-
<!-- 鎶ュ伐寮圭獥 -->
<el-dialog v-model="reportDialogVisible"
title="鎶ュ伐"
@@ -163,7 +170,9 @@
</span>
</template>
</el-dialog>
-
+ <MaterialDialog v-model="materialDialogVisible"
+ :row-data="currentMaterialOrderRow"
+ @refresh="getList" />
<FilesDia ref="workOrderFilesRef" />
</div>
</template>
@@ -181,6 +190,7 @@
import QRCode from "qrcode";
import { getCurrentInstance, reactive, toRefs } from "vue";
import FilesDia from "./components/filesDia.vue";
+ import MaterialDialog from "./components/MaterialDialog.vue";
const { proxy } = getCurrentInstance();
const tableColumn = ref([
@@ -196,7 +206,7 @@
},
{
label: "鐢熶骇璁㈠崟鍙�",
- prop: "productOrderNpsNo",
+ prop: "npsNo",
width: "140",
},
{
@@ -214,7 +224,8 @@
},
{
label: "宸ュ簭鍚嶇О",
- prop: "processName",
+ prop: "operationName",
+ width: "100",
},
{
label: "闇�姹傛暟閲�",
@@ -255,7 +266,7 @@
},
{
label: "鎿嶄綔",
- width: "200",
+ width: "260",
align: "center",
dataType: "action",
fixed: "right",
@@ -272,6 +283,12 @@
openWorkOrderFiles(row);
},
},
+ // {
+ // name: "鐗╂枡",
+ // clickFun: row => {
+ // openMaterialDialog(row);
+ // },
+ // },
{
name: "鎶ュ伐",
clickFun: row => {
@@ -282,7 +299,7 @@
],
},
]);
-
+
const tableData = ref([]);
const tableLoading = ref(false);
const transferCardVisible = ref(false);
@@ -394,8 +411,10 @@
// 鏈夋晥鐨勯潪璐熸暣鏁帮紙鍖呮嫭0锛�
reportForm.scrapQty = num;
};
-
+
const currentReportRowData = ref(null);
+ const materialDialogVisible = ref(false);
+ const currentMaterialOrderRow = ref(null);
const page = reactive({
current: 1,
size: 100,
@@ -405,6 +424,7 @@
const data = reactive({
searchForm: {
workOrderNo: "",
+ productOrderNpsNo: "",
},
});
const { searchForm } = toRefs(data);
@@ -429,13 +449,13 @@
page.current = 1;
getList();
};
-
+
const pagination = obj => {
page.current = obj.page;
page.size = obj.limit;
getList();
};
-
+
const getList = () => {
tableLoading.value = true;
const params = { ...searchForm.value, ...page };
@@ -545,6 +565,11 @@
});
reportDialogVisible.value = true;
+ };
+
+ const openMaterialDialog = row => {
+ currentMaterialOrderRow.value = row;
+ materialDialogVisible.value = true;
};
const handleReport = () => {
@@ -786,4 +811,4 @@
height: 140px !important;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3