From 544f30e28a3d8ea41e5ea8c0add2ce77c1b6fb1a Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 17:48:31 +0800
Subject: [PATCH] 工种管理模块 编辑工种接口400的问题修改+增加如果启用不达标保底，则必须输入保底工资的逻辑
---
src/views/productManage/silkRegisterForm/addPage.vue | 71 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/src/views/productManage/silkRegisterForm/addPage.vue b/src/views/productManage/silkRegisterForm/addPage.vue
index 8a386e9..24bcbdb 100644
--- a/src/views/productManage/silkRegisterForm/addPage.vue
+++ b/src/views/productManage/silkRegisterForm/addPage.vue
@@ -77,18 +77,18 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="杞﹂棿" prop="name" class="form-item">
+ <el-form-item label="杞﹂棿" prop="workshopObj" class="form-item">
<el-select
- v-model="form.name"
+ v-model="form.workshopObj"
placeholder="璇烽�夋嫨"
class="select-width"
- @change="getGroupNumber('name')"
+ @change="getGroupNumber('workshopObj')"
>
<el-option
v-for="item in nameList"
:key="item.ID"
:label="item.name"
- :value="item.name"
+ :value="{ value: item.number, label: item.name }"
>
</el-option>
</el-select>
@@ -181,6 +181,7 @@
:detail-enter="isView ? true : false"
:selectBox="false"
:detailEnter="true"
+ :isBorder="true"
:show-summary="showSummary"
:product-table-list="tableList"
@inputContent="inputContent"
@@ -222,25 +223,25 @@
:model="form"
:rules="rules"
label-position="right"
- label-width="60px"
+ label-width="70px"
>
<div class="form-box-t">
- <el-form-item label="缂栧彿" prop="number" class="form-item">
+ <el-form-item label="缂栧彿锛�" prop="number" class="form-item">
{{ form.number }}
</el-form-item>
- <el-form-item label="杞﹂棿" prop="name" class="form-item">
- {{ form.name }}
+ <el-form-item label="杞﹂棿锛�" prop="workshopName" class="form-item">
+ {{ form.workshopName }}
</el-form-item>
- <el-form-item label="缁勫埆" prop="workshopGroup" class="form-item">
+ <el-form-item label="缁勫埆锛�" prop="workshopGroup" class="form-item">
{{ form.workshopGroup }}
</el-form-item>
- <el-form-item label="鍥炴暟" prop="circle" class="form-item">
+ <el-form-item label="鍥炴暟锛�" prop="circle" class="form-item">
{{ form.circle }}
</el-form-item>
- <el-form-item label="瑙勬牸" prop="spec" class="form-item">
+ <el-form-item label="瑙勬牸锛�" prop="spec" class="form-item">
{{ form.spec }}
</el-form-item>
- <el-form-item label="鏃ユ湡" prop="finishDate" class="form-item">
+ <el-form-item label="鏃ユ湡锛�" prop="finishDate" class="form-item">
{{ form.finishDate }}
</el-form-item>
</div>
@@ -251,6 +252,8 @@
tooltip-effect="dark"
style="width: 100%"
:height="'calc(100% - 0px)'"
+ :header-cell-style="{ background: '#f1f3f8',color: '#000009', 'font-size': '12px', 'font-family': 'PingFangSC' }"
+ border
>
<el-table-column label="杞﹀彿" prop="ID" width="100">
</el-table-column>
@@ -474,7 +477,7 @@
{ required: true, message: "璇烽�夋嫨", trigger: ["change", "blur"] },
],
// 杞﹂棿 搴旇true
- name: [
+ workshopObj: [
{ required: true, message: "璇烽�夋嫨", trigger: ["change", "blur"] },
],
spec: [
@@ -590,7 +593,7 @@
number: "",
finishDate: "",
market: "",
- name: "",
+ workshopObj: "",
spec: "",
workshopGroup: "",
circleTwo: "",
@@ -606,6 +609,10 @@
JSON.stringify(response.data ? response.data : {})
);
this.form = config;
+ this.form.workshopObj={
+ value:config.workshopNumber,
+ label:config.workshopName,
+ }
this.getGroupNumber('','edit')
let finenessList=config.finenessList
? config.finenessList
@@ -624,7 +631,7 @@
} else {
this.form = {
number: "",
- name: "",
+ workshopObj: "",
workshopGroup: "",
circle: "",
spec: "",
@@ -648,7 +655,7 @@
);
this.form = config;
this.form.number = config.finenessRegister.number;
- this.form.name = config.finenessRegister.name;
+ this.form.workshopName = config.finenessRegister.workshopName;
this.form.workshopGroup = config.finenessRegister.workshopGroup;
this.form.spec = config.finenessRegister.spec;
this.form.finishDate = config.finenessRegister.finishDate;
@@ -763,22 +770,14 @@
});
},
async getGroupNumber(val,type) {
- if (this.form.name) {
- //缁勫埆
- let number = "";
- for (let i in this.nameList) {
- if (this.nameList[i].name == this.form.name) {
- number = this.nameList[i].number;
- break;
- }
- }
- if(number){
- await getWorkshopManageGroup({ number: number }).then((res) => {
+ if (Object.keys(this.form.workshopObj).length>0) {
+ if(this.form.workshopObj.value){
+ await getWorkshopManageGroup({ number: this.form.workshopObj.value }).then((res) => {
if (res.code == 200) {
this.workshopGroupList = [];
let workshopGroupList = res.data || {};
this.workshopGroupList=[]
- if(val=='name'){
+ if(val=='workshopObj'){
this.form.workshopGroup=''
}
if (Object.keys(workshopGroupList).length > 0) {
@@ -791,7 +790,7 @@
}
if(this.form.workshopGroup&&this.form.market&&type!='edit'){
await getCarNumber({
- workshopName:this.form.name,
+ workshopName:this.form.workshopObj.label,
marketName:this.form.market,
groupNumber:this.form.workshopGroup,
}).then((res) => {
@@ -800,10 +799,11 @@
let data = res.data?JSON.parse(JSON.stringify(res.data)) : [];
if(Object.keys(data).length>0){
for(let i in data){
- this.tableData.push({position:data[i],productId:Number(i)+1})
+ this.tableData.push({position:data[i],productId:Number(i)*2+1})
+ this.tableData.push({position:data[i],productId:Number(i)*2+2})
}
}
- this.tableList.tableData = this.tableData
+ this.tableList.tableData = this.tableData
}else{
this.tableData=[]
}
@@ -873,7 +873,7 @@
number: "",
finishDate: "",
market: "",
- name: "",
+ workshopObj: "",
spec: "",
workshopGroup: "",
circleTwo: "",
@@ -936,7 +936,8 @@
if (this.inspectID) {
params.ID = this.form.ID ? this.form.ID : Number(this.inspectID);
}
-
+ params.workshopName=this.form.workshopObj.label;
+ params.workshopNumber=this.form.workshopObj.value;
saveRegister(params)
.then((res) => {
if (res.code == 200) {
@@ -958,7 +959,9 @@
});
} else {
let paramsTwo = {
- ...form,
+ // ...form,
+ info:form,
+ items:this.tableTwoList.tableInfomation,
};
// 缂栬緫
if (this.registerId) {
--
Gitblit v1.8.0