From f84e425bb9debb5f2af8e417bf07d2a2b0077609 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 17:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/productionManagement/workOrderEdit/index.vue | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/views/productionManagement/workOrderEdit/index.vue b/src/views/productionManagement/workOrderEdit/index.vue
index 50f9fce..b919973 100644
--- a/src/views/productionManagement/workOrderEdit/index.vue
+++ b/src/views/productionManagement/workOrderEdit/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,8 +40,6 @@
</template>
</PIMTable>
</div>
-
- <!-- 缂栬緫鏃堕棿寮圭獥 -->
<el-dialog v-model="editDialogVisible"
title="缂栬緫璁″垝鏃堕棿"
width="500px">
@@ -65,14 +72,13 @@
</template>
<script setup>
- import { onMounted, ref, nextTick } from "vue";
+ import { getCurrentInstance, onMounted, reactive, ref, toRefs } from "vue";
import { ElMessageBox } from "element-plus";
- import dayjs from "dayjs";
import {
productWorkOrderPage,
updateProductWorkOrder,
} from "@/api/productionManagement/workOrder.js";
- import { getCurrentInstance, reactive, toRefs } from "vue";
+
const { proxy } = getCurrentInstance();
const tableColumn = ref([
@@ -88,7 +94,7 @@
},
{
label: "鐢熶骇璁㈠崟鍙�",
- prop: "productOrderNpsNo",
+ prop: "npsNo",
width: "140",
},
{
@@ -106,7 +112,8 @@
},
{
label: "宸ュ簭鍚嶇О",
- prop: "processName",
+ prop: "operationName",
+ width: "100",
},
{
label: "闇�姹傛暟閲�",
@@ -161,11 +168,11 @@
],
},
]);
-
+
const tableData = ref([]);
const tableLoading = ref(false);
const editDialogVisible = ref(false);
- let editrow = ref(null);
+ const editrow = ref(null);
const page = reactive({
current: 1,
size: 100,
@@ -175,9 +182,11 @@
const data = reactive({
searchForm: {
workOrderNo: "",
+ productOrderNpsNo: "",
},
});
const { searchForm } = toRefs(data);
+
const toProgressPercentage = val => {
const n = Number(val);
if (!Number.isFinite(n)) return 0;
@@ -185,6 +194,7 @@
if (n >= 100) return 100;
return Math.round(n);
};
+
const progressColor = percentage => {
const p = toProgressPercentage(percentage);
if (p < 30) return "#f56c6c";
@@ -193,17 +203,17 @@
return "#67c23a";
};
- // 鏌ヨ鍒楄〃
- /** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
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 };
@@ -225,7 +235,7 @@
const handleUpdate = () => {
updateProductWorkOrder(editrow.value)
- .then(res => {
+ .then(() => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
editDialogVisible.value = false;
getList();
@@ -248,13 +258,15 @@
align-items: center;
gap: 12px;
}
+
.search-item {
display: flex;
align-items: center;
}
+
.search_title {
margin-right: 8px;
font-size: 14px;
color: #606266;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3