From 6e2a64ec5b6982fa06cce6fa22defe48af474d2c Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期一, 27 四月 2026 17:11:24 +0800
Subject: [PATCH] 阳光印刷Web: 新增工单管理功能并优化生产流程界面
---
src/views/productionManagement/productionReporting/index.vue | 20 +++++-----
src/views/productionManagement/workOrder/index.vue | 13 ++----
src/views/productionManagement/productionProcess/Edit.vue | 30 +++++++-------
src/views/productionManagement/productionProcess/New.vue | 34 ++++++++--------
4 files changed, 46 insertions(+), 51 deletions(-)
diff --git a/src/views/productionManagement/productionProcess/Edit.vue b/src/views/productionManagement/productionProcess/Edit.vue
index 4466584..d9d1400 100644
--- a/src/views/productionManagement/productionProcess/Edit.vue
+++ b/src/views/productionManagement/productionProcess/Edit.vue
@@ -74,21 +74,21 @@
/>
</el-select>
</el-form-item>
- <el-form-item
- label="宸ュ簭绫诲瀷"
- prop="type"
- :rules="[
- {
- required: true,
- message: '璇烽�夋嫨宸ュ簭绫诲瀷',
- }
- ]"
- >
- <el-select v-model="formState.type" placeholder="璇烽�夋嫨宸ュ簭绫诲瀷">
- <el-option label="璁℃椂" :value="0" />
- <el-option label="璁′欢" :value="1" />
- </el-select>
- </el-form-item>
+<!-- <el-form-item-->
+<!-- label="宸ュ簭绫诲瀷"-->
+<!-- prop="type"-->
+<!-- :rules="[-->
+<!-- {-->
+<!-- required: true,-->
+<!-- message: '璇烽�夋嫨宸ュ簭绫诲瀷',-->
+<!-- }-->
+<!-- ]"-->
+<!-- >-->
+<!-- <el-select v-model="formState.type" placeholder="璇烽�夋嫨宸ュ簭绫诲瀷">-->
+<!-- <el-option label="璁℃椂" :value="0" />-->
+<!-- <el-option label="璁′欢" :value="1" />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<!-- <el-form-item label="宸ヨ祫瀹氶" prop="salaryQuota">-->
<!-- <el-input v-model="formState.salaryQuota" type="number" :step="0.001" />-->
<!-- </el-form-item>-->
diff --git a/src/views/productionManagement/productionProcess/New.vue b/src/views/productionManagement/productionProcess/New.vue
index 5d14dbb..a17ec91 100644
--- a/src/views/productionManagement/productionProcess/New.vue
+++ b/src/views/productionManagement/productionProcess/New.vue
@@ -43,7 +43,7 @@
:rules="[
{
required: true,
- message: '璇烽�夋嫨宸ュ簭绫诲瀷',
+ message: '璇烽�夋嫨宸ュ簭鏈哄彴',
}
]"
>
@@ -70,21 +70,21 @@
/>
</el-select>
</el-form-item>
- <el-form-item
- label="宸ュ簭绫诲瀷"
- prop="type"
- :rules="[
- {
- required: true,
- message: '璇烽�夋嫨宸ュ簭绫诲瀷',
- }
- ]"
- >
- <el-select v-model="formState.type" placeholder="璇烽�夋嫨宸ュ簭绫诲瀷">
- <el-option label="璁℃椂" :value="0" />
- <el-option label="璁′欢" :value="1" />
- </el-select>
- </el-form-item>
+<!-- <el-form-item-->
+<!-- label="宸ュ簭绫诲瀷"-->
+<!-- prop="type"-->
+<!-- :rules="[-->
+<!-- {-->
+<!-- required: true,-->
+<!-- message: '璇烽�夋嫨宸ュ簭绫诲瀷',-->
+<!-- }-->
+<!-- ]"-->
+<!-- >-->
+<!-- <el-select v-model="formState.type" placeholder="璇烽�夋嫨宸ュ簭绫诲瀷">-->
+<!-- <el-option label="璁℃椂" :value="0" />-->
+<!-- <el-option label="璁′欢" :value="1" />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<!-- <el-form-item label="宸ヨ祫瀹氶" prop="salaryQuota">-->
<!-- <el-input v-model="formState.salaryQuota" type="number" :step="0.001">-->
<!-- <template #append>鍏�</template>-->
@@ -124,7 +124,7 @@
// 鍝嶅簲寮忔暟鎹紙鏇夸唬閫夐」寮忕殑 data锛�
const formState = ref({
name: '',
- type: undefined,
+ type: 0,
remark: '',
salaryQuota: '',
isQuality: false,
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 7275e23..bd93574 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -220,6 +220,16 @@
width: 120,
},
{
+ label: "宸ュ崟缂栧彿",
+ prop: "workOrderNo",
+ width: 120,
+ },
+ {
+ label: "璁㈠崟缂栧彿",
+ prop: "salesContractNo",
+ width: 120,
+ },
+ {
label: "宸ュ簭",
prop: "process",
width: 120,
@@ -262,16 +272,6 @@
{
label: "鏈�缁堝鏍镐汉",
prop: "sureAuditUserName",
- width: 120,
- },
- {
- label: "宸ュ崟缂栧彿",
- prop: "workOrderNo",
- width: 120,
- },
- {
- label: "璁㈠崟缂栧彿",
- prop: "salesContractNo",
width: 120,
},
{
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index ec83bfe..c9accb9 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -518,11 +518,6 @@
width: "140",
},
{
- label: "鎶ュ伐浜�",
- prop: "userNames",
- width: "140",
- },
- {
label: "璁″垝寮�濮嬫椂闂�",
prop: "planStartTime",
width: "140",
@@ -887,10 +882,10 @@
};
const handleEdit = row => {
- if (!isCurrentUserReportWorker(row)) {
- ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶缂栬緫");
- return;
- }
+ // if (!isCurrentUserReportWorker(row)) {
+ // ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶缂栬緫");
+ // return;
+ // }
editrow.value = JSON.parse(JSON.stringify(row));
editDialogVisible.value = true;
};
--
Gitblit v1.9.3