From 62294084c9c35d35594e9f2d6c41342ae84e9526 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 29 七月 2026 16:39:20 +0800
Subject: [PATCH] 修改工资
---
src/views/productionManagement/productionProcess/index.vue | 107 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 37 deletions(-)
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index d4c7f9e..9b1ae12 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -46,7 +46,7 @@
<div class="process-desc">{{ process.remark || '鏆傛棤鎻忚堪' }}</div>
<div class="process-device">鍏宠仈璁惧: {{ (deviceOptions.find(item => item.id === Number(process.deviceLedgerId))?.deviceName) || '鏈叧鑱�' }}</div>
<div class="process-device">鏍囧噯鏁伴噺: {{ process.standardQuantity || 0 }}</div>
- <div class="process-device">鎶樼畻绯绘暟: {{ process.conversionFactor ?? 1 }}</div>
+ <div class="process-device"></div>
</div>
<div class="card-footer">
<div class="status-tag">
@@ -66,7 +66,7 @@
璁′欢
</el-tag>
</div>
- <span class="param-count">宸ヨ祫瀹氶: 楼{{ process.salaryQuota || 0 }}</span>
+ <span class="param-count"></span>
</div>
</div>
</div>
@@ -120,12 +120,6 @@
<el-input v-model="processForm.name"
placeholder="璇疯緭鍏ュ伐搴忓悕绉�" />
</el-form-item>
- <el-form-item label="宸ヨ祫瀹氶"
- prop="salaryQuota">
- <el-input v-model="processForm.salaryQuota"
- type="number"
- :step="0.001" />
- </el-form-item>
<el-form-item label="鏍囧噯鏁伴噺"
prop="standardQuantity">
<el-input v-model="processForm.standardQuantity"
@@ -133,12 +127,26 @@
:step="0.001"
placeholder="璇疯緭鍏ュ伐搴忔爣鍑嗘暟閲�" />
</el-form-item>
- <el-form-item label="鎶樼畻绯绘暟"
- prop="conversionFactor">
- <el-input v-model="processForm.conversionFactor"
+ <el-form-item label="灏忔彁鐞寸郴鏁�"
+ prop="violinFactor">
+ <el-input v-model="processForm.violinFactor"
type="number"
- :step="0.01"
- placeholder="榛樿 1" />
+ :step="0.001"
+ placeholder="璇疯緭鍏ュ皬鎻愮惔绯绘暟" />
+ </el-form-item>
+ <el-form-item label="澶ф彁鐞寸郴鏁�"
+ prop="violaFactor">
+ <el-input v-model="processForm.violaFactor"
+ type="number"
+ :step="0.001"
+ placeholder="璇疯緭鍏ュぇ鎻愮惔绯绘暟" />
+ </el-form-item>
+ <el-form-item label="璐濇柉绯绘暟"
+ prop="bassFactor">
+ <el-input v-model="processForm.bassFactor"
+ type="number"
+ :step="0.001"
+ placeholder="璇疯緭鍏ヨ礉鏂郴鏁�" />
</el-form-item>
<el-form-item label="鏄惁璐ㄦ"
prop="isQuality">
@@ -359,9 +367,10 @@
id: null,
no: "",
name: "",
- salaryQuota: null,
standardQuantity: null,
- conversionFactor: 1,
+ violinFactor: null,
+ violaFactor: null,
+ bassFactor: null,
isQuality: false,
isProduction: false,
remark: "",
@@ -371,20 +380,6 @@
const processRules = {
no: [{ required: true, message: "璇疯緭鍏ュ伐搴忕紪鐮�", trigger: "blur" }],
name: [{ required: true, message: "璇疯緭鍏ュ伐搴忓悕绉�", trigger: "blur" }],
- salaryQuota: [
- {
- required: false,
- message: "璇疯緭鍏ュ伐璧勫畾棰�",
- trigger: "blur",
- validator: (rule, value, callback) => {
- if (isNaN(value) || value < 0) {
- callback(new Error("宸ヨ祫瀹氶蹇呴』鏄潪璐熸暟瀛�"));
- } else {
- callback();
- }
- },
- },
- ],
standardQuantity: [
{
required: false,
@@ -403,18 +398,54 @@
},
},
],
- conversionFactor: [
+ violinFactor: [
{
required: false,
- message: "璇疯緭鍏ユ姌绠楃郴鏁�",
+ message: "璇疯緭鍏ュ皬鎻愮惔绯绘暟",
trigger: "blur",
validator: (rule, value, callback) => {
if (value == null || value === "") {
callback();
return;
}
- if (isNaN(value) || value <= 0) {
- callback(new Error("鎶樼畻绯绘暟蹇呴』鏄ぇ浜� 0 鐨勬暟瀛�"));
+ if (isNaN(value) || value < 0) {
+ callback(new Error("灏忔彁鐞寸郴鏁板繀椤绘槸闈炶礋鏁板瓧"));
+ } else {
+ callback();
+ }
+ },
+ },
+ ],
+ violaFactor: [
+ {
+ required: false,
+ message: "璇疯緭鍏ュぇ鎻愮惔绯绘暟",
+ trigger: "blur",
+ validator: (rule, value, callback) => {
+ if (value == null || value === "") {
+ callback();
+ return;
+ }
+ if (isNaN(value) || value < 0) {
+ callback(new Error("澶ф彁鐞寸郴鏁板繀椤绘槸闈炶礋鏁板瓧"));
+ } else {
+ callback();
+ }
+ },
+ },
+ ],
+ bassFactor: [
+ {
+ required: false,
+ message: "璇疯緭鍏ヨ礉鏂郴鏁�",
+ trigger: "blur",
+ validator: (rule, value, callback) => {
+ if (value == null || value === "") {
+ callback();
+ return;
+ }
+ if (isNaN(value) || value < 0) {
+ callback(new Error("璐濇柉绯绘暟蹇呴』鏄潪璐熸暟瀛�"));
} else {
callback();
}
@@ -621,9 +652,10 @@
processForm.id = null;
processForm.no = "";
processForm.name = "";
- processForm.salaryQuota = null;
processForm.standardQuantity = null;
- processForm.conversionFactor = 1;
+ processForm.violinFactor = null;
+ processForm.violaFactor = null;
+ processForm.bassFactor = null;
processForm.isQuality = false;
processForm.isProduction = false;
processForm.remark = "";
@@ -637,9 +669,10 @@
processForm.id = process.id;
processForm.no = process.no;
processForm.name = process.name;
- processForm.salaryQuota = process.salaryQuota;
processForm.standardQuantity = process.standardQuantity;
- processForm.conversionFactor = process.conversionFactor ?? 1;
+ processForm.violinFactor = process.violinFactor;
+ processForm.violaFactor = process.violaFactor;
+ processForm.bassFactor = process.bassFactor;
processForm.isQuality = !!process.isQuality;
processForm.isProduction = !!process.isProduction;
processForm.remark = process.remark || "";
--
Gitblit v1.9.3