From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaSolutionsWindow.vue | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/company/src/components/business/OperaSolutionsWindow.vue b/company/src/components/business/OperaSolutionsWindow.vue
index 324e65c..365bbd4 100644
--- a/company/src/components/business/OperaSolutionsWindow.vue
+++ b/company/src/components/business/OperaSolutionsWindow.vue
@@ -50,7 +50,7 @@
<span style="margin: 0 30px;">鍏�/浜�</span>
<el-select v-model="form.timeUnit" style="flex: 1;" placeholder="璇烽�夋嫨">
<el-option label="澶�" :value="0"></el-option>
- <el-option label="鍗婃湀" :value="1"></el-option>
+<!-- <el-option label="鍗婃湀" :value="1"></el-option>-->
<el-option label="鏈�" :value="2"></el-option>
<el-option label="骞�" :value="3"></el-option>
</el-select>
@@ -62,17 +62,22 @@
<span style="margin: 0 30px;"></span>
<el-select v-model="form.insureCycleUnit" style="flex: 1;" placeholder="璇烽�夋嫨">
<el-option label="澶�" :value="0"></el-option>
- <el-option label="鍗婃湀" :value="1"></el-option>
+<!-- <el-option label="鍗婃湀" :value="1"></el-option>-->
<el-option label="鏈�" :value="2"></el-option>
<el-option label="骞�" :value="3"></el-option>
</el-select>
</div>
</el-form-item>
- <el-form-item label="鐢熸晥鏃堕棿" prop="validType">
- <el-radio-group v-model="form.validType">
- <el-radio :label="0">鏃ュ悗鐢熸晥</el-radio>
- <el-radio :label="1">娆℃湀鐢熸晥</el-radio>
- </el-radio-group>
+ <el-form-item label="鐢熸晥鏃堕棿" prop="validTypeNum">
+ <div style="width: 100%; display: flex; align-items: center;">
+ <div style="flex-shrink: 0;">
+ <el-radio-group v-model="form.validType" @change="form.validTypeNum = ''">
+ <el-radio :label="0">鏃ュ悗鐢熸晥</el-radio>
+ <el-radio :label="1">娆℃湀鐢熸晥</el-radio>
+ </el-radio-group>
+ </div>
+ <el-input style="margin-left: 20px;" type="number" v-model="form.validTypeNum" placeholder="璇疯緭鍏ュ欢杩熷ぉ鏁�" v-if="form.validType === 0"></el-input>
+ </div>
</el-form-item>
<el-form-item label="鎶曚繚绫诲瀷" prop="type">
<el-radio-group v-model="form.type">
@@ -146,6 +151,14 @@
extends: BaseOpera,
components: { GlobalWindow },
data () {
+ var validType = (rule, value, callback) => {
+ if (this.form.validType === 0 && !value) {
+ return callback(new Error('寤惰繜澶╂暟涓嶈兘涓虹┖'));
+ } else if (!/^[0-9]*[1-9][0-9]*$/.test(value)) {
+ return callback(new Error('寤惰繜澶╂暟鍙兘涓烘鏁存暟'));
+ }
+ callback();
+ }
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -166,6 +179,7 @@
specialInfo: '',
ortherInfo: '',
signKeyword: '',
+ validTypeNum: '',
worktypeIdList: [{ worktypeId: '' }]
},
// 楠岃瘉瑙勫垯
@@ -188,8 +202,8 @@
insureCycle: [
{ required: true, message: '璇疯緭鍏ユ姇淇濆懆鏈�' }
],
- validType: [
- { required: true, message: '璇烽�夋嫨鐢熸晥鏃堕棿' }
+ validTypeNum: [
+ { required: true, validator: validType }
],
type: [
{ required: true, message: '璇烽�夋嫨鎶曚繚绫诲瀷' }
@@ -255,6 +269,10 @@
},
open (title, target) {
this.title = title
+ this.form.maxAge = ''
+ this.form.timeUnit = ''
+ this.form.insureCycleUnit = ''
+ this.form.validTypeNum = ''
this.visible = true
this.form.worktypeIdList = [{ worktypeId: '' }]
this.allCompany()
@@ -292,7 +310,7 @@
},
// 鏌ヨ鍏ㄩ儴淇濋櫓鍏徃
allCompany() {
- all({ dataType: 2 })
+ all({ dataType: 2, status: 0 })
.then(res => {
console.log(res)
this.company = res
--
Gitblit v1.9.3