vue2-client 1.15.14 → 1.15.16

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -32,26 +32,9 @@
     >
     </WorkflowDetail>
     <address-select ref="addressSelect" @setAddress="setForm"></address-select>
-    <!--  协议新增功能  -->
-    <a-modal
-      v-model="formAddContractState"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="新增"
-      :destroyOnClose="true"
-      width="55vw">
-      <x-add-native-form
-        ref="xContractForm"
-        @onSubmit="submitContract"
-      />
-      <template #footer>
-        <a-button key="back" @click="formAddContractState = false">取消</a-button>
-        <a-button key="submit" type="primary" :loading="submitContractLoading" @click="formContractSubmit">确认</a-button>
-      </template>
-    </a-modal>
     <!--  协议作废功能  -->
     <a-modal
-      v-model="formCancelState"
+      v-model="formState"
       :dialog-style="{ top: '5rem' }"
       :z-index="1001"
       title="作废"
@@ -62,55 +45,10 @@
         @onSubmit="submit"
       />
       <template #footer>
-        <a-button key="back" @click="formCancelState = false">取消</a-button>
+        <a-button key="back" @click="formState = false">取消</a-button>
         <a-button key="submit" type="primary" :loading="submitLoading" @click="formSubmit">确认</a-button>
       </template>
     </a-modal>
-    <a-modal
-      v-model="formChargeVisible"
-      :footer="null"
-      :dialog-style="{ top: '5rem' }"
-      :bodyStyle="{height:'70vh'}"
-      :z-index="1001"
-      title="新增"
-      width="70%"
-      :destroyOnClose="true">
-      <other-charge
-        :data="chargeData"
-        @cancel="cancel"
-      >
-      </other-charge>
-    </a-modal>
-    <!--  新增/编辑 用户信息  -->
-    <a-modal
-      :z-index="1001"
-      :confirm-loading="confirmLoading"
-      v-model="formModalVisible"
-      :dialog-style="{ top: '30px' }"
-      :bodyStyle="{height:'70vh'}"
-      :destroy-on-close="true"
-      :title="formTitle"
-      @ok="submitAddForm"
-      width="85vw">
-      <x-form-group
-        ref="xFormGroupDemo"
-        @x-form-item-emit-func="groupFromItemEmitFunc"
-      >
-        <template #devices="{data, index}">
-          <user-devices
-            @setRef="setRef(`nativeForm-${index}`)"
-            :ref="`nativeForm-${index}`"
-            :data="data"></user-devices>
-        </template>
-        <template #security="{data, index}">
-          <user-security
-            @setRef="setRef1(`nativeForm-${index}`)"
-            :ref="`nativeForm-${index}`"
-            :data="data"></user-security>
-        </template>
-      </x-form-group>
-    </a-modal>
-    <rent-phone @submit="rentPhoneSubmit" ref="rentPhone"></rent-phone>
   </a-card>
 </template>
 
@@ -118,38 +56,22 @@
 import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName, getConfigByNameAsync, runLogic } from 'vue2-client/src/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
 import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
-import otherCharge from '@/pages/apply/installFunction/otherCharge/index.vue'
 
-import userDevices from '@/pages/apply/userFilesManage/userDevices.vue'
-import userSecurity from '@/pages/apply/userFilesManage/userSecurity.vue'
-import rentPhone from '@/pages/apply/userFilesManage/rentPhone.vue'
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
-import { getRealKeyData } from '@vue2-client/utils/formatter'
 export default {
   name: 'Apply',
   components: {
     XFormTable,
     XAddNativeForm,
     WorkflowDetail,
-    AddressSelect,
-    otherCharge,
-    userDevices,
-    userSecurity,
-    rentPhone,
-    XFormGroup
+    AddressSelect
   },
-  // 透传给子组件的方法（目前XFormTable接了）
   provide () {
     return {
       generalFunction: {
         setCancel: this.setCancel,
-        chargeAdd: this.chargeAdd,
-        addUser: this.addUser,
-        editUser: this.editUser,
-        addContract: this.addContract,
       }
     }
   },
@@ -159,32 +81,9 @@ export default {
       queryParamsName: 'ApplyProcessCRUD',
       // 发起报建弹框控制
       applyAddFlag: false,
-      // 协议作废
-      formCancelState: false,
+      formState: false,
       submitLoading: false,
-      cancelRecord: {},
-      // 协议新增
-      formAddContractState: false,
-      submitContractLoading: false,
-      // 增值收费新增
-      formChargeVisible: false,
-      chargeData: {
-        f_workflow_id: null,
-      },
-      // 提交加载动画
-      confirmLoading: false,
-      // 是否显示详情抽屉
-      formModalVisible: false,
-      // 表单组title
-      formTitle: '新建档案',
-      // 修改备用电话列表
-      rentPhone: [],
-      // 是否修改过备用电话标识
-      isEditRentPhone: false,
-      // 修改设备列表
-      editDevices: [],
-      securityDevices: [],
-      addressdetail: '',
+      cancelRecord: {}
     }
   },
   computed: {
@@ -222,7 +121,8 @@ export default {
     },
     toDetail (record, id) {
       this.$refs.workFlow.init({
-        workflowId: record.ab_f_workflow_id
+        workflowId: record.ab_f_workflow_id,
+        stepId: record.ws_f_step_id
       })
     },
     handleFormItemEvent (func, data, value) {
@@ -232,15 +132,7 @@ export default {
       }
     },
     setForm (record) {
-      if (this.addressdetail == '新增用户') {
-        const form = {
-          f_address: record.f_address,
-          f_address_id: record.f_address_id
-        }
-        this.$refs.xFormGroupDemo.getNativeFormRef('t_userinfo')[0].setForm(form)
-      } else {
-        this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
-      }
+      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
     },
     nextClick ({ form, formStep, workflowId }) {
       console.log('success', form, formStep, workflowId)
@@ -261,7 +153,7 @@ export default {
     // 协议作废
     setCancel (record) {
       this.cancelRecord = record
-      this.formCancelState = true
+      this.formState = true
       this.$nextTick(() => {
         getConfigByName('setCancelForm', 'af-apply', (config) => {
           if (this.$refs.xCancelForm) {
@@ -286,8 +178,8 @@ export default {
         })
       })
     },
-    // 协议作废提交
     async formSubmit () {
+      this.submitLoading = true
       const formData = await this.$refs.xCancelForm.asyncSubmit()
       try {
         await this.submit(formData)
@@ -295,205 +187,18 @@ export default {
         this.$message.error('表单验证失败，请检查填写内容')
       } finally {
         this.submitLoading = false
-        // 提交成功后刷新表格
       }
     },
     async submit (formData) {
-      this.submitLoading = true
       const data = {
-        realForm: formData.realForm,
-        cancelRecord: this.cancelRecord,
-        user: this.currUser.operaInfo,
+        ...formData,
       }
-      console.log('协议作废参数', data)
-      await runLogic('setCancelLogic', data, 'af-apply').then(() => {
+      console.log('==formData', data)
+      await runLogic('暂时没有实现的logic', data, 'af-apply').then(() => {
         this.$message.success('操作成功')
-        this.formCancelState = false
-      })
-    },
-    // 增值收费新增
-    chargeAdd () {
-      this.chargeData.f_workflow_id = this.$refs.workFlow.workflowId
-      this.formChargeVisible = true
-    },
-    cancel () {
-      this.formChargeVisible = false
-      // 需要调用子孙组件的刷新方法
-      // this.$refs.xFormTable.refreshTable(true)
-    },
-    // 新增用户
-    addUser () {
-      this.formTitle = '新建档案'
-      getConfigByNameAsync('addapplyuserinfoFormGroup', 'af-apply').then(res => {
-        this.formModalVisible = true
-        this.$nextTick(
-          () => {
-            this.$refs.xFormGroupDemo.init({
-              ...res,
-              serviceName: 'af-apply',
-              showLeftTab: true,
-              businessType: '新增'
-            })
-          }
-        )
+        this.formState = false
       })
-    },
-    groupFromItemEmitFunc (func, data) {
-      console.log('func', func, data)
-      if (func === 'addRentPhone') {
-        this.$refs.rentPhone.init({
-          localVisible: true,
-          form: {
-            rentPhone: this.rentPhone.map(item => {
-              if (item.f_type === null) {
-                item.f_type = undefined
-              }
-              return item
-            })
-          }
-        })
-      } else if (func === 'selectAddress') {
-        this.addressdetail = '新增用户'
-        // 选择地址事件
-        this.$refs.addressSelect.setFormShow()
-      }
-    },
-    submitAddForm () {
-      this.confirmLoading = true
-      this.$refs.xFormGroupDemo.onSubmit().then(res => {
-        if (this.formTitle === '新建档案') {
-          res.t_userinfo.f_workflow_id = this.$refs.workFlow.workflowId
-          res.t_userfiles.f_workflow_id = this.$refs.workFlow.workflowId
-          res.t_userinfo.f_user_state = '预备'
-          res.t_userfiles.f_table_state = '待开通'
-        }
-        if (res.devices.length > 0) {
-          res.devices.forEach(row => {
-            row.f_workflow_id = this.$refs.workFlow.workflowId
-          })
-        }
-        let saveData = Object.assign(res, { divisions: this.divisions })
-        if (this.formTitle === '编辑档案') {
-          saveData = Object.assign(saveData, {
-            f_operator_record: this.currUser.name,
-            f_operatorid_record: this.currUser.id,
-            f_orgid_record: this.currUser.orgid,
-            f_orgname_record: this.currUser.orgs,
-            f_depid_record: this.currUser.depids,
-            f_depname_record: this.currUser.dops
-          })
-        }
-        // 备用电话赋值
-        if (this.isEditRentPhone) {
-          saveData = Object.assign(saveData, {
-            rentPhone: this.rentPhone
-          })
-        }
-        runLogic('userFIleSaveLogic', saveData, 'af-revenue').then(() => {
-          this.confirmLoading = false
-          this.formModalVisible = false
-          this.$message.success('操作成功')
-        }).catch(() => {
-          this.confirmLoading = false
-        })
-      }).catch(() => {
-        this.confirmLoading = false
-      })
-    },
-    rentPhoneSubmit (phones) {
-      // 提交过备用电话 视为修改过
-      this.isEditRentPhone = true
-      this.rentPhone = phones
-      this.$refs.rentPhone.init({
-        localVisible: false
-      })
-    },
-    setRef (refName) {
-      // 给表单组赋值ref
-      // 因为提交的时候 表单组需要循环便利 ref 的 提交事件
-      this.$refs.xFormGroupDemo.setRef(refName, [this.$refs[refName]])
-      this.$refs[refName].init(this.editDevices)
-    },
-    setRef1 (refName) {
-      // 给表单组赋值ref
-      // 因为提交的时候 表单组需要循环便利 ref 的 提交事件
-      this.$refs.xFormGroupDemo.setRef(refName, [this.$refs[refName]])
-      this.$refs[refName].init(this.securityDevices)
-    },
-    // 编辑档案
-    editUser (record) {
-      this.formTitle = '编辑档案'
-      const _record = getRealKeyData(record)
-      getConfigByNameAsync('addapplyuserinfoFormGroup', 'af-apply').then(configRes => {
-        runLogic('getFileDetailForEdit', {
-          f_userinfo_id: _record.f_userinfo_id
-        }, 'af-revenue').then((res) => {
-          this.formModalVisible = true
-          // 组织修改表单
-          this.$nextTick(
-            () => {
-              this.$refs.xFormGroupDemo.init({
-                ...configRes,
-                serviceName: 'af-revenue',
-                showLeftTab: true,
-                businessType: '编辑',
-                modifyModelData: res
-              })
-              this.editDevices = res.devices
-              this.securityDevices = res.security
-              this.rentPhone = res.phones
-            }
-          )
-        })
-      })
-    },
-    // 协议新增
-    addContract () {
-      this.formAddContractState = true
-      this.$nextTick(() => {
-        getConfigByName('ApplyAddContractForm', 'af-apply', (config) => {
-          if (this.$refs.xContractForm) {
-            this.$refs.xContractForm.init({
-              formItems: config.formJson,
-              title: '新增补充协议',
-              businessType: '新增',
-              showSubmitBtn: false,
-              ...config
-            })
-          } else {
-            console.error('xCancelForm组件未加载完成')
-            // 延迟重试
-            setTimeout(() => {
-              this.addContract()
-            }, 100)
-          }
-        })
-      })
-    },
-    async formContractSubmit () {
-      const formData = await this.$refs.xContractForm.asyncSubmit()
-      try {
-        await this.submitContract(formData)
-      } catch (error) {
-        this.$message.error('表单验证失败，请检查填写内容')
-      } finally {
-        this.submitContractLoading = false
-        // 提交成功后刷新表格
-      }
-    },
-    async submitContract (formData) {
-      this.submitContractLoading = true
-      const data = {
-        realForm: formData.realForm,
-        workflowId: this.$refs.workFlow.workflowId,
-        user: this.currUser.operaInfo,
-      }
-      console.log('新增协议参数', data)
-      await runLogic('AddContractLogic', data, 'af-apply').then(() => {
-        this.$message.success('操作成功')
-        this.formAddContractState = false
-      })
-    },
+    }
   }
 }
 </script>

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -43,6 +43,8 @@
                 :visible="visible"
                 :taskName="details.f_task_name"
                 :details="details"
+                :renderCurrentNode="renderCurrentNode"
+                :initStepId="initStepId"
                 @refresh="stepChanged"
                 @success="success"
                 @nextClick="nextClick"
@@ -123,6 +125,7 @@ export default {
     LeaveMessage,
     XUploadFilesView
   },
+  props: {},
   data () {
     return {
       // 页面宽度
@@ -142,7 +145,10 @@ export default {
       messageList: [],
       messageLoading: true,
       workflowId: '',
-      visible: false
+      initStepId: null,
+      visible: false,
+      // 控制流程是否可操作
+      renderCurrentNode: true
     }
   },
   expose: ['setFormValue'],
@@ -157,13 +163,13 @@ export default {
              this.steps !== undefined
     }
   },
-  props: {},
   mounted () {
     // this.init()
   },
   methods: {
     // 内部组件更新了当前步骤后的回调
     stepChanged () {
+      this.initStepId = null
       this.loading = true
       this.reload()
     },
@@ -190,6 +196,7 @@ export default {
       this.fixedQueryForm = {}
       this.steps = undefined
       this.messageList = []
+      this.currStepId = null
     },
     // 获取基础信息
     getBaseInfo () {
@@ -198,7 +205,12 @@ export default {
         workflowId: this.workflowId
       })
         .then(res => {
-          res.f_sub_state = this.steps.find(item => item.id === res.f_step_id)?.name
+          // 主动传入得优先级较高
+          if (this.currStepId) {
+            res.f_sub_state = this.steps.find(item => item.id === this.currStepId)?.name
+          } else {
+            res.f_sub_state = this.steps.find(item => item.id === res.f_step_id)?.name
+          }
           this.details = res
         }, err => {
           console.log(err)
@@ -220,9 +232,13 @@ export default {
       this.fixedAddForm.a_f_workflow_id = this.workflowId
     },
     // 初始化两张固定表
-    async init ({ workflowId, visible = true }) {
+    async init ({ workflowId, stepId, renderCurrentNode = true, visible = true }) {
       this.workflowId = workflowId
+      if (stepId) {
+        this.initStepId = stepId
+      }
       this.visible = visible
+      this.renderCurrentNode = renderCurrentNode
       await this.reload()
     },
     // 切换标签页

package/src/pages/WorkflowDetail/WorkflowPageDetail/TrimTextTail.vue

@@ -1,23 +1,23 @@
-<template>
-  <span v-if="text.length < length">{{ text }}</span>
-  <a-tooltip v-else>
-    <span slot="title">{{ text }}</span>
-    <span>{{ text.substring(0, length - 1) }}......</span>
-  </a-tooltip>
-</template>
-
-<script>
-export default {
-  name: 'TrimTextTail',
-  props: {
-    text: {
-      type: String,
-      default: ''
-    },
-    length: {
-      type: Number,
-      default: 10
-    }
-  }
-}
-</script>
+<template>
+  <span v-if="text.length < length">{{ text }}</span>
+  <a-tooltip v-else>
+    <span slot="title">{{ text }}</span>
+    <span>{{ text.substring(0, length - 1) }}......</span>
+  </a-tooltip>
+</template>
+
+<script>
+export default {
+  name: 'TrimTextTail',
+  props: {
+    text: {
+      type: String,
+      default: ''
+    },
+    length: {
+      type: Number,
+      default: 10
+    }
+  }
+}
+</script>