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/enterprise/OperaInsuranceApplyAddWindow.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
index 98b1247..c68bccc 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
@@ -10,7 +10,7 @@
<div class="list">
<el-form :inline="true" ref="form" :model="form" :rules="rules" class="demo-form-inline">
<el-form-item label="淇濋櫓鏂规" prop="solutionId">
- <el-select v-model="form.solutionId" filterable @change="changeSolution" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.solutionId" :disabled="title === '缁繚'" filterable @change="changeSolution" placeholder="璇烽�夋嫨">
<el-option
v-for="item in company"
:key="item.id"
@@ -331,7 +331,7 @@
},
// 鑾峰彇鎶曚繚璇︽儏
getDetails () {
- findList({ applyId: this.form.id })
+ findList({ applyId: this.form.id, applyStatus: 1 })
.then(res => {
res.forEach(item => {
console.log(item)
@@ -544,7 +544,7 @@
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
- this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.tableData, price: this.price, solutionId: this.form.solutionId, companyId: this.form.companyId })
+ this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.tableData, price: this.price, solutionId: this.form.solutionId, hasDispatchUnit: this.item.hasDispatchUnit, companyId: this.userInfo.type === 1 ? this.userInfo.companyId : this.form.companyId })
},
uploadUser () {
if (!this.form.solutionId) {
--
Gitblit v1.9.3