From 3e72240f9926463bba8d2d5cbec743dbcdcf9bd3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 07 四月 2024 16:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaSolutionsWindow.vue | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/company/src/components/business/OperaSolutionsWindow.vue b/company/src/components/business/OperaSolutionsWindow.vue
index c48dbfe..61d2a8d 100644
--- a/company/src/components/business/OperaSolutionsWindow.vue
+++ b/company/src/components/business/OperaSolutionsWindow.vue
@@ -80,12 +80,12 @@
</div>
</el-form-item>
<el-form-item label="鎶曚繚绫诲瀷" prop="type">
- <el-radio-group v-model="form.type">
- <el-radio :label="0">鐩翠繚</el-radio>
+ <el-radio-group v-model="form.type" :disabled="form.id!=null">
+ <el-radio :label="0" >鐩翠繚</el-radio>
<el-radio :label="1">濮旀墭鎶曚繚</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="濮旀墭鍟嗘埛" prop="shopId" v-if="form.type =='1'">
+ <el-form-item label="濮旀墭鍟嗘埛" prop="shopId" v-if="form.type =='1'" :rules="form.type===1?[{required:true,message:'璇烽�夋嫨鍟嗘埛'}]:[{required:false}]">
<el-select v-model="form.shopId" placeholder="璇烽�夋嫨濮旀墭鍟嗘埛">
<el-option
v-for="item in shops"
@@ -95,8 +95,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="涓婁紶鏂规纭涔︼細" prop="fanganFile" v-if="form.type =='1'">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="editFanganFile" />
+ <el-form-item label="涓婁紶鏂规纭涔︼細" prop="fanganFile" v-if="form.type =='1'" :rules="form.type===1?[{required:true,message:'璇蜂笂浼犳柟妗堢‘璁や功'}]:[{required:false}]">
+ <UploadFile @remove="deleFile" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="editFanganFile" />
</el-form-item>
<el-form-item label="鎺ユ敹鏂囦欢閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏�" v-trim/>
@@ -258,6 +258,10 @@
if (!valid) {
return
}
+ if(data.type===1 && (!data.fanganFile || !data.fanganFile.fileurl)){
+ this.$message.error('璇蜂笂浼犳柟妗堢‘璁や功锛�')
+ return;
+ }
// 璋冪敤鏂板缓鎺ュ彛
this.isWorking = true
if (data.id == null || data.id === '') {
@@ -289,13 +293,16 @@
}
})
},
+ deleFile(){
+ this.form.fanganFile={}
+ },
open (title, target) {
this.title = title
+ this.visible = true
this.form.maxAge = ''
this.form.timeUnit = ''
this.form.insureCycleUnit = ''
this.form.validTypeNum = ''
- this.visible = true
this.form.fanganFile=null
this.form.fileList1= new Array();
this.form.worktypeIdList = [{ worktypeId: '' }]
@@ -306,6 +313,13 @@
if (target == null) {
this.$nextTick(() => {
this.$refs.form.resetFields()
+ this.form.maxAge = ''
+ this.form.timeUnit = ''
+ this.form.insureCycleUnit = ''
+ this.form.validTypeNum = ''
+ this.form.fanganFile=null
+ this.form.fileList1= new Array();
+ this.form.worktypeIdList = [{ worktypeId: '' }]
this.form[this.configData['field.id']] = null
})
return
@@ -338,6 +352,7 @@
this.typeWork = res
})
},
+
// 鏌ヨ鍏ㄩ儴淇濋櫓鍏徃
allCompany () {
all({ dataType: 2, status: 0 })
--
Gitblit v1.9.3