From 2a922b25e71b4e9926ac8758c9404190e3ceb134 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 10 四月 2024 17:47:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silk-web
---
src/views/systemSetting/workshopManage/components/addDialog.vue | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/views/systemSetting/workshopManage/components/addDialog.vue b/src/views/systemSetting/workshopManage/components/addDialog.vue
index 06bebec..3f12c07 100644
--- a/src/views/systemSetting/workshopManage/components/addDialog.vue
+++ b/src/views/systemSetting/workshopManage/components/addDialog.vue
@@ -6,14 +6,14 @@
width="30%"
:before-close="handleClose">
<el-form :inline="true" label-width="20%" style="width: 100%;" :model="editConfig.infomitton" :rules="rules" ref="ruleForm" >
- <el-form-item prop="workshopNumber" label="杞﹂棿" style="width: 100%;" >
+ <el-form-item prop="workshop" label="杞﹂棿" style="width: 100%;" >
<el-select
- :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.workshopNumber" placeholder="璇烽�夋嫨杞﹂棿">
+ :disabled="this.editConfig.dialogTitle==='鏌ョ湅'" v-model="editConfig.infomitton.workshop" value-key="name" placeholder="璇烽�夋嫨杞﹂棿">
<el-option
v-for="item in workshopList"
:key="item.ID"
:label="item.name"
- :value="item.ID">
+ :value="item">
</el-option>
</el-select>
</el-form-item>
@@ -21,7 +21,7 @@
<el-form-item label="缁勫埆" style="width: 100%;"
prop="groupNumber" >
<!-- <el-input-number
- v-model="form.workshopNumber"
+ v-model="form.workshop"
placeholder="璇疯緭鍏ョ粍鍒�"
:controls="false"
style="width: 100%; margin-right: 5px;text-align:left;"
@@ -107,14 +107,6 @@
data() {
return {
editConfig:this.editDiaConfig,
- form: {
- workshopNumber:null,
- groupNumber:null,
- startCarNumber:null,
- endCarNumber:null,
- carFlag:null,
- notes:null
- },
workshopList:[],
carFlagList:[
{id:1,name:"宸﹀崐杞�"},
@@ -122,7 +114,7 @@
{id:3,name:"鍏ㄨ溅缁撴潫"},
],
rules: {
- workshopNumber: [
+ workshop: [
{ required: true, message: '璇烽�夋嫨杞﹂棿', trigger: 'change' }
],
groupNumber: [
@@ -155,13 +147,13 @@
},
setParams(){
let params={
- workshopNumber:this.editConfig.infomitton.workshopNumber+'',
+ workshopNumber:this.editConfig.infomitton.workshop.ID+"",
+ workshopName:this.editConfig.infomitton.workshop.name,
groupNumber:Number(this.editConfig.infomitton.groupNumber),
startCarNumber:Number(this.editConfig.infomitton.startCarNumber),
endCarNumber:Number(this.editConfig.infomitton.endCarNumber),
carFlag:Number(this.editConfig.infomitton.carFlag),
notes:this.editConfig.infomitton.notes,
- // id:Number(this.editConfig.infomitton.workshopId),
}
return params
},
@@ -181,8 +173,10 @@
}
})
}else if(this.editConfig.dialogTitle==="淇敼"){
- this.editConfig.infomitton.workshopNumber=this.editConfig.infomitton.workshopNumber+""
- saveWorkshopManage(this.editConfig.infomitton).then((res)=>{
+ saveWorkshopManage({
+ ...params,
+ id:this.editConfig.infomitton.ID
+ }).then((res)=>{
if(res&&res.code===200){
this.editConfig.visible=false
this.$message({
--
Gitblit v1.8.0