修改问题

src/views/main/BookingLedger/detail/modules/rightContent.vue

@@ -3,6 +3,7 @@
     <a-card :bodyStyle="tstyle" :bordered="false">
       <div class="title"><i class="iconfont icon-ERP_zhuyi"></i><span>注意事项</span>
         <a-icon class="rule-icon" @click="handleOpenRule({}, 1)" type="setting" theme="filled" />
+        <a-icon type="reload" @click="checkFun" title="重新校验" style="color: rgb(30,144,255);margin-left: 10px;cursor: pointer;" />
       </div>
       <div class="content">
         <div class="tip" v-if="excuteRules.length > 0">
@@ -348,23 +349,28 @@
           <a-form-item v-if="roleData.ruleNotice" label="规则提示">
             {{ roleData.ruleNotice }}
           </a-form-item>
-          <a-form-item label="意见类型">
+          <a-form-item v-if="type==1" label="意见类型">
             <a-select
-              v-decorator="[
-                'opinionType',
-                { rules: [{ required: true, message: '请选择意见类型!' }] },
-              ]"
               placeholder="请选择意见类型"
+              default-value="ADD"
               style="width: 200px;margin-right: 10px;">
-              <a-select-option v-if="type === 2" value="MODIFY">
-                修改
-              </a-select-option>
-              <a-select-option v-if="type === 1" value="ADD">
+              <a-select-option value="ADD">
                 新增
               </a-select-option>
             </a-select>
             <span>当前状态:{{ ruleLog.length > 0 ? ruleLog[0].statusName : '' }}</span>
           </a-form-item>
+          <a-form-item v-if="type==2" label="意见类型">
+            <a-select
+              placeholder="请选择意见类型"
+              default-value="MODIFY"
+              style="width: 200px;margin-right: 10px;">
+              <a-select-option value="MODIFY">
+                修改
+              </a-select-option>
+            </a-select>
+            <span>当前状态:{{ ruleLog.length > 0 ? ruleLog[0].statusName : '' }}</span>
+          </a-form-item>
           <a-form-item label="意见内容">
             <a-textarea
               style="line-height: 20px;"
@@ -652,7 +658,7 @@ export default {
           const data = {
             'ruleName': this.roleData.ruleName,
             'ruleNotice': this.roleData.ruleNotice,
-            'opinionType': values.opinionType,
+            'opinionType': this.type == 1 ? 'ADD' : 'MODIFY',
             'opinionContent': values.opinionContent
           }
           SubmitRule0pinion(data).then(res => {

src/views/main/SendCar/addForm.vue

@@ -1074,7 +1074,9 @@ export default {
             item.contactName = item.contactName ? item.contactName : ''
             contact += item.contactName + item.contactTel
             if (index1 != this.selectedRowKeys.length - 1) {
-              contact += '+'
+              if (this.addrList[this.selectedRowKeys[index1 + 1]].contactName || this.addrList[this.selectedRowKeys[index1 + 1]].contactTel) {
+                contact += '+'
+              }
             }
           }
         })

src/views/system/ServiceBase/addForm.vue

@@ -42,11 +42,16 @@
                     {{ ite.name }}
                   </a-select-option>
                 </a-select>
-                <a-input-number style="margin-right: 10px;" :precision="0" v-if="item.operType=='DATE_NEXT_DAY'" v-model="item.OperTypeVal" :min="1" />
+                <a-input-number
+                  style="margin-right: 10px;"
+                  :precision="0"
+                  v-if="item.operType == 'DATE_NEXT_DAY'"
+                  v-model="item.operTypeVal"
+                  :min="1" />
                 <span>于是触发</span>
-                <a class="blur" v-if="item.nextActionTypeName" @click="handleOpenMexAction(index)">{{
+                <a class="blur" v-if="item.nextActionTypeName" @click="handleOpenMexAction(item, index, 2)">{{
                   item.nextActionTypeName }}</a>
-                <a class="blur" v-else @click="handleOpenMexAction(index)">选择</a>
+                <a class="blur" v-else @click="handleOpenMexAction(item, index, 1)">选择</a>
                 <span @click="handleDelAddCondit(index)" style="cursor: pointer;"><a-icon type="delete" /></span>
               </div>
               <div class="conditRow">
@@ -72,7 +77,7 @@
         <a-button @click="handleUnable" type="danger">
           取消启用
         </a-button>
-        <a-button type="danger" @click="handleSaveEditCondit">
+        <a-button type="primary" @click="handleSaveEditCondit">
           保存并启用
         </a-button>
       </template>
@@ -167,8 +172,8 @@
 </template>
 <script>
 import {
-  workFlowSetEnable, workFlowSetUnPublishRelease, workFlowSaveAndEnable,
-  workFlowSetUnDelete, GetInfoBase, StatusSkuBaseSavAndEnable, projectQueryList,
+  SetUnEnableBase, workFlowSetUnPublishRelease, workFlowSaveAndEnable,
+  DeleteBase, GetInfoBase, StatusSkuBaseSavAndEnable, projectQueryList,
   QueryActivitiesList, QueryListStatus, SaveWFActivities, CreateLiquidExpression,
   GetShowTimeLine, BaseQueryList, GetTriggerOperTypeList, GetTriggerNextActionTypeList, SaveAndEnableStatusTriggerBase
 } from '@/api/modular/system/appManage'
@@ -337,13 +342,16 @@ export default {
       }
     },
     handleDelete() {
-      workFlowSetUnDelete([this.form.pkId]).then(res => {
+      this.confirmLoading = true
+      DeleteBase([this.editConditForm.pkId]).then(res => {
         if (res.data.ext[0].succ) {
           this.$message.success('删除成功')
-          this.visible = false
+          this.addEditBaseFlag = false
           this.$emit('ok')
+          this.confirmLoading = false
         } else {
           this.$message.error(res.data.ext[0].msg)
+          this.confirmLoading = false
         }
       })
     },
@@ -367,19 +375,24 @@ export default {
       this.condItIndex = index
       this.conditAct = ''
     },
-    handleOpenMexAction(index) {
+    handleOpenMexAction(item, index, type) {
       this.mexActionFlag = true
       this.mexActionIndex = index
-      this.mexActionForm = {
-        nextActList: []
+      if (item.serviceActivitiesID) {
+        this.mexActionForm = item
+      }
+      if (type == 1) {
+        this.mexActionForm = {
+          nextActList: []
+        }
       }
     },
     handleUnable() {
-      workFlowSetEnable([this.form.pkId]).then(res => {
+      SetUnEnableBase([this.editConditForm.pkId]).then(res => {
         if (res.data.ext[0].succ) {
           this.$message.success('取消启用成功')
           this.$emit('ok')
-          this.visible = false
+          this.addEditBaseFlag = false
         } else {
           this.$message.error(res.data.ext[0].msg)
         }
@@ -401,7 +414,15 @@ export default {
       this.confirmLoading = true
       GetInfoBase({ pkId: record.pkId }).then(res => {
         if (res.data.succ) {
+          if (res.data.ext.conditionList) {
+            res.data.ext.conditionList.forEach(item => {
+            if (item.operTypeVal) {
+              item.operTypeVal = Number(item.operTypeVal)
+            }
+          })
+          }
           this.editConditForm = res.data.ext
+          console.log(this.editConditForm)
         } else {
           this.$message.error(res.data.msg)
         }
@@ -494,9 +515,9 @@ export default {
       })
     },
     handleSaveEditCondit() {
-      this.confirmLoading = true
       this.$refs.editConditForm.validate(valid => {
         if (valid) {
+          this.confirmLoading = true
           SaveAndEnableStatusTriggerBase(this.editConditForm).then(res => {
             if (res.data.succ) {
               if (this.editConditForm.pkId) {

src/views/system/ServiceFlow/addForm.vue

@@ -334,14 +334,13 @@
                 {{ item.statusTriggerName }}
               </a-select-option>
             </a-select>
-            <a @click="handleIntoBase" style="margin-right: 20px;">引入</a>
             <a @click="addBase">添加</a>
           </a-form-model-item>
         </a-form-model>
       </div>
       <template slot="footer">
-        <a-button type="primary" @click="handleSaveAddActive">
-          确定
+        <a-button type="primary" @click="handleIntoBase">
+          引入
         </a-button>
         <a-button @click="baseAddFlag = false">
           关闭
@@ -417,6 +416,12 @@
                   {{ ite.name }}
                 </a-select-option>
               </a-select>
+              <a-input-number
+                style="margin-right: 10px;"
+                :precision="0"
+                v-if="item.operType == 'DATE_NEXT_DAY'"
+                v-model="item.operTypeVal"
+                :min="1" />
               <span>于是触发</span>
               <a class="blur" v-if="item.nextActionTypeName" @click="handleOpenMexAction(index)">{{
                 item.nextActionTypeName }}</a>
@@ -534,7 +539,7 @@
 </template>
 <script>
 import {
-  workFlowSetEnable, workFlowSetUnPublishRelease, workFlowSaveAndEnable,
+  workFlowSetEnable, workFlowSetUnPublishRelease, workFlowSaveAndEnable, workFlowSetUnEnable,
   workFlowSetUnDelete, workFlowGetInfo, StatusSkuBaseSavAndEnable, projectQueryList,
   QueryActivitiesList, QueryListStatus, SaveWFActivities, CreateLiquidExpression,
   GetShowTimeLine, BaseQueryList, GetTriggerOperTypeList, GetTriggerNextActionTypeList, SaveAndEnableStatusTriggerBase
@@ -748,7 +753,7 @@ export default {
       this.mexActionIndex = index
     },
     handleUnable() {
-      workFlowSetEnable([this.form.pkId]).then(res => {
+      workFlowSetUnEnable([this.form.pkId]).then(res => {
         if (res.data.ext[0].succ) {
           this.$message.success('取消启用成功')
           this.$emit('ok')