vue2-client 1.15.85 → 1.15.86

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

@@ -1,188 +1,188 @@
-<template>
-  <div class="workflow-log-container">
-    <a-spin size="large" :spinning="spinning">
-      <a-empty v-if="!logList.length" description="暂无流转记录" />
-      <a-steps v-else direction="vertical" progress-dot class="steps">
-        <a-step v-for="(log, index) in logList" :key="log.id" status="finish">
-          <template #title>
-            <span class="log-title">{{ log.operation }}</span>
-          </template>
-          <template #subTitle>
-            <span class="log-sub-title">{{ getDesc(log.desc) }}</span>
-          </template>
-          <template #description>
-            <div :class="['log-card', index === 0 ? 'first-card' : '']">
-              <div class="log-description">
-                <div class="log-item">
-                  <a-icon type="user" />
-                  <span>操作人: <span class="highlight">{{ log.operator }}</span></span>
-                </div>
-                <div class="log-item" v-if="log.set_handler">
-                  <a-icon type="solution" />
-                  <span>设定下一环节处理者: <span class="highlight">{{ log.set_handler }}</span></span>
-                </div>
-                <div class="log-item" v-if="log.set_deadline">
-                  <a-icon type="clock-circle" />
-                  <span>设定下一环节截止时间: <span class="highlight">{{ log.set_deadline }}</span></span>
-                </div>
-                <div class="log-item" v-if="log.notes">
-                  <a-icon type="message" />
-                  <span>备注: <span class="highlight">{{ log.notes }}</span></span>
-                </div>
-                <div class="log-item log-time">
-                  <a-icon type="calendar" />
-                  <span>操作时间: <span class="highlight">{{ log.date }}</span></span>
-                </div>
-              </div>
-            </div>
-          </template>
-        </a-step>
-      </a-steps>
-    </a-spin>
-  </div>
-</template>
-
-<script>
-import { postByServiceName } from '@vue2-client/services/api/restTools'
-import { workFlowViewApi } from '@vue2-client/services/api/workFlow'
-
-export default {
-  name: 'WorkflowLog',
-  props: {
-    workflowId: {
-      type: [String, Number],
-      required: true
-    }
-  },
-  data () {
-    return {
-      logList: [],
-      spinning: true
-    }
-  },
-  mounted () {
-    postByServiceName(workFlowViewApi.getWorkFlowLog, {
-      workflowId: this.workflowId
-    }).then(res => {
-      this.logList = res
-      this.spinning = false
-    })
-  },
-  methods: {
-    getDesc (desc) {
-      return desc.replace('&gt;', '>')
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.workflow-log-container {
-  padding: 16px;
-  background-color: #f9fafc;
-  border-radius: 8px;
-  min-height: 300px;
-}
-
-.steps {
-  padding: 8px 12px;
-
-  ::v-deep {
-    .ant-steps-item {
-      padding-bottom: 24px;
-    }
-
-    .ant-steps-item-container {
-      .ant-steps-item-tail {
-        &::after {
-          background-color: #e8eef7;
-          width: 2px;
-        }
-      }
-    }
-
-    .ant-steps-item-icon {
-      .ant-steps-icon-dot {
-        background: #1890ff;
-        box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
-        transition: all 0.3s;
-      }
-    }
-
-    .ant-steps-item:hover .ant-steps-icon-dot {
-      transform: scale(1.2);
-      box-shadow: 0 0 0 4px rgba(24, 144, 255, 0.2);
-    }
-
-    .ant-steps-item-content {
-      width: calc(100% - 24px);
-      margin-top: -4px;
-      .ant-steps-item-title {
-        display: flex;
-        align-items: center;
-      }
-    }
-
-    .log-title {
-      font-size: 18px;
-      font-weight: 600;
-      color: #262626;
-      transition: color 0.3s;
-    }
-
-    .log-sub-title {
-      margin-left: 8px;
-      color: #8c8c8c;
-      font-size: 14px;
-      font-weight: normal;
-    }
-
-    .log-card {
-      margin: 12px 0 0 0;
-      padding: 16px;
-      background-color: white;
-      border-radius: 8px;
-      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-      transition: all 0.3s;
-      border-left: 3px solid #1890ff;
-
-      &:hover {
-        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
-        transform: translateY(-2px);
-      }
-
-      &.first-card {
-        border-left: 3px solid #52c41a;
-      }
-    }
-
-    .log-description {
-      color: #595959;
-      font-size: 14px;
-      line-height: 1.8;
-    }
-
-    .log-item {
-      display: flex;
-      align-items: center;
-      margin-bottom: 8px;
-
-      .anticon {
-        margin-right: 8px;
-        color: #8c8c8c;
-      }
-
-      &.log-time {
-        margin-top: 12px;
-        padding-top: 12px;
-        border-top: 1px dashed #f0f0f0;
-      }
-    }
-
-    .highlight {
-      color: #262626;
-      font-weight: 600;
-    }
-  }
-}
-</style>
+<template>
+  <div class="workflow-log-container">
+    <a-spin size="large" :spinning="spinning">
+      <a-empty v-if="!logList.length" description="暂无流转记录" />
+      <a-steps v-else direction="vertical" progress-dot class="steps">
+        <a-step v-for="(log, index) in logList" :key="log.id" status="finish">
+          <template #title>
+            <span class="log-title">{{ log.operation }}</span>
+          </template>
+          <template #subTitle>
+            <span class="log-sub-title">{{ getDesc(log.desc) }}</span>
+          </template>
+          <template #description>
+            <div :class="['log-card', index === 0 ? 'first-card' : '']">
+              <div class="log-description">
+                <div class="log-item">
+                  <a-icon type="user" />
+                  <span>操作人: <span class="highlight">{{ log.operator }}</span></span>
+                </div>
+                <div class="log-item" v-if="log.set_handler">
+                  <a-icon type="solution" />
+                  <span>设定下一环节处理者: <span class="highlight">{{ log.set_handler }}</span></span>
+                </div>
+                <div class="log-item" v-if="log.set_deadline">
+                  <a-icon type="clock-circle" />
+                  <span>设定下一环节截止时间: <span class="highlight">{{ log.set_deadline }}</span></span>
+                </div>
+                <div class="log-item" v-if="log.notes">
+                  <a-icon type="message" />
+                  <span>备注: <span class="highlight">{{ log.notes }}</span></span>
+                </div>
+                <div class="log-item log-time">
+                  <a-icon type="calendar" />
+                  <span>操作时间: <span class="highlight">{{ log.date }}</span></span>
+                </div>
+              </div>
+            </div>
+          </template>
+        </a-step>
+      </a-steps>
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import { postByServiceName } from '@vue2-client/services/api/restTools'
+import { workFlowViewApi } from '@vue2-client/services/api/workFlow'
+
+export default {
+  name: 'WorkflowLog',
+  props: {
+    workflowId: {
+      type: [String, Number],
+      required: true
+    }
+  },
+  data () {
+    return {
+      logList: [],
+      spinning: true
+    }
+  },
+  mounted () {
+    postByServiceName(workFlowViewApi.getWorkFlowLog, {
+      workflowId: this.workflowId
+    }).then(res => {
+      this.logList = res
+      this.spinning = false
+    })
+  },
+  methods: {
+    getDesc (desc) {
+      return desc.replace('&gt;', '>')
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.workflow-log-container {
+  padding: 16px;
+  background-color: #f9fafc;
+  border-radius: 8px;
+  min-height: 300px;
+}
+
+.steps {
+  padding: 8px 12px;
+
+  ::v-deep {
+    .ant-steps-item {
+      padding-bottom: 24px;
+    }
+
+    .ant-steps-item-container {
+      .ant-steps-item-tail {
+        &::after {
+          background-color: #e8eef7;
+          width: 2px;
+        }
+      }
+    }
+
+    .ant-steps-item-icon {
+      .ant-steps-icon-dot {
+        background: #1890ff;
+        box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+        transition: all 0.3s;
+      }
+    }
+
+    .ant-steps-item:hover .ant-steps-icon-dot {
+      transform: scale(1.2);
+      box-shadow: 0 0 0 4px rgba(24, 144, 255, 0.2);
+    }
+
+    .ant-steps-item-content {
+      width: calc(100% - 24px);
+      margin-top: -4px;
+      .ant-steps-item-title {
+        display: flex;
+        align-items: center;
+      }
+    }
+
+    .log-title {
+      font-size: 18px;
+      font-weight: 600;
+      color: #262626;
+      transition: color 0.3s;
+    }
+
+    .log-sub-title {
+      margin-left: 8px;
+      color: #8c8c8c;
+      font-size: 14px;
+      font-weight: normal;
+    }
+
+    .log-card {
+      margin: 12px 0 0 0;
+      padding: 16px;
+      background-color: white;
+      border-radius: 8px;
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+      transition: all 0.3s;
+      border-left: 3px solid #1890ff;
+
+      &:hover {
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+        transform: translateY(-2px);
+      }
+
+      &.first-card {
+        border-left: 3px solid #52c41a;
+      }
+    }
+
+    .log-description {
+      color: #595959;
+      font-size: 14px;
+      line-height: 1.8;
+    }
+
+    .log-item {
+      display: flex;
+      align-items: center;
+      margin-bottom: 8px;
+
+      .anticon {
+        margin-right: 8px;
+        color: #8c8c8c;
+      }
+
+      &.log-time {
+        margin-top: 12px;
+        padding-top: 12px;
+        border-top: 1px dashed #f0f0f0;
+      }
+    }
+
+    .highlight {
+      color: #262626;
+      font-weight: 600;
+    }
+  }
+}
+</style>

package/src/pages/WorkflowDetail/WorkflowPageDetail/components/WorkflowPersonSelector.vue

@@ -1,109 +1,109 @@
-<template>
-  <div v-if="workflowHandleWrap.needSelectPerson">
-    <!-- 多分支选择（包含WF_RESULT的条件分支或并行分支的情况） -->
-    <template v-if="workflowHandleWrap.needMultipleBranchSelection && workflowHandleWrap.branchNodes.length > 0">
-      <template v-for="node in workflowHandleWrap.branchNodes">
-        <a-form-item
-          v-if="node.needSelectPerson"
-          :key="node.stepId"
-          :label="`${node.stepName}处理人`"
-          required
-        >
-          <a-select
-            :value="getBranchPersonValue(node.stepId)"
-            :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-            @change="setBranchPersonValue(node.stepId, $event, node.chargePersonOptions)"
-            :placeholder="`请选择${node.stepName}的处理人`"
-            :options="node.chargePersonOptions"
-            :filter-option="filterOption"
-            style="width: 195px"
-            show-search
-          >
-            <a-select-option v-for="option in node.chargePersonOptions" :key="option.value" :value="option.value">
-              {{ option.label }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-      </template>
-    </template>
-
-    <!-- 单分支选择（前台可计算的情况） -->
-    <a-form-item v-else :label="getBranchSelectionLabel()" required>
-      <a-select
-        v-model="workflowHandleWrap.checkedChargePerson"
-        placeholder="请选择或搜索"
-        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-        :options="workflowHandleWrap.chargePersonOptions"
-        @change="setBranchPersonValue(workflowHandleWrap.calculatedTargetNode, $event, workflowHandleWrap.chargePersonOptions)"
-        :filter-option="filterOption"
-        style="width: 195px"
-        show-search
-      />
-      <!--      <div v-if="workflowHandleWrap.calculatedTargetNode" style="margin-top: 8px; color: #52c41a; font-size: 12px;">-->
-      <!--        <a-icon type="check-circle"/>-->
-      <!--        根据当前表单数据，将进入：{{ workflowHandleWrap.getStepNameByStepId(workflowHandleWrap.calculatedTargetNode) }}-->
-      <!--      </div>-->
-    </a-form-item>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'WorkflowPersonSelector',
-  inject: ['workflowHandleWrap'],
-  data () {
-    return {}
-  },
-  mounted () {
-  },
-  methods: {
-    // 选择框过滤
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
-
-    // 获取分支处理人值
-    getBranchPersonValue (stepId) {
-      if (!this.workflowHandleWrap.branchChargePersons) {
-        // 确保 branchChargePersons 对象存在
-        this.$set(this.workflowHandleWrap, 'branchChargePersons', {})
-      }
-      const value = this.workflowHandleWrap.branchChargePersons[stepId]?.handlerId
-      console.log('获取分支处理人值:', stepId, value)
-      return value
-    },
-
-    // 设置分支处理人值
-    setBranchPersonValue (stepId, value, options) {
-      if (!stepId) return
-      if (!this.workflowHandleWrap.branchChargePersons) {
-        this.$set(this.workflowHandleWrap, 'branchChargePersons', {})
-      }
-      // 使用 $set 确保响应式更新
-      this.$set(this.workflowHandleWrap.branchChargePersons, stepId, Object.assign({ ...this.workflowHandleWrap.branchChargePersons[stepId] }, {
-        handler: options.find(item => item.value === value).label,
-        handlerId: value
-      }))
-      // 强制更新组件
-      this.$forceUpdate()
-    },
-
-    // 获取分支选择标签文本
-    getBranchSelectionLabel () {
-      if (this.workflowHandleWrap.needMultipleBranchSelection) {
-        return '分支节点处理人选择'
-      } else if (this.workflowHandleWrap.calculatedTargetNode) {
-        return `请选择${this.workflowHandleWrap.getStepNameByStepId(this.workflowHandleWrap.calculatedTargetNode)}处理人`
-      } else {
-        return '下一环节处理人'
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-// 组件样式已集成到表单中，无需额外样式
-</style>
+<template>
+  <div v-if="workflowHandleWrap.needSelectPerson">
+    <!-- 多分支选择（包含WF_RESULT的条件分支或并行分支的情况） -->
+    <template v-if="workflowHandleWrap.needMultipleBranchSelection && workflowHandleWrap.branchNodes.length > 0">
+      <template v-for="node in workflowHandleWrap.branchNodes">
+        <a-form-item
+          v-if="node.needSelectPerson"
+          :key="node.stepId"
+          :label="`${node.stepName}处理人`"
+          required
+        >
+          <a-select
+            :value="getBranchPersonValue(node.stepId)"
+            :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+            @change="setBranchPersonValue(node.stepId, $event, node.chargePersonOptions)"
+            :placeholder="`请选择${node.stepName}的处理人`"
+            :options="node.chargePersonOptions"
+            :filter-option="filterOption"
+            style="width: 195px"
+            show-search
+          >
+            <a-select-option v-for="option in node.chargePersonOptions" :key="option.value" :value="option.value">
+              {{ option.label }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+      </template>
+    </template>
+
+    <!-- 单分支选择（前台可计算的情况） -->
+    <a-form-item v-else :label="getBranchSelectionLabel()" required>
+      <a-select
+        v-model="workflowHandleWrap.checkedChargePerson"
+        placeholder="请选择或搜索"
+        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+        :options="workflowHandleWrap.chargePersonOptions"
+        @change="setBranchPersonValue(workflowHandleWrap.calculatedTargetNode, $event, workflowHandleWrap.chargePersonOptions)"
+        :filter-option="filterOption"
+        style="width: 195px"
+        show-search
+      />
+      <!--      <div v-if="workflowHandleWrap.calculatedTargetNode" style="margin-top: 8px; color: #52c41a; font-size: 12px;">-->
+      <!--        <a-icon type="check-circle"/>-->
+      <!--        根据当前表单数据，将进入：{{ workflowHandleWrap.getStepNameByStepId(workflowHandleWrap.calculatedTargetNode) }}-->
+      <!--      </div>-->
+    </a-form-item>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WorkflowPersonSelector',
+  inject: ['workflowHandleWrap'],
+  data () {
+    return {}
+  },
+  mounted () {
+  },
+  methods: {
+    // 选择框过滤
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+
+    // 获取分支处理人值
+    getBranchPersonValue (stepId) {
+      if (!this.workflowHandleWrap.branchChargePersons) {
+        // 确保 branchChargePersons 对象存在
+        this.$set(this.workflowHandleWrap, 'branchChargePersons', {})
+      }
+      const value = this.workflowHandleWrap.branchChargePersons[stepId]?.handlerId
+      console.log('获取分支处理人值:', stepId, value)
+      return value
+    },
+
+    // 设置分支处理人值
+    setBranchPersonValue (stepId, value, options) {
+      if (!stepId) return
+      if (!this.workflowHandleWrap.branchChargePersons) {
+        this.$set(this.workflowHandleWrap, 'branchChargePersons', {})
+      }
+      // 使用 $set 确保响应式更新
+      this.$set(this.workflowHandleWrap.branchChargePersons, stepId, Object.assign({ ...this.workflowHandleWrap.branchChargePersons[stepId] }, {
+        handler: options.find(item => item.value === value).label,
+        handlerId: value
+      }))
+      // 强制更新组件
+      this.$forceUpdate()
+    },
+
+    // 获取分支选择标签文本
+    getBranchSelectionLabel () {
+      if (this.workflowHandleWrap.needMultipleBranchSelection) {
+        return '分支节点处理人选择'
+      } else if (this.workflowHandleWrap.calculatedTargetNode) {
+        return `请选择${this.workflowHandleWrap.getStepNameByStepId(this.workflowHandleWrap.calculatedTargetNode)}处理人`
+      } else {
+        return '下一环节处理人'
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+// 组件样式已集成到表单中，无需额外样式
+</style>