vue2-client 1.14.92 → 1.14.94

package/src/base-client/components/his/threeTestOrders/editor.vue

@@ -1,111 +1,111 @@
-<template>
-  <!-- 根据实际部署环境修改 editor.html 的路径 -->
-  <iframe
-    src="/his/editor/editor.html"
-    width="100%"
-    height="800"
-    frameborder="0"
-    @load="onIframeLoad"
-    ref="editorIframe">
-  </iframe>
-</template>
-
-<script setup>
-
-import { ref, onBeforeUnmount } from 'vue'
-
-const editorIframe = ref(null)
-const checkEditorTimer = ref(null)
-const checkCount = ref(0)
-const editor = ref(null)
-const iframeWindow = ref(null)
-// 对外暴露的获取editor方法
-const getEditor = () => {
-  if (editor.value) {
-    return editor.value
-  }
-  if (iframeWindow.value && iframeWindow.value.editor) {
-    editor.value = iframeWindow.value.editor
-    return editor.value
-  }
-  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
-    editor.value = editorIframe.value.contentWindow.editor
-    return editor.value
-  }
-  return null
-}
-// 创建体温单方法
-const createVitalSigns = (data) => {
-  const editorObj = getEditor()
-  if (!editorObj) {
-    throw new Error('editor对象未初始化，无法创建体温单')
-  }
-  if (typeof editorObj.createVitalSigns === 'function') {
-    return editorObj.createVitalSigns(data)
-  } else {
-    throw new Error('editor对象未包含createVitalSigns方法')
-  }
-}
-
-// 检查editor对象是否已初始化
-const startEditorCheck = (frameWindow, iframe) => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-  checkCount.value = 0
-  checkEditorTimer.value = setInterval(() => {
-    checkCount.value++
-    try {
-      const editorObj = frameWindow.editor
-      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
-        clearInterval(checkEditorTimer.value)
-        editor.value = editorObj
-        // 将editor对象暴露到全局
-        window.iframeEditor = editorObj
-        window.iframeWindow = frameWindow
-        // 触发事件
-        emit('editor-ready', editorObj)
-        emit('load', { target: iframe, editor: editorObj })
-        // 发送消息通知
-        window.parent.postMessage({ type: 'editorReady' }, '*')
-      }
-    } catch (err) {
-      console.error('检查editor对象时出错:', err)
-    }
-    if (checkCount.value >= 20) {
-      clearInterval(checkEditorTimer.value)
-      console.error('Editor 对象加载失败')
-    }
-  }, 500)
-}
-// iframe加载完成的处理
-const onIframeLoad = (e) => {
-  const iframe = e.target
-  const frameWindow = iframe.contentWindow
-  iframeWindow.value = frameWindow
-  if (!frameWindow) {
-    console.error('无法访问 iframe 内容')
-    return
-  }
-  startEditorCheck(frameWindow, iframe)
-}
-// 组件销毁前清理
-onBeforeUnmount(() => {
-  if (checkEditorTimer.value) {
-    clearInterval(checkEditorTimer.value)
-  }
-})
-// 暴露方法给父组件
-defineExpose({ getEditor, createVitalSigns })
-
-// 定义事件
-const emit = defineEmits(['editor-ready', 'load'])
-</script>
-
-<style scoped>
-iframe {
-  border: none;
-  width: 100%;
-  min-height: 800px;
-}
-</style>
+<template>
+  <!-- 根据实际部署环境修改 editor.html 的路径 -->
+  <iframe
+    src="/his/editor/editor.html"
+    width="100%"
+    height="800"
+    frameborder="0"
+    @load="onIframeLoad"
+    ref="editorIframe">
+  </iframe>
+</template>
+
+<script setup>
+
+import { ref, onBeforeUnmount } from 'vue'
+
+const editorIframe = ref(null)
+const checkEditorTimer = ref(null)
+const checkCount = ref(0)
+const editor = ref(null)
+const iframeWindow = ref(null)
+// 对外暴露的获取editor方法
+const getEditor = () => {
+  if (editor.value) {
+    return editor.value
+  }
+  if (iframeWindow.value && iframeWindow.value.editor) {
+    editor.value = iframeWindow.value.editor
+    return editor.value
+  }
+  if (editorIframe.value && editorIframe.value.contentWindow && editorIframe.value.contentWindow.editor) {
+    editor.value = editorIframe.value.contentWindow.editor
+    return editor.value
+  }
+  return null
+}
+// 创建体温单方法
+const createVitalSigns = (data) => {
+  const editorObj = getEditor()
+  if (!editorObj) {
+    throw new Error('editor对象未初始化，无法创建体温单')
+  }
+  if (typeof editorObj.createVitalSigns === 'function') {
+    return editorObj.createVitalSigns(data)
+  } else {
+    throw new Error('editor对象未包含createVitalSigns方法')
+  }
+}
+
+// 检查editor对象是否已初始化
+const startEditorCheck = (frameWindow, iframe) => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+  checkCount.value = 0
+  checkEditorTimer.value = setInterval(() => {
+    checkCount.value++
+    try {
+      const editorObj = frameWindow.editor
+      if (editorObj && typeof editorObj.createVitalSigns === 'function') {
+        clearInterval(checkEditorTimer.value)
+        editor.value = editorObj
+        // 将editor对象暴露到全局
+        window.iframeEditor = editorObj
+        window.iframeWindow = frameWindow
+        // 触发事件
+        emit('editor-ready', editorObj)
+        emit('load', { target: iframe, editor: editorObj })
+        // 发送消息通知
+        window.parent.postMessage({ type: 'editorReady' }, '*')
+      }
+    } catch (err) {
+      console.error('检查editor对象时出错:', err)
+    }
+    if (checkCount.value >= 20) {
+      clearInterval(checkEditorTimer.value)
+      console.error('Editor 对象加载失败')
+    }
+  }, 500)
+}
+// iframe加载完成的处理
+const onIframeLoad = (e) => {
+  const iframe = e.target
+  const frameWindow = iframe.contentWindow
+  iframeWindow.value = frameWindow
+  if (!frameWindow) {
+    console.error('无法访问 iframe 内容')
+    return
+  }
+  startEditorCheck(frameWindow, iframe)
+}
+// 组件销毁前清理
+onBeforeUnmount(() => {
+  if (checkEditorTimer.value) {
+    clearInterval(checkEditorTimer.value)
+  }
+})
+// 暴露方法给父组件
+defineExpose({ getEditor, createVitalSigns })
+
+// 定义事件
+const emit = defineEmits(['editor-ready', 'load'])
+</script>
+
+<style scoped>
+iframe {
+  border: none;
+  width: 100%;
+  min-height: 800px;
+}
+</style>

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

@@ -209,10 +209,10 @@
             </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>
   </div>
@@ -257,33 +257,56 @@ export default {
     ...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
@@ -476,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 => {
@@ -686,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,
@@ -735,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 () {
       // 获取当前步骤的按钮组配置
@@ -750,6 +785,7 @@ export default {
     async activeStep (stepId) {
       // 开启加载
       this.loadingHistory = true
+      this.activeStepId = stepId
       // 获取激活节点的步骤名
       this.activeStepName = this.getStepNameByStepId(stepId)
       // 清空回显数据
@@ -764,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') {
@@ -840,7 +879,7 @@ export default {
       //   return false
       // }
       const stepHandler = this.getStepHandler()
-      if (!stepHandler) {
+      if (this.needSelectPerson && !this.checkedChargePerson) {
         this.$message.error('请设置下一环节处理人')
         return false
       }
@@ -898,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')
     },
@@ -979,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 }
             })

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>