vue2-client 1.14.91 → 1.14.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.91",
+  "version": "1.14.93",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/AmapMarker/index.js

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering

package/src/base-client/components/common/XDetailsView/index.js

@@ -1,3 +1,3 @@
-import XDetailsView from './XDetailsView'
-
-export default XDetailsView
+import XDetailsView from './XDetailsView'
+
+export default XDetailsView

package/src/base-client/components/common/XFormGroupDetails/index.js

@@ -1,3 +1,3 @@
-import XFormGroupDetails from './XFormGroupDetails'
-
-export default XFormGroupDetails
+import XFormGroupDetails from './XFormGroupDetails'
+
+export default XFormGroupDetails

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,47 +1,93 @@
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="示例页面"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template slot="button">
+        <a-button @click="add">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
+  </a-card>
+</template>
+
 <script>
 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, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
 
 export default {
-  name: 'WorkFlowDemo',
-  components: { WorkflowDetail },
-  mounted () {
-    this.$refs.workFlow.init({
-      workflowId: '58'
-    })
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'applyCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
   },
   methods: {
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId
-     */
-    success ({ note, form, workflowId }) {
-      console.log('success', note, form, workflowId)
+    add () {
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
+        }
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
     },
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId 工作流id
-     * @param fromStepId 起ID
-     * @param toStepId 往ID
-     * @param successStepId 完成步骤id
-     * @param successStep 完成步骤名称
-     * @param fromStep 起步骤名称
-     * @param toStep 往步骤名称
-     */
-    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
-      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
+    success () {
+      console.log('完工')
+    },
+    nextClick(data) {
+      console.log('提交下一步', data)
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.twf_id
+      })
     }
   }
 }
 </script>
-
-<template>
-  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
-</template>
-
-<style scoped lang="less">
-
-</style>

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -27,9 +27,9 @@
       ref="workFlow"
       @success="success"
       @x-form-item-emit-func="handleFormItemEvent"
-      @address-selected="handleAddressSelected"
     >
     </WorkflowDetail>
+    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
   </a-card>
 </template>
 
@@ -39,13 +39,15 @@ import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XF
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
+import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
 
 export default {
   name: 'Apply',
   components: {
     XFormTable,
     XAddNativeForm,
-    WorkflowDetail
+    WorkflowDetail,
+    AddressSelect
   },
   data () {
     return {
@@ -94,11 +96,11 @@ export default {
     handleFormItemEvent (func, data, value) {
       console.log('打印一下：', func, data, value)
       if (func === 'selectAddress') {
-        this.$refs.workFlow.openAddressSelect()
+        this.$refs.addressSelect.setFormShow()
       }
     },
-    handleAddressSelected (record) {
-      this.$refs.workFlow.setAddress({ address: record.f_address })
+    setForm (record) {
+      this.$refs.workFlow.setFormValue({ address: record.f_address })
     }
   }
 }

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -49,7 +49,6 @@
                   @success="success"
                   @nextClick="nextClick"
                   @x-form-item-emit-func="handleFormItemEvent"
-                  @address-selected="handleAddressSelected"
                   class="handle-content"
                 />
               </template>
@@ -154,7 +153,7 @@ export default {
       visible: false
     }
   },
-  expose: ['setAddress', 'openAddressSelect'],
+  expose: ['setFormValue'],
   computed: {
     ...mapState('account', { currUser: 'user' }),
     ...mapState('setting', ['isMobile'])
@@ -249,15 +248,8 @@ export default {
     handleFormItemEvent (func, data, value) {
       this.$emit('x-form-item-emit-func', func, data, value)
     },
-    handleAddressSelected (record) {
-      this.$emit('address-selected', record)
-    },
-    // 选择地址弹出框方法
-    openAddressSelect () {
-      this.$refs.workflowHandle.$refs.addressSelect.setFormShow()
-    },
     // 给地址选择表单项赋值
-    setAddress (record) {
+    setFormValue (record) {
       this.$refs.workflowHandle.$refs.xAddForm.setForm(record)
     }
   }

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

@@ -209,13 +209,12 @@
             </a-form-item>
           </a-form>
         </a-tab-pane>
-        <a-tab-pane v-if="canSubmit && !beforeStepActive && showPrevBtn && !workflowState" key="3" tab="工单拆分">
-          <!--   分配工单   -->
+        <!--        <a-tab-pane v-if="canSubmit && !beforeStepActive && showPrevBtn && !workflowState" key="3" tab="工单拆分">
+          &lt;!&ndash;   分配工单   &ndash;&gt;
           <workflow-list-resolution :workflow-project-id="workflowId" :details="details"></workflow-list-resolution>
-        </a-tab-pane>
+        </a-tab-pane>-->
       </a-tabs>
     </template>
-    <address-select ref="addressSelect" @selAddress="setFormValue"></address-select>
   </div>
 </template>
 
@@ -239,7 +238,6 @@ import * as util from '@vue2-client/utils/util'
 import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
 import WorkFlowPreview from './WorkFlowPreview'
-import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
 
 export default {
   name: 'WorkFlowHandle',
@@ -253,40 +251,62 @@ export default {
     FilePreview,
     FileItem,
     ImageItem,
-    WorkFlowPreview,
-    AddressSelect
+    WorkFlowPreview
   },
   computed: {
     ...mapState('account', { currUser: 'user' }),
     canSubmit () {
       // 对于超级管理员直接认为可以提交
-      if (this.currUser.name === '超级管理员') {
+      if (this.currUser.ename === '1') {
         return true
       }
       // currentStepId可能还没初始化，此处拿不到先返回false
       if (!this.currentStepId) {
         return false
       }
-      const step = this.stepsForChild[this.currentStepId - 1]
-      // 检查handler是否包含当前用户
-      if (step && step.handler) {
-        return step.handler.includes(this.currUser.name)
-      }
-      // 检查角色和部门权限
-      if (step && step.properties && step.properties.chargePerson) {
-        if (step.properties.chargePerson.personList && step.properties.chargePerson.personList.length > 0) {
+      // 如果当前选中节点不是正在进行的节点，则判断viewers权限
+      if (this.activeStepId !== this.currentStepId) {
+        const activeStep = this.stepsForChild[this.activeStepId - 1]
+        const viewers = activeStep?.properties?.otherProperty?.viewers ?? []
+        if (viewers.length > 0) {
           // 使用some方法判断当前人员是否满足任一条件
-          return step.properties.chargePerson.personList.some(item => {
+          return viewers.some(item => {
             if (item.type === 'role') {
               // 检查rolestr是否存在并包含指定角色
-              return this.currUser.rolestr && this.currUser.rolestr.includes(item.name)
+              return this.currUser.rolestr && this.currUser.rolestr.split(',').includes(item.name)
             }
             if (item.type === 'department') {
-              // 检查parentname是否存在并包含指定部门
-              return this.currUser.parentname && this.currUser.parentname.includes(item.name)
+              // 检查depname是否存在并包含指定部门
+              return this.currUser.depname && this.currUser.deps.includes(item.name)
             }
             return false
           })
+        } else {
+          return true
+        }
+      } else {
+        const step = this.stepsForChild[this.currentStepId - 1]
+        // 检查角色和部门权限
+        if (step && step.properties && step.properties.chargePerson) {
+          if (step.properties.chargePerson.personList && step.properties.chargePerson.personList.length > 0) {
+            // 使用some方法判断当前人员是否满足任一条件
+            return step.properties.chargePerson.personList.some(item => {
+              if (item.type === 'role') {
+                // 检查rolestr是否存在并包含指定角色
+                return this.currUser.rolestr && this.currUser.rolestr.split(',').includes(item.name)
+              }
+              if (item.type === 'department') {
+                // 检查parentname是否存在并包含指定部门
+                return this.currUser.parentname && this.currUser.parentname.includes(item.name)
+              }
+              return false
+            })
+          }
+        }
+
+        // 检查handler是否包含当前用户
+        if (step && step.handler) {
+          return step.handler.includes(this.currUser.name)
         }
       }
       return false
@@ -479,6 +499,8 @@ export default {
         .then(res => {
           res.state = this.stepsForChild[res.id - 1].name
           this.currentStepId = res.id
+          // 获取到当前步骤后复制下一步时间
+          this.deadline = this.getDefaultDeadline(this.stepsForChild[this.currentStepId - 1].properties?.otherProperty?.nextNodeInterval)
           this.currentStep = res
           this.getDirection()
         }, err => {
@@ -689,6 +711,7 @@ export default {
         this.showForm = true
         this.$nextTick(() => {
           this.$refs.xAddForm && this.$refs.xAddForm.init({
+            ...properties.form,
             businessType: '修改',
             formItems: this.stepDefine,
             layout: properties.form.xAddFormLayout,
@@ -738,6 +761,15 @@ export default {
         }
       }
     },
+    // 获取表单字段实际值
+    getRealKey (key, isHandleFormKey) {
+      if (key === 'selected_id') return key
+      if (isHandleFormKey) {
+        return key.substring(key.indexOf('_') + 1)
+      } else {
+        return key
+      }
+    },
     // 加载完成
     resolveStep () {
       // 获取当前步骤的按钮组配置
@@ -753,6 +785,7 @@ export default {
     async activeStep (stepId) {
       // 开启加载
       this.loadingHistory = true
+      this.activeStepId = stepId
       // 获取激活节点的步骤名
       this.activeStepName = this.getStepNameByStepId(stepId)
       // 清空回显数据
@@ -767,10 +800,13 @@ export default {
         formCompletedDataPreview = JSON.parse(JSON.stringify(this.formCompletedData))
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名
         const formData = formCompletedDataPreview.data
+        const isKeyHandle = this.stepsDefine[stepId - 1]?.properties?.form?.isKeyHandle || false
         for (const key in formData) {
           for (let i = 0; i < this.targetStepDefine.length; i++) {
             const stepDefine = this.targetStepDefine[i]
-            if (key === stepDefine.model) {
+            // 兼容下旧代码，这里是否处理key根据表单配置中的isKeyHandle来决定，也有另一种情况如果处理完的key在表单中已经重复会将未处理的key直接存进去（新增表单的逻辑）
+            // 所以两种都判断下命中任意一个都算
+            if (key === this.getRealKey(stepDefine.model, isKeyHandle) || key === stepDefine.model) {
               if (!['FilesId', 'Images'].includes(key)) {
                 // 读取字典值
                 if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
@@ -843,7 +879,7 @@ export default {
       //   return false
       // }
       const stepHandler = this.getStepHandler()
-      if (!stepHandler) {
+      if (this.needSelectPerson && !this.checkedChargePerson) {
         this.$message.error('请设置下一环节处理人')
         return false
       }
@@ -901,9 +937,9 @@ export default {
       })
     },
     // 获取默认截止时间
-    getDefaultDeadline () {
+    getDefaultDeadline (day = 1) {
       const date = new Date()
-      date.setDate(date.getDate() + 1)
+      date.setDate(date.getDate() + day)
       date.setHours(date.getHours() + 2)
       return formatDate(date, 'yyyy-MM-dd hh:mm')
     },
@@ -982,7 +1018,7 @@ export default {
           if (personItem.type === 'role') {
             // 根据角色获取人员
             filteredUsers = allUser.filter(user =>
-              user.rolestr && user.rolestr.includes(personItem.name)
+              user.rolestr && user.rolestr.split(',').includes(personItem.name)
             ).map(user => {
               return { label: user.label, value: user.value }
             })
@@ -1042,9 +1078,6 @@ export default {
     },
     formItemEmitFunc (func, data, value) {
       this.$emit('x-form-item-emit-func', func, data, value)
-    },
-    setFormValue (record) {
-      this.$emit('address-selected', record)
     }
   },
   watch: {}

package/src/pages/addressSelect/addressDemo.vue

@@ -1,24 +1,24 @@
-<template>
-  <!--  测试界面——测试地址选择新增组件-->
-  <div>
-    <a-button @click="open">打开选择地址弹窗</a-button>
-    <address-select :addressShow="showDialog"/>
-  </div>
-</template>
-
-  <script>
-  import AddressSelect from '@/pages/addressSelect'
-
-  export default {
-    components: { AddressSelect },
-    data: () => ({
-      showDialog: false
-    }),
-    methods: {
-      open () {
-        console.log('打开选择地址弹窗')
-        this.showDialog = true
-      }
-    }
-  }
-  </script>
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>

package/src/pages/addressSelect/index.vue

@@ -60,7 +60,7 @@ export default {
         f_address_id: record.tua_id
       }
       console.log('选择了地址是', form)
-      this.$emit('selAddress', form)
+      this.$emit('setAddress', form)
       this.selectAddressVisible = false
     },
     addAddress () {

package/src/router/async/router.map.js

@@ -55,9 +55,6 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
@@ -68,10 +65,9 @@ routerResource.example = {
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
+  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonexampleDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),

package/vue.config.js

@@ -11,12 +11,12 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://aote-office.8866.org:31567'
+const v3Server = 'http://192.168.50.67:31567'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
 // const revenue = 'http://aote-office.8866.org:31567'
-const revenue = 'http://aote-office.8866.org:31567'
+const revenue = 'http://192.168.50.67:31567'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川