From b6fde711bf33cede4cb84f85146c32b0c0c61aa5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 04 十一月 2024 09:06:28 +0800
Subject: [PATCH] 优化需求

---
 company/src/components/business/OperaSolutionsDescWindow.vue     |  119 +++--------
 company/src/views/business/solutions.vue                         |   15 +
 company/src/components/common/UploadAvatarImage.vue              |    2 
 company/src/api/business/solutionsBase.js                        |   10 +
 company/src/components/business/OperaSolutionsBaseWindow.vue     |    5 
 company/src/components/business/OperaSolutionsBaseDescWindow.vue |    9 
 company/src/components/business/OperaInsuranceWindow.vue         |   61 ++++++
 company/src/components/business/OperaSolutionsWindow.vue         |  337 +++++++-------------------------
 company/src/views/business/insurance.vue                         |   17 +
 company/.env.development                                         |    4 
 10 files changed, 210 insertions(+), 369 deletions(-)

diff --git a/company/.env.development b/company/.env.development
index 9bd1e21..d6927af 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -8,7 +8,7 @@
 VUE_APP_COOKIE_NAME='dmplat-auth-token'
 
 # 娴嬭瘯鏈�
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
 
 # 浠诲悍
-# VUE_APP_API = 'http://192.168.0.138:10030/'
+VUE_APP_API = 'http://192.168.0.138:10030/'
diff --git a/company/src/api/business/solutionsBase.js b/company/src/api/business/solutionsBase.js
index ed0f114..477706e 100644
--- a/company/src/api/business/solutionsBase.js
+++ b/company/src/api/business/solutionsBase.js
@@ -17,6 +17,16 @@
   return request.post('/business/solutionsBase/updateById', data)
 }
 
+// 鍒楄〃鏌ヨ
+export function list (data) {
+  return request.post('/business/solutionsBase/list', data)
+}
+
+// 绂佺敤鍚敤
+export function updateStatus (data) {
+  return request.post('/business/solutionsBase/updateStatus', data)
+}
+
 // 鍒犻櫎
 export function deleteById (id) {
   return request.get(`/business/solutionsBase/delete/${id}`)
diff --git a/company/src/components/business/OperaInsuranceWindow.vue b/company/src/components/business/OperaInsuranceWindow.vue
index 914aec3..71e833c 100644
--- a/company/src/components/business/OperaInsuranceWindow.vue
+++ b/company/src/components/business/OperaInsuranceWindow.vue
@@ -9,6 +9,18 @@
             <el-form-item label="淇濋櫓鍏徃" prop="name">
                 <el-input v-model="form.name" placeholder="骞冲畨淇濋櫓" v-trim/>
             </el-form-item>
+            <el-form-item label="logo" prop="logo">
+                <UploadAvatarImage :uploadData="{ folder: 'insurance' }" :file="file" @uploadSuccess="result" />
+            </el-form-item>
+            <el-form-item label="鑻辨枃鍚嶇О" prop="englishName">
+                <el-input v-model="form.englishName" maxlength="100" show-word-limit placeholder="璇疯緭鍏ヨ嫳鏂囧悕绉�" v-trim/>
+            </el-form-item>
+            <el-form-item label="鑱旂郴浜�" prop="linkName">
+                <el-input v-model="form.linkName" maxlength="10" show-word-limit placeholder="璇疯緭鍏ヨ仈绯讳汉" v-trim/>
+            </el-form-item>
+            <el-form-item label="鑱旂郴浜虹數璇�" prop="linkPhone">
+                <el-input v-model="form.linkPhone"  maxlength="11" show-word-limit placeholder="璇疯緭鍏ヨ仈绯讳汉鐢佃瘽" v-trim/>
+            </el-form-item>
             <div style="width: 100%; display: flex; align-items: center;margin-bottom: 10px;">
                 <el-button type="primary" @click="add">娣诲姞</el-button>
                 <el-button type="primary" @click="impor">瀵煎叆宸ョ</el-button>
@@ -42,6 +54,15 @@
                     </template>
                 </el-table-column>
             </el-table>
+            <el-form-item label="鐞嗚禂鎵�闇�鏉愭枡" prop="claimsInformation">
+                <RichEditor :richData="form.claimsInformation" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor" :readonly="false"/>
+            </el-form-item>
+            <el-form-item label="淇濋櫓鏀跨瓥" prop="policy">
+                <RichEditor :richData="form.policy" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor1" :readonly="false"/>
+            </el-form-item>
+            <el-form-item label="淇濋櫓鏉℃" prop="agreement">
+                <RichEditor :richData="form.agreement" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor2" :readonly="false"/>
+            </el-form-item>
         </el-form>
         <!--    涓婁紶宸ョ    -->
         <input type="file" @change="getFile" style="opacity: 0;" ref="upload" accept=".xlsx" />
@@ -51,24 +72,47 @@
 <script>
     import BaseOpera from '@/components/base/BaseOpera'
     import GlobalWindow from '@/components/common/GlobalWindow'
+    import UploadAvatarImage from '@/components/common/UploadAvatarImage'
+    import RichEditor from '@/components/common/RichEditor'
     import { importExcel, all } from '@/api/business/worktype'
 
     export default {
         name: 'OperaInsuranceWindow',
         extends: BaseOpera,
-        components: { GlobalWindow },
+        components: { GlobalWindow, UploadAvatarImage, RichEditor },
         data () {
+          var phoneRule = (rule, value, callback) => {
+            if (value) {
+                if (!/^1[3-9]\d{9}$/.test(value)) {
+                  return callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙凤紒'))
+                }
+            }
+            callback()
+          }
             return {
                 // 琛ㄥ崟鏁版嵁
                 form: {
                     id: null,
                     name: '',
+                    logo: '',
+                    englishName: '',
+                    linkName: '',
+                    linkPhone: '',
+                    agreement: '',
+                    claimsInformation: '',
+                    policy: '',
                     worktypeList: [
                         { name: '' }
                     ]
                 },
+                file: {
+                    imgurlfull: ''
+                },
                 // 楠岃瘉瑙勫垯
                 rules: {
+                  linkPhone: [
+                    { required: false, validator: phoneRule }
+                  ]
                 }
             }
         },
@@ -96,6 +140,8 @@
                     for (const key in this.form) {
                         this.form[key] = target[key]
                     }
+                    this.file.imgurlfull = target.logoFullUrl
+                    console.log(this.form)
                     all({ insuranceId: this.form.id })
                         .then(res => {
                             let arr = []
@@ -106,6 +152,19 @@
                         })
                 })
             },
+            getWangedditor(val){
+                this.form.claimsInformation = val;
+            },
+            getWangedditor1(val){
+                this.form.policy = val;
+            },
+            getWangedditor2(val){
+                this.form.agreement = val;
+            },
+            result(res) {
+              this.form.logo = res.imgurl
+              this.file.imgurlfull = res.imgurlfull
+            },
             // 瀵煎嚭妯℃澘
             exprot() {
                 window.open(process.env.VUE_APP_TYPEWORK_URL)
diff --git a/company/src/components/business/OperaSolutionsBaseDescWindow.vue b/company/src/components/business/OperaSolutionsBaseDescWindow.vue
index 852982d..7c689dc 100644
--- a/company/src/components/business/OperaSolutionsBaseDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsBaseDescWindow.vue
@@ -2,8 +2,7 @@
     <GlobalWindow
         :title="title"
         width="100%"
-        text="淇敼"
-        :withFooter="userInfo.type !== 1"
+        :withFooter="false"
         :visible.sync="visible"
         :confirm-working="isWorking"
         @confirm="$refs.operaSolutionsWindow.open('缂栬緫鏂规', form)"
@@ -22,10 +21,6 @@
                     <div class="info_list_item_label">鎵夸繚鍏徃锛�</div>
                     <div class="info_list_item_val">{{form.companyName}}</div>
                 </div>
-<!--                <div class="info_list_item">-->
-<!--                    <div class="info_list_item_label">鎶曚繚鍛ㄦ湡锛�</div>-->
-<!--                    <div class="info_list_item_val">1鏈�</div>-->
-<!--                </div>-->
                 <div class="info_list_item">
                     <div class="info_list_item_label">鎵规敼鎻愰啋鏃堕棿锛�</div>
                     <div class="info_list_item_val">{{form.correctWarnTime}}</div>
@@ -36,7 +31,7 @@
                 </div>
                 <div class="info_list_item">
                     <div class="info_list_item_label">鎵瑰噺鐢熸晥锛�</div>
-                    <div class="info_list_item_val">{{form.delOnlyReplace === 1 ? '鏄�' : '鍚�'}}</div>
+                    <div class="info_list_item_val">{{form.delValidDays||0}} 澶�</div>
                 </div>
                 <div class="info_list_item">
                     <div class="info_list_item_label">鎵规敼鏀寔锛�</div>
diff --git a/company/src/components/business/OperaSolutionsBaseWindow.vue b/company/src/components/business/OperaSolutionsBaseWindow.vue
index 24ea717..e7f597e 100644
--- a/company/src/components/business/OperaSolutionsBaseWindow.vue
+++ b/company/src/components/business/OperaSolutionsBaseWindow.vue
@@ -80,9 +80,9 @@
                     <el-input style="margin-left: 0px;" type="number" v-model="form.delValidDays"   placeholder="璇疯緭鍏ユ壒鍑忕敓鏁堟椂闂达紙澶╂暟锛�" ></el-input>
                 </div>
             </el-form-item>
-            <el-form-item label="鎵规敼鎻愰啋鏃堕棿" prop="correctWarnTime">{{form.correctWarnTime}}
+            <el-form-item label="鎵规敼鎻愰啋鏃堕棿" prop="correctWarnTime">
                 <el-time-picker
-                    value-format="HH:hh:mm"
+                    value-format="HH:mm"
                     v-model="form.correctWarnTime"
                     placeholder="璇烽�夋嫨鎵规敼鎻愰啋鏃堕棿">
                 </el-time-picker>
@@ -268,7 +268,6 @@
       confirm () {
         const data = JSON.parse(JSON.stringify(this.form))
         data.worktypeIdList = data.worktypeIdList.map(item => item.worktypeId)
-        data.correctWarnTime = data.correctWarnTime.substring(0, data.correctWarnTime.lastIndexOf(':'))
         this.$refs.form.validate((valid) => {
           if (!valid) {
             return
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index ff8ba1c..bacd9ca 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -1,9 +1,8 @@
 <template>
     <GlobalWindow
         :title="title"
-        width="70%"
-        text="淇敼"
-        :withFooter="userInfo.type !== 1"
+        width="100%"
+        :withFooter="false"
         :visible.sync="visible"
         :confirm-working="isWorking"
         @confirm="$refs.operaSolutionsWindow.open('缂栬緫鏂规', form)"
@@ -11,48 +10,21 @@
         <div class="info">
             <div class="info_list">
                 <div class="info_list_item">
-                    <div class="info_list_item_label">鏂规鍚嶇О锛�</div>
+                    <div class="info_list_item_label">瀛愭柟妗堬細</div>
                     <div class="info_list_item_val">{{form.name}}</div>
                 </div>
                 <div class="info_list_item">
-                    <div class="info_list_item_label">淇濋櫓鍏徃锛�</div>
-                    <div class="info_list_item_val">{{form.insuranceName}}</div>
+                    <div class="info_list_item_label">涓绘柟妗堬細</div>
+                    <div class="info_list_item_val"><a @click="$refs.operaSolutionsBaseDescWindow.open('涓绘柟妗堣鎯�', { id: form.parentId })" style="cursor: pointer;color: #2E68EC;">{{form.solutionBaseName}}</a></div>
                 </div>
                 <div class="info_list_item">
-                    <div class="info_list_item_label">鎵夸繚鍏徃锛�</div>
-                    <div class="info_list_item_val">{{form.companyName}}</div>
-                </div>
-              <div class="info_list_item">
-                <div class="info_list_item_label">鎶曚繚绫诲瀷锛�</div>
-                <div class="info_list_item_val" v-if="form.type === 0 "> 鐩翠繚</div>
-                <div class="info_list_item_val" v-if="form.type === 1">濮旀墭鎶曚繚</div>
-              </div>
-              <div class="info_list_item" v-if="form.type === 1">
-                <div class="info_list_item_label">濮旀墭鍟嗘埛锛�</div>
-                <div class="info_list_item_val" > {{form.shopName}}</div>
-              </div>
-                <div class="info_list_item">
-                    <div class="info_list_item_label">鎶曚繚骞撮緞锛�</div>
-                    <div class="info_list_item_val">{{form.minAge}}鑷硔{form.maxAge}}</div>
-                </div>
-                <div class="info_list_item">
-                    <div class="info_list_item_label" v-if="form.type !=1">鏂规璐圭敤锛�</div>
-                    <div class="info_list_item_label" v-else>鏈嶅姟璐圭敤锛�</div>
+                    <div class="info_list_item_label">淇濋櫓璐圭敤锛�</div>
                     <div class="info_list_item_val">
-                        {{form.price}}鍏�/浜�/
-<!--                        <span v-if="form.timeUnit === 0">澶�</span>
-                        <span v-if="form.timeUnit === 1">鍗婃湀</span>
-                        <span v-if="form.timeUnit === 2">鏈�</span>
-                        <span v-if="form.timeUnit === 3">骞�</span>-->
-                      <span v-if="form.timeUnit === 0">澶�</span>
-                      <span v-if="form.timeUnit === 2">鏈�</span>
-                      <span v-if="form.timeUnit === 3">瀛ｅ害</span>
-                      <span v-if="form.timeUnit === 4">鍗婂勾</span>
-                      <span v-if="form.timeUnit === 5">骞�</span>
+                        {{form.price}}鍏�/浜�/<template v-if="form.timeUnit === 0">澶�</template><template v-if="form.timeUnit === 2">鏈�</template><template v-if="form.timeUnit === 3">瀛ｅ害</template><template v-if="form.timeUnit === 4">鍗婂勾</template><template v-if="form.timeUnit === 5">骞�</template>
                     </div>
                 </div>
                 <div class="info_list_item">
-                    <div class="info_list_item_label">鎵规敼璁¤垂鍗曚綅锛�</div>
+                    <div class="info_list_item_label">鎵规敼璁¤垂瑙勫垯锛�</div>
                     <div class="info_list_item_val">
                         <span v-if="form.insureCycleUnit === 0">澶�</span>
                         <span v-if="form.insureCycleUnit === 1">鍗婃湀</span>
@@ -63,39 +35,27 @@
                     </div>
                 </div>
                 <div class="info_list_item">
-                    <div class="info_list_item_label">鐢熸晥鏃堕棿锛�</div>
-                    <div class="info_list_item_val">{{form.validType === 0 ? form.validTypeNum + '鏃ュ悗鐢熸晥' : '娆℃湀鐢熸晥'}}</div>
+                    <div class="info_list_item_label">鎶曚繚绫诲瀷锛�</div>
+                    <div class="info_list_item_val" v-if="form.type === 0 ">鐩翠繚</div>
+                    <div class="info_list_item_val" v-if="form.type === 1">濮旀墭鎶曚繚</div>
                 </div>
-
+                <div class="info_list_item">
+                    <div class="info_list_item_label">濮旀墭鍟嗘埛锛�</div>
+                    <div class="info_list_item_val" > {{form.shopName}}</div>
+                </div>
+                <div class="info_list_item">
+                    <div class="info_list_item_label">娲鹃仯鍗曚綅锛�</div>
+                    <div class="info_list_item_val" v-if="form.hasDispatchUnit === 1">鏃�</div>
+                    <div class="info_list_item_val" v-else-if="form.hasDispatchUnit === 0">鏈�</div>
+                </div>
                 <div class="info_list_item">
                     <div class="info_list_item_label">鎺ユ敹鏂囦欢閭锛�</div>
                     <div class="info_list_item_val">{{form.email}}</div>
                 </div>
-                <div class="info_list_item">
-                    <div class="info_list_item_label">鎵瑰鐢熸晥锛�</div>
-                    <div class="info_list_item_val">{{form.addValidDays||0}} 澶�</div>
+                <div class="info_list_item" style="width: 100%">
+                    <div class="info_list_item_label">鏂规纭涔︼細</div>
+                    <div class="info_list_item_val" ><a v-if="form.fanganFile && form.fanganFile.fileurlFull" style="cursor: pointer;color: #2E68EC" title="鐐瑰嚮鏌ョ湅" @click="openFile(form.fanganFile.fileurlFull)">{{ form.fanganFile.name || '鐐瑰嚮鏌ョ湅' }}</a></div>
                 </div>
-                <div class="info_list_item">
-                    <div class="info_list_item_label">鎵瑰噺鐢熸晥锛�</div>
-                    <div class="info_list_item_val">{{form.delValidDays||0}} 澶�</div>
-                </div>
-                <div class="info_list_item">
-                    <div class="info_list_item_label">鎵规敼鏀寔锛�</div>
-                    <div class="info_list_item_val">
-                      <span style="margin-right: 50px">鍔犱繚 <i  :class="form.canAdd ==1?'el-icon-circle-check':'el-icon-circle-close'" :style="form.canAdd ==1?'color:green;font-weight:bold':'color:red;font-weight:bold'"></i></span>
-                      <span  style="margin-right: 50px">鍑忎繚  <i   :class="form.canReduce ==1?'el-icon-circle-check':'el-icon-circle-close'" :style="form.canReduce ==1?'color:green;font-weight:bold':'color:red;font-weight:bold'"></i></span>
-                      <span>鏇存崲娲鹃仯鍗曚綅 <i   :class="form.canChangeUnit ==1?'el-icon-circle-check':'el-icon-circle-close'" :style="form.canChangeUnit ==1?'color:green;font-weight:bold':'color:red;font-weight:bold'"></i></span>
-                    </div>
-                </div>
-                <div class="info_list_item" v-if="form.insureCycleUnit===0 || (form.insureCycleUnit===form.timeUnit)">
-                    <div class="info_list_item_label">鎵规敼浠呮敮鎸佹浛鎹細</div>
-                    <div class="info_list_item_val" v-if="form.delOnlyReplace == 1">鏄�</div>
-                    <div class="info_list_item_val" v-else>鍚�</div>
-                </div>
-              <div class="info_list_item" style="width: 100%" v-if="form.type==1">
-                <div class="info_list_item_label">鏂规纭涔︼細</div>
-                <div class="info_list_item_val" ><a v-if="form.fanganFile && form.fanganFile.fileurlFull" style="cursor: pointer;color: #2E68EC" title="鐐瑰嚮鏌ョ湅" @click="openFile(form.fanganFile.fileurlFull)">{{ form.fanganFile.name || '鐐瑰嚮鏌ョ湅' }}</a></div>
-              </div>
             </div>
             <el-table
                 :data="form.worktypeList"
@@ -115,15 +75,11 @@
                     label="宸ョ鍚嶇О">
                 </el-table-column>
             </el-table>
-            <div class="info_agree">
-              <div class="info_agree_label">鐗瑰埆绾﹀畾锛�<div v-html="form.specialAgreement"></div></div>
-                <div class="info_agree_label">鐗瑰埆璇存槑锛�<div v-html="form.specialInfo"></div></div>
-                <div class="info_agree_label">鍏朵粬璇存槑锛�<div v-html="form.ortherInfo"></div></div>
-            </div>
         </div>
         <!-- 淇敼 -->
         <OperaSolutionsWindow ref="operaSolutionsWindow" @success="callback"/>
         <OperaPdfViewerWindow ref="OperaPdfViewerWindow"  />
+        <OperaSolutionsBaseDescWindow ref="operaSolutionsBaseDescWindow" />
     </GlobalWindow>
 </template>
 
@@ -132,12 +88,13 @@
 import GlobalWindow from '@/components/common/GlobalWindow'
 import OperaSolutionsWindow from '@/components/business/OperaSolutionsWindow'
 import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
+import OperaSolutionsBaseDescWindow from '@/components/business/OperaSolutionsBaseDescWindow'
 import { solutionsId } from '@/api/business/solutions'
 import { mapState } from 'vuex'
 export default {
   name: 'OperaSolutionsDescWindow',
   extends: BaseOpera,
-  components: { GlobalWindow, OperaPdfViewerWindow,OperaSolutionsWindow },
+  components: { GlobalWindow, OperaPdfViewerWindow,OperaSolutionsWindow, OperaSolutionsBaseDescWindow },
   data () {
     return {
       // 琛ㄥ崟鏁版嵁
@@ -153,8 +110,11 @@
         price: '',
         timeUnit: '',
         insureCycle: '',
+        parentId: '',
         shopName: '',
         insureCycleUnit: '',
+        hasDispatchUnit: '',
+        solutionBaseName: '',
         validTypeNum: '',
         email: '',
         canReduce: 0,
@@ -195,14 +155,17 @@
         type: 0,
         minAge: '',
         maxAge: '',
+        parentId: '',
         price: '',
         timeUnit: '',
         insureCycle: '',
+        hasDispatchUnit: '',
         shopName: '',
         insureCycleUnit: '',
         validTypeNum: '',
         email: '',
         specialAgreement: '',
+        solutionBaseName: '',
         specialInfo: '',
         ortherInfo: '',
         fanganFile: null,
@@ -255,24 +218,6 @@
 <style lang="scss" scoped>
     .info {
         width: 100%;
-        .info_agree {
-            width: 100%;
-            display: flex;
-            flex-direction: column;
-            margin-top: 20px;
-            .info_agree_label {
-                font-size: 14px;
-                font-weight: 500;
-                color: #000000;
-                margin-top: 5px;
-            }
-            .info_agree_val {
-                font-size: 14px;
-                font-weight: 500;
-                color: #000000;
-                margin-top: 5px;
-            }
-        }
         .info_label {
             width: 100%;
             display: flex;
diff --git a/company/src/components/business/OperaSolutionsWindow.vue b/company/src/components/business/OperaSolutionsWindow.vue
index 260c454..597bc1f 100644
--- a/company/src/components/business/OperaSolutionsWindow.vue
+++ b/company/src/components/business/OperaSolutionsWindow.vue
@@ -7,54 +7,30 @@
         @confirm="confirm"
     >
         <el-form :model="form" ref="form" :rules="rules">
-            <el-form-item label="鏂规鍚嶇О" prop="name">
-                <el-input v-model="form.name" placeholder="璇疯緭鍏�" v-trim/>
-            </el-form-item>
-            <el-form-item label="淇濋櫓鍏徃" prop="insuranceId">
-                <el-select v-model="form.insuranceId" @change="getAllWorktype1" placeholder="璇烽�夋嫨">
+            <el-form-item label="涓绘柟妗�" prop="parentId">
+                <el-select v-model="form.parentId" filterable @change="changeParent" placeholder="璇烽�夋嫨">
                     <el-option
-                        v-for="item in company"
+                        v-for="item in list"
                         :key="item.id"
                         :label="item.name"
                         :value="item.id">
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="鎵夸繚鍏徃" prop="companyName">
-                <el-input v-model="form.companyName" placeholder="璇疯緭鍏�" v-trim/>
+            <el-form-item label="瀛愭柟妗堝悕绉�" prop="name">
+                <el-input v-model="form.name" placeholder="璇疯緭鍏�" v-trim/>
             </el-form-item>
-            <el-form-item label="鎶曚繚骞撮緞" prop="minAge">
-                <div style="display: flex; align-items: center;">
-                    <el-select v-model="form.minAge" style="flex: 1;" placeholder="璇烽�夋嫨">
-                        <el-option
-                            v-for="item in 80"
-                            :key="item"
-                            :label="item"
-                            :value="item">
-                        </el-option>
-                    </el-select>
-                    <span style="margin: 0 30px;">鑷�</span>
-                    <el-select v-model="form.maxAge" style="flex: 1;" placeholder="璇烽�夋嫨">
-                        <el-option
-                            v-for="item in 80"
-                            :key="item"
-                            :label="item"
-                            :value="item">
-                        </el-option>
-                    </el-select>
-                </div>
-            </el-form-item>
-            <el-form-item label="鏂规璐圭敤" prop="price">
+            <el-form-item label="淇濋櫓璐圭敤" prop="price">
                 <div style="display: flex; align-items: center;">
                     <el-input v-model="form.price" style="flex: 1;" placeholder="璇疯緭鍏�" v-trim/>
                     <span style="margin: 0 30px;">鍏�/浜�</span>
                     <el-select v-model="form.timeUnit" style="flex: 1;" placeholder="璇烽�夋嫨鍛ㄦ湡鍗曚綅" @change="changeTimeUnit">
                         <el-option label="澶�" :value="0"></el-option>
-<!--                        <el-option label="鍗婃湀" :value="1"></el-option>-->
-                      <el-option label="鏈�" :value="2"></el-option>
-                      <el-option label="瀛ｅ害" :value="3"></el-option>
-                      <el-option label="鍗婂勾" :value="4"></el-option>
-                      <el-option label="骞�" :value="5"></el-option>
+                        <!--                        <el-option label="鍗婃湀" :value="1"></el-option>-->
+                        <el-option label="鏈�" :value="2"></el-option>
+                        <el-option label="瀛ｅ害" :value="3"></el-option>
+                        <el-option label="鍗婂勾" :value="4"></el-option>
+                        <el-option label="骞�" :value="5"></el-option>
                     </el-select>
                 </div>
             </el-form-item>
@@ -70,193 +46,96 @@
                     </el-select>
                 </div>
             </el-form-item>
-            <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="鎵规敼鏀寔" >
-            <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>
-              <el-checkbox :true-label="1" :false-label="0"   v-model="form.canChangeUnit">鏇存崲娲鹃仯鍗曚綅</el-checkbox>
-            </div>
-          </el-form-item>
-          <el-form-item label="鎵瑰噺鍙敮鎸佹浛鎹紙鍑忎繚鎵规敼浠呮敮鎸佹浛鎹汉鍛�,鍗冲噺淇濅汉鍛樹笉灏戜簬鍔犱繚浜哄憳鏁伴噺锛�"  prop="delOnlyReplace" v-if="form.insureCycleUnit===0 || (form.insureCycleUnit===form.timeUnit)">
-            <div style="width: 100%; display: flex; align-items: center;">
-              <el-radio-group v-model="form.delOnlyReplace">
-              <el-radio :label="1">鏄�</el-radio>
-              <el-radio :label="0">鍚�</el-radio>
-              </el-radio-group>
-            </div>
-          </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>
-            </div>
-          </el-form-item>
-          <el-form-item label="鎵瑰噺鐢熸晥锛堝ぉ鏁帮級" prop="delValidDays">
-            <div style="width: 100%; display: flex; align-items: center;">
-              <el-input style="margin-left: 0px;" type="number" v-model="form.delValidDays"   placeholder="璇疯緭鍏ユ壒鍑忕敓鏁堟椂闂达紙澶╂暟锛�" ></el-input>
-            </div>
-          </el-form-item>
             <el-form-item label="鎶曚繚绫诲瀷" prop="type">
-                <el-radio-group v-model="form.type" :disabled="form.id!=null">
-                    <el-radio :label="0" >鐩翠繚</el-radio>
+                <el-radio-group v-model="form.type" :disabled="form.id!=null" @change="form.signType = ''">
+                    <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'" :rules="form.type===1?[{required:true,message:'璇烽�夋嫨鍟嗘埛'}]:[{required:false}]">
-            <el-select v-model="form.shopId"  placeholder="璇烽�夋嫨濮旀墭鍟嗘埛">
-              <el-option
-                  v-for="item in shops"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <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="shopId" :rules="form.type === 1 ? [{required:true,message:'璇烽�夋嫨鍟嗘埛'}] : [{ required:false }]">
+                <el-select v-model="form.shopId" filterable placeholder="璇烽�夋嫨濮旀墭鍟嗘埛">
+                    <el-option
+                        v-for="item in shops"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="绛剧珷鏂瑰紡" prop="signType" v-if="form.type === 1">
+                <el-select v-model="form.signType" placeholder="璇烽�夋嫨濮旀墭鍟嗘埛">
+                    <el-option label="浼佷笟绛剧讲鍟嗘埛涓婁紶鎶曚繚鍗�" :value="0"></el-option>
+                    <el-option label="浼佷笟绛炬姇淇濈敵璇�" :value="1"></el-option>
+                    <el-option label="浼佷笟鏃犻渶绛剧珷" :value="2"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="鏈夋淳閬ｅ崟浣�" prop="hasDispatchUnit">
+                <el-radio-group v-model="form.hasDispatchUnit">
+                    <el-radio :label="0">鏈�</el-radio>
+                    <el-radio :label="1">鏃�</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="闇�瑕佸鏍�" prop="retrial">
+                <el-radio-group v-model="form.retrial">
+                    <el-radio :label="1">闇�瑕�</el-radio>
+                    <el-radio :label="0">涓嶉渶瑕�</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="涓婁紶鏂规纭涔︼細" prop="fanganFile" :rules="[{required:true,message:'璇蜂笂浼犳柟妗堢‘璁や功'}]">
+                <div>
+                    <UploadFile @remove="deleFile" :uploadData="{ folder: 'apply', fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="editFanganFile" />
+                </div>
+            </el-form-item>
             <el-form-item label="鎺ユ敹鏂囦欢閭" prop="email">
                 <el-input v-model="form.email" placeholder="璇疯緭鍏�" v-trim/>
-            </el-form-item>
-<!--            <el-form-item label="鎶曚繚鍗曠绔犲叧閿瓧锛堝鏈夊涓叧閿瓧锛岃浣跨敤鑻辨枃鍒嗗彿 ; 闅斿紑锛�" prop="signKeyword">
-                <el-input v-model="form.signKeyword" placeholder="澶氫釜鑻辨枃鍒嗗彿 ; 闅斿紑" v-trim/>
-            </el-form-item>-->
-            <el-button type="primary" @click="add">娣诲姞宸ョ</el-button>
-            <el-table
-                :data="form.worktypeIdList"
-                border
-                style="width: 100%; margin-bottom: 20px;">
-                <el-table-column
-                    label="搴忓彿"
-                    align="center"
-                    width="80">
-                    <template slot-scope="scope">
-                        <span>{{scope.$index + 1}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    align="center"
-                    label="鎵�灞炲伐绉�">
-                    <template slot-scope="{row}">
-                        <el-select filterable v-model="row.worktypeId" placeholder="璇烽�夋嫨">
-                            <el-option
-                                v-for="item in typeWork"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    label="鎿嶄綔"
-                    align="center"
-                    width="100">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <el-form-item label="鐗瑰埆绾﹀畾" prop="specialAgreement">
-                <RichEditor   :richData="form.specialAgreement" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor" :readonly="false"/>
-            </el-form-item>
-            <el-form-item label="鐗瑰埆璇存槑" prop="specialInfo">
-              <RichEditor   :richData="form.specialInfo" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor1" :readonly="false"/>
-            </el-form-item>
-          <el-form-item label="鍏朵粬璇存槑" prop="ortherInfo">
-               <RichEditor   :richData="form.ortherInfo" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor2" :readonly="false"/>
             </el-form-item>
         </el-form>
     </GlobalWindow>
 </template>
 
 <script>
-import BaseOpera from '@/components/base/BaseOpera'
-import GlobalWindow from '@/components/common/GlobalWindow'
-import { all } from '@/api/business/insurance'
-import { all as allWorktype } from '@/api/business/worktype'
-import { solutionsId } from '@/api/business/solutions'
-import { pageAll as shopList } from '@/api/business/company'
-import UploadFile from '@/components/common/UploadFile'
-import { checkMobile, numRule } from '@/utils/form'
-import RichEditor from '@/components/common/RichEditor'
-export default {
+  import BaseOpera from '@/components/base/BaseOpera'
+  import GlobalWindow from '@/components/common/GlobalWindow'
+  import { all } from '@/api/business/insurance'
+  import { solutionsId } from '@/api/business/solutions'
+  import { list } from '@/api/business/solutionsBase'
+  import { pageAll as shopList } from '@/api/business/company'
+  import UploadFile from '@/components/common/UploadFile'
+  import RichEditor from '@/components/common/RichEditor'
+
+  export default {
   name: 'OperaSolutionsWindow',
   extends: BaseOpera,
   components: { GlobalWindow, UploadFile, RichEditor },
   data () {
-    var validType = (rule, value, callback) => {
-      if (this.form.validType === 0 && !value) {
-        return callback(new Error('寤惰繜澶╂暟涓嶈兘涓虹┖'))
-      } else if (this.form.validType === 0 && !/^[0-9]*[1-9][0-9]*$/.test(value)) {
-        return callback(new Error('寤惰繜澶╂暟鍙兘涓烘鏁存暟'))
-      }
-      callback()
-    }
     return {
       // 琛ㄥ崟鏁版嵁
       form: {
         id: null,
         name: '',
-        companyName: '',
-        insuranceId: '',
-        validType: 0,
+        parentId: '',
+        signType: '',
         type: 0,
-        minAge: '',
-        maxAge: '',
         price: '',
         timeUnit: '',
         shopId: null,
-        insureCycle: '',
+        retrial: 0,
+        hasDispatchUnit: 0,
         insureCycleUnit: '',
         email: '',
-        specialAgreement: '',
-        specialInfo: '',
-        ortherInfo: '',
-        signKeyword: '',
-        validTypeNum: '',
-        canReduce: 0,
-        canChangeUnit: 0,
-        addValidDays: 0,
-        delValidDays: 0,
-        delOnlyReplace: 0,
-        canAdd: 0,
         fileList1: [],
-        fanganFile: null,
-        worktypeIdList: [{ worktypeId: '' }]
+        fanganFile: null
       },
       // 楠岃瘉瑙勫垯
       rules: {
         name: [
           { required: true, message: '璇疯緭鍏ユ柟妗堝悕绉�' }
         ],
-        delOnlyReplace: [
-          { required: true, message: '璇烽�夋嫨' }
+        parentId: [
+          { required: true, message: '璇烽�夋嫨涓绘柟妗�' }
         ],
-        addValidDays: [
-          { validator: numRule }
-        ],
-        delValidDays: [
-          { validator: numRule }
-        ],
-        insuranceId: [
-          { required: true, message: '璇烽�夋嫨淇濋櫓鍏徃' }
-        ],
-        companyName: [
-          { required: true, message: '璇疯緭鍏ユ壙淇濆叕鍙�' }
-        ],
-        minAge: [
-          { required: true, message: '璇烽�夋嫨鎶曚繚骞撮緞' }
+        signType: [
+          { required: true, message: '璇烽�夋嫨绛剧珷鏂瑰紡' }
         ],
         price: [
           { required: true, message: '璇疯緭鍏ユ柟妗堣垂鐢�' }
@@ -264,19 +143,13 @@
         insureCycleUnit: [
           { required: true, message: '璇疯緭鍏ユ壒鏀硅璐瑰崟浣�' }
         ],
-        validTypeNum: [
-          { required: true, validator: validType }
-        ],
         type: [
           { required: true, message: '璇烽�夋嫨鎶曚繚绫诲瀷' }
         ]
-        // signKeyword: [
-        //     { required: false, message: '璇疯緭鍏ユ姇淇濆崟绛剧珷鍏抽敭瀛�' }
-        // ]
       },
+      list: [],
       shops: [],
-      company: [],
-      typeWork: []
+      company: []
     }
   },
   created () {
@@ -286,24 +159,16 @@
     })
   },
   methods: {
-    getWangedditor(val){
-      this.form.specialAgreement = val;
+    changeParent(e) {
+      let name = this.list.filter(item => {
+        if (e === item.id) {
+          return item.name
+        }
+      })
+      this.form.name = name[0].name
     },
-    getWangedditor1(val){
-      this.form.specialInfo = val;
-    },
-    getWangedditor2(val){
-      this.form.ortherInfo = val;
-    },
-
-    handNumberInput (value) {
-      const regex = /^[-+]?\d*$/
-      if (!regex.test(value)) {
-        // 濡傛灉杈撳叆鐨勪笉鏄暣鏁帮紝鍒欒缃负涓婁竴涓湁鏁堢殑鏁存暟鍊�
-        this.form.addValidDays = value.replace(/[^0-9]/g, '')
-        this.form.addValidDays = value.replace(/[^0-9]/g, '')
-        this.form.delValidDays = value.replace(/[^0-9]/g, '')
-      }
+    async getList() {
+      this.list = await list({})
     },
     changeTimeUnit () {
       if (this.form.timeUnit < this.form.insureCycleUnit) {
@@ -313,15 +178,9 @@
     editFanganFile (data) {
       this.form.fanganFile = data
     },
-    // 鍒囨崲鍏徃
-    getAllWorktype1 () {
-      this.form.worktypeIdList = [{ worktypeId: '' }]
-      this.getAllWorktype()
-    },
     // 纭鏂板缓/淇敼
     confirm () {
       const data = JSON.parse(JSON.stringify(this.form))
-      data.worktypeIdList = data.worktypeIdList.map(item => item.worktypeId)
       this.$refs.form.validate((valid) => {
         if (!valid) {
           return
@@ -367,33 +226,21 @@
     open (title, target) {
       this.title = title
       this.visible = true
-      this.form.maxAge = ''
       this.form.timeUnit = ''
       this.form.insureCycleUnit = ''
-      this.form.validTypeNum = ''
       this.form.fanganFile = null
-      this.form.canReduce = 0
-      this.form.canChangeUnit = 0
-      this.form.addValidDays = 0
-      this.form.delOnlyReplace = 0
-      this.form.delValidDays = 0
-      this.form.canAdd = 0
       this.form.fileList1 = []
-      this.form.worktypeIdList = [{ worktypeId: '' }]
-      // this.$refs['$upload'].clearFiles()//鍒濆鍖栧鍏ョ粍浠�
       this.allCompany()
       this.allShops()
+      this.getList()
       // 鏂板缓
       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 = []
-          this.form.worktypeIdList = [{ worktypeId: '' }]
           this.form[this.configData['field.id']] = null
         })
         return
@@ -408,49 +255,21 @@
             if (this.form.fanganFile && this.form.fanganFile.fileurl) {
               this.form.fileList1 = [{ url: this.form.fanganFile.fileurlFull, name: this.form.fanganFile.name }]
             }
-            console.log(this.form.fileList1)
-            this.form.worktypeIdList = res.worktypeList.map(item => {
-              return {
-                worktypeId: item.worktypeId
-              }
-            })
-            this.getAllWorktype()
           })
       })
     },
-    // 鏌ヨ淇濋櫓鍏徃涓嬪叏閮ㄥ伐绉�
-    getAllWorktype () {
-      allWorktype({
-        insuranceId: this.form.insuranceId
-      }).then(res => {
-        this.typeWork = res
-      })
-    },
-
     // 鏌ヨ鍏ㄩ儴淇濋櫓鍏徃
     allCompany () {
       all({ dataType: 2, status: 0 })
         .then(res => {
-          console.log(res)
           this.company = res
         })
     },
     allShops () {
       shopList({ type: 1, status: 0 })
         .then(res => {
-          console.log(res)
           this.shops = res
         })
-    },
-    add () {
-      this.form.worktypeIdList.push({ worktypeId: '' })
-    },
-    dele (index) {
-      if (this.form.worktypeIdList.length === 1) {
-        this.$message.warning('鑷冲皯瑕佷繚鐣欎竴椤�')
-        return
-      }
-      this.form.worktypeIdList.splice(index, 1)
     }
   }
 }
diff --git a/company/src/components/common/UploadAvatarImage.vue b/company/src/components/common/UploadAvatarImage.vue
index 7d5ddae..8319d4d 100644
--- a/company/src/components/common/UploadAvatarImage.vue
+++ b/company/src/components/common/UploadAvatarImage.vue
@@ -10,7 +10,7 @@
       :on-success="handleAvatarSuccess"
       :on-error="uploadError"
       :before-upload="beforeAvatarUpload">
-      <img v-if=" file.imgurlfull" style="width: 100%;" :src="file.imgurlfull" :style="customStyle" class="avatar">
+      <img v-if="file.imgurlfull" style="width: 100%;" :src="file.imgurlfull" :style="customStyle" class="avatar">
       <div v-else :style="customStyle">
         <i class="el-icon-plus avatar-uploader-icon"></i>
         <div class="tips-style">{{ tipsLabel }}</div>
diff --git a/company/src/views/business/insurance.vue b/company/src/views/business/insurance.vue
index 1c463d6..8861143 100644
--- a/company/src/views/business/insurance.vue
+++ b/company/src/views/business/insurance.vue
@@ -27,10 +27,19 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="淇濋櫓鍏徃" min-width="100px"></el-table-column>
-                <el-table-column prop="name" label="LOGO" min-width="100px"></el-table-column>
-                <el-table-column prop="name" label="鑻辨枃鍚嶇О" min-width="100px"></el-table-column>
-                <el-table-column prop="name" label="鑱旂郴浜�" min-width="100px"></el-table-column>
-                <el-table-column prop="name" label="鑱旂郴鐢佃瘽" min-width="100px"></el-table-column>
+                <el-table-column prop="logo" label="LOGO" min-width="100px">
+                    <template slot-scope="{row}">
+                        <el-image
+                            v-if="row.logoFullUrl"
+                            style="width: 100px; height: 100px"
+                            :src="row.logoFullUrl"
+                            :preview-src-list="[row.logoFullUrl]">
+                        </el-image>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="englishName" label="鑻辨枃鍚嶇О" min-width="100px"></el-table-column>
+                <el-table-column prop="linkName" label="鑱旂郴浜�" min-width="100px"></el-table-column>
+                <el-table-column prop="linkPhone" label="鑱旂郴鐢佃瘽" min-width="100px"></el-table-column>
                 <el-table-column label="鍚敤鐘舵��" min-width="100px">
                     <template slot-scope="{row}">
                         <el-switch
diff --git a/company/src/views/business/solutions.vue b/company/src/views/business/solutions.vue
index 2186280..c65c11e 100644
--- a/company/src/views/business/solutions.vue
+++ b/company/src/views/business/solutions.vue
@@ -14,7 +14,7 @@
         <template v-slot:table-wrap>
             <ul class="toolbar" v-permissions="['business:solutions:create']">
                 <template v-if="userInfo.type !== 1">
-                    <li><el-button type="primary" @click="$refs.operaSolutionsWindow.open('鏂板缓淇濋櫓鏂规')" v-permissions="['business:solutions:create']">娣诲姞鏂规</el-button></li>
+                    <li><el-button type="primary" @click="$refs.operaSolutionsWindow.open('鏂板瀛愭柟妗�')" v-permissions="['business:solutions:create']">娣诲姞鏂规</el-button></li>
                 </template>
             </ul>
             <el-table
@@ -28,7 +28,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="瀛愭柟妗堝悕绉�" min-width="150px"></el-table-column>
-                <el-table-column prop="insuranceName" label="涓绘柟妗�" min-width="100px"></el-table-column>
+                <el-table-column prop="solutionBaseName" label="涓绘柟妗�" min-width="100px"></el-table-column>
                 <el-table-column label="鎶曚繚绫诲瀷" min-width="120px" align="center">
                     <template slot-scope="{row}">
                         <span v-if="row.type === 0">鐩翠繚</span>
@@ -46,7 +46,12 @@
                         <span v-if="row.timeUnit === 5">骞�</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="闇�瑕佸瀹�"></el-table-column>
+                <el-table-column prop="retrial" label="闇�瑕佸瀹�">
+                    <template slot-scope="{row}">
+                        <span v-if="row.retrial === 0">涓嶉渶瑕�</span>
+                        <span v-if="row.retrial === 1">闇�瑕�</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="createDate" label="鏂规鍒涘缓鏃ユ湡" min-width="100px"></el-table-column>
                 <el-table-column prop="status" label="鍚敤鐘舵��" min-width="100px" v-if="userInfo.type !== 1">
                     <template slot-scope="{row}">
@@ -67,9 +72,9 @@
                     fixed="right"
                 >
                     <template slot-scope="{row}">
-                        <el-button type="text" @click="$refs.OperaSolutionsDescWindow.open('鏂规璇︽儏', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">鏌ョ湅璇︽儏</el-button>
+                        <el-button type="text" @click="$refs.OperaSolutionsDescWindow.open('瀛愭柟妗堣鎯�', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">鏌ョ湅璇︽儏</el-button>
                         <template v-if="userInfo.type !== 1">
-                            <el-button type="text" @click="$refs.operaSolutionsWindow.open('缂栬緫淇濋櫓鏂规', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">淇敼</el-button>
+                            <el-button type="text" @click="$refs.operaSolutionsWindow.open('缂栬緫瀛愭柟妗�', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">淇敼</el-button>
                         </template>
                     </template>
                 </el-table-column>

--
Gitblit v1.9.3