From caeb71b06d19a8ffd854c19e5e4b58f7180cdce8 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 29 四月 2024 18:55:14 +0800
Subject: [PATCH] 纤度检验表的保存接口参数修改
---
src/views/employeeSalary/salaryPlan/components/addDialog.vue | 136 ++++++++++++++++++++++++++++++++-------------
1 files changed, 96 insertions(+), 40 deletions(-)
diff --git a/src/views/employeeSalary/salaryPlan/components/addDialog.vue b/src/views/employeeSalary/salaryPlan/components/addDialog.vue
index d78d102..6fd49ea 100644
--- a/src/views/employeeSalary/salaryPlan/components/addDialog.vue
+++ b/src/views/employeeSalary/salaryPlan/components/addDialog.vue
@@ -35,9 +35,9 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item prop="salaryType" label="钖祫绫诲瀷">
+ <el-form-item prop="salaryTypeId" label="钖祫绫诲瀷">
<el-select
- v-model="form.salaryType"
+ v-model="form.salaryTypeId"
style="width: calc(100% - 40px)"
placeholder="璇烽�夋嫨杞﹂棿"
>
@@ -45,7 +45,7 @@
v-for="item in unitList"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
>
</el-option>
</el-select>
@@ -142,7 +142,7 @@
v-if="item.type == 2"
class="el-icon-setting margin_left_5px cursor_pointer"
style="font-size: 18px; color: gray"
- @click="handleConstSetShow(2)"
+ @click="handleConstSetShow(10)"
></i>
</div>
</div>
@@ -169,7 +169,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="cancel" @click="cancelMethod()">鍙栨秷</el-button>
- <el-button type="primary" @click="submitForm('form')">纭� 瀹�</el-button>
+ <el-button type="primary" :loading="isAddloading" @click="submitForm('form')">纭� 瀹�</el-button>
</span>
</el-dialog>
<BomDialog
@@ -181,15 +181,15 @@
<SilkSetDialog
ref="silkSetDialog"
@confirmValueSave="confirmValueSave"
- :editRow="form"
+ :editRow="{wildSilkList:wildSilkList}"
title="閰嶇疆"
></SilkSetDialog>
<ConstantSetDialog
ref="constantSetDialog"
@confirmValueSave="confirmValueSave"
:constType="constType"
- :editRow="form"
- :title="constType == 2 ? '閰嶇疆' : '杈撳叆'"
+ :editRow="constType == 10?{absenteeism:absenteeism}:form"
+ :title="constType == 10 ? '閰嶇疆' : '杈撳叆'"
></ConstantSetDialog>
</div>
</template>
@@ -221,13 +221,15 @@
form: {
name: "",
workTypes: [],
- salaryType: "",
+ salaryTypeId: null,
salaryFormula: "",
salaryFormulaHtml: "",
error: "",
- purchaseTypeList: [1],
- cycle: "1",
},
+ // 婊″嫟濂栬缃�
+ absenteeism:{value:1,id:null},
+ // 璁剧疆閲庣氦鐨勭敓涓濇爣鍑�
+ wildSilkList: {value:'閲庣氦',id:null},
activeName: 1,
formulaName: [
{
@@ -323,7 +325,7 @@
trigger: ["blur", "change"],
},
],
- salaryType: [
+ salaryTypeId: [
{ required: true, message: "璇烽�夋嫨", trigger: ["blur", "change"] },
],
salaryFormulaHtml: [
@@ -332,11 +334,14 @@
},
unitList: [],
constType: "",
+ isAddloading: false,
};
},
computed: {},
created() {
this.handleGetBomKindDictList();
+ this.handleGetBomKindDictList(9);
+ this.handleGetBomKindDictList(10);
this.getSelectDataList();
},
mounted() {},
@@ -359,12 +364,10 @@
this.form = {
name: "",
workTypes: [],
- salaryType: "",
+ salaryTypeId: null,
salaryFormula: "",
salaryFormulaHtml: "",
error: "",
- purchaseTypeList: [1],
- cycle: "1",
};
this.$nextTick(() => {
this.$refs["form"].resetFields();
@@ -375,8 +378,7 @@
: "";
this.form.salaryFormulaHtml = "";
this.form.salaryFormula = "";
- this.form.purchaseTypeList = [1];
- let arr = salaryFormula ? salaryFormula.split("锛�") : [];
+ let arr = salaryFormula ? salaryFormula.split(",") : [];
this.getSalaryFormulaHtml(arr);
}
});
@@ -418,7 +420,7 @@
name +
"</span>";
}
- this.form.salaryFormula = this.form.salaryFormula + name + "锛�";
+ this.form.salaryFormula = this.form.salaryFormula + name + ",";
this.form.salaryFormulaHtml = this.form.salaryFormulaHtml + string;
this.$forceUpdate();
},
@@ -426,7 +428,7 @@
let salaryFormula = this.form.salaryFormula
? this.form.salaryFormula
: "";
- let arr = salaryFormula.split("锛�");
+ let arr = salaryFormula.split(",");
arr = arr.splice(0, arr.length - 1);
arr = arr.splice(0, arr.length - 1);
this.form.salaryFormulaHtml = "";
@@ -437,7 +439,7 @@
if (this.form.salaryFormula) {
let string = true;
let isString = "+-*/";
- let arr = this.form.salaryFormula.split("锛�");
+ let arr = this.form.salaryFormula.split(",");
arr = arr.splice(0, arr.length - 1);
for (let i = 0; i < arr.length; i++) {
if (arr[i] != "") {
@@ -494,10 +496,22 @@
}
},
confirmValueSave(form, type) {
- if (type == 1) {
- this.form.purchaseTypeList = form.purchaseTypeList;
- } else if (type == 2) {
- this.form.cycle = form.cycle + "";
+ if (type == 9) {
+ let wildSilkList = form.wildSilkList;
+ this.handleConfirmSave([
+ {
+ name:wildSilkList.join(','),
+ id:this.wildSilkList.id
+ }
+ ],type)
+ } else if (type == 10) {
+ let absenteeism = form.absenteeism + "";
+ this.handleConfirmSave([
+ {
+ name:absenteeism,
+ id:this.absenteeism.id
+ }
+ ],type)
} else if (type == 3) {
this.formulaClick(
{
@@ -511,11 +525,15 @@
},
// 閲庣氦鏁伴噺
handleSlikSetShow() {
+ this.handleGetBomKindDictList(9);
this.$refs.silkSetDialog.islook = true;
},
// 婊″嫟濂�
handleConstSetShow(val) {
this.constType = val;
+ if(val==10){
+ this.handleGetBomKindDictList(10);
+ }
this.$refs.constantSetDialog.islook = true;
},
// 鍗曚綅
@@ -523,24 +541,66 @@
this.handleGetBomKindDictList();
this.$refs.editDialog.editDialogVisible = true;
},
- handleConfirmSave(dataList) {
- saveSalaryType({
- type: 8,
- values: dataList,
- }).then((res) => {
+ handleConfirmSave(dataList,val) {
+ let params={}
+ if(val==9||val==10){
+ params={
+ type: val,
+ values: dataList,
+ }
+ }else{
+ params={
+ type: 8,
+ values: dataList,
+ }
+ }
+ this.isAddloading = true;
+ saveSalaryType(params).then((res) => {
if (res.code == 200) {
this.$message({
message: "鎿嶄綔鎴愬姛锛�",
type: "success",
});
- this.$refs.editDialog.editDialogVisible = false;
- this.handleGetBomKindDictList();
+ if(val==9){
+ this.$refs.silkSetDialog.islook = false;
+ }else if(val==10){
+ this.$refs.constantSetDialog.islook = false;
+ }else{
+ this.$refs.editDialog.editDialogVisible = false;
+ }
+ this.handleGetBomKindDictList(val?val:'');
}
+ this.isAddloading = false;
+ }).catch(() => {
+ setTimeout(() => {
+ this.isAddloading = false;
+ }, 3000);
});
},
- handleGetBomKindDictList() {
- getSalaryTypeList({ type: 8 }).then((res) => {
- this.unitList = res.data;
+ handleGetBomKindDictList(val) {
+ getSalaryTypeList({ type: val?val:8 }).then((res) => {
+ if(val==9){
+ // 閲庣氦鐨勭敓涓濇爣鍑嗛厤缃�
+ this.wildSilkList=(res.data&&res.data.length>0)?{
+ ...res.data[0],
+ value:res.data[0].name.split(',')||[]
+ }:{
+ id:null,
+ value:['閲庣氦']
+ }
+ }else if(val==10){
+ // 鑰冨嫟閰嶇疆
+ this.absenteeism=(res.data&&res.data.length>0)?{
+ ...res.data[0],
+ value:res.data[0].name||1
+ }:{
+ id:null,
+ value:1
+ }
+ }else{
+ this.unitList = res.data;
+ }
+
});
},
getSelectDataList() {
@@ -570,13 +630,9 @@
return true;
}
let form = JSON.parse(JSON.stringify(this.form));
- let arr = form.salaryFormula.split("锛�");
+ let arr = form.salaryFormula.split(",");
arr = arr.splice(0, arr.length - 1);
- form.salaryFormula = arr.join("锛�");
- if (form.purchaseTypeList.length == 0) {
- this.$message.error("璇风偣鍑婚噹绾ゆ暟閲忛厤缃敓涓濇爣鍑嗭紒");
- return true;
- }
+ form.salaryFormula = arr.join(",");
let workTypes = [];
if (form.workTypes && form.workTypes.length > 0) {
for (let i in form.workTypes) {
--
Gitblit v1.8.0