From f6722e13ba28cd292c162df9292bb3418ba12bec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OperaSolutionsBaseWindow.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/company/src/components/business/OperaSolutionsBaseWindow.vue b/company/src/components/business/OperaSolutionsBaseWindow.vue
index cc85ee2..8f33007 100644
--- a/company/src/components/business/OperaSolutionsBaseWindow.vue
+++ b/company/src/components/business/OperaSolutionsBaseWindow.vue
@@ -62,7 +62,7 @@
<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="canAdd">
+<!-- <el-form-item label="鎵规敼鏀寔" prop="canAdd">
<div style="width: 100%; display: flex; align-items: center;">
<el-checkbox :true-label="1" :false-label="0" v-model="form.canAdd">鍔犱繚</el-checkbox>
<el-checkbox :true-label="1" :false-label="0" v-model="form.canReduce">鍑忎繚</el-checkbox>
@@ -76,7 +76,7 @@
<el-radio :label="0">鍚�</el-radio>
</el-radio-group>
</div>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="鎵瑰鐢熸晥锛堝ぉ鏁帮級" prop="addValidDays" v-if="form.delOnlyReplace != 1">
<div style="width: 100%; display: flex; align-items: center;">
<el-input style="margin-left: 0px;" type="number" v-model="form.addValidDays" placeholder="璇疯緭鍏ユ壒澧炵敓鏁堟椂闂达紙澶╂暟锛�" ></el-input>
@@ -254,12 +254,12 @@
specialInfo: '',
ortherInfo: '',
validTypeNum: '',
+ canAdd: 0,
canReduce: 0,
canChangeUnit: 0,
+ delOnlyReplace: 0,
addValidDays: 0,
delValidDays: 0,
- delOnlyReplace: 0,
- canAdd: 0,
saveType: '0',
correctWarnTime: '',
worktypeIdList: [],
@@ -312,9 +312,9 @@
worktypeIdList: [
{ required: true, validator: validatorWorktype }
],
- canAdd: [
- { required: true, validator: canAddFun }
- ]
+ // canAdd: [
+ // { required: true, validator: canAddFun }
+ // ]
},
shops: [],
company: [],
--
Gitblit v1.9.3