vue2-client 1.14.42 → 1.14.44

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

@@ -8,19 +8,16 @@
         <a-button plain type="primary" @click="showVitalSignsModal('update')" :loading="loading" :disabled="!editorReady">更新体温单</a-button>
       </a-button-group>
       <a-button-group style="margin: 0 20px;">
-        <a-button plain type="primary" @click="showVitalSignsModal('baby')" :loading="loading" :disabled="!editorReady">新生儿体温单</a-button>
-      </a-button-group>
-      <a-button-group style="margin: 0 20px;">
-        <a-button plain type="primary" @click="execCommand('preview')" :loading="loading" :disabled="!editorReady">打印预览</a-button>
         <a-button plain type="primary" @click="execCommand('print')" :loading="loading" :disabled="!editorReady">打印</a-button>
       </a-button-group>
       <!-- 修改清空体温单按钮样式，使其更加醒目 -->
-      <a-button type="primary"
-                danger
-                @click="clearVitalSigns"
-                :loading="loading"
-                :disabled="!editorReady"
-                style="margin-left: 10px;">
+      <a-button
+        type="primary"
+        danger
+        @click="clearVitalSigns"
+        :loading="loading"
+        :disabled="!editorReady"
+        style="margin-left: 10px;">
         <a-icon type="delete" /> 清空体温单
       </a-button>
     </a-row>
@@ -70,8 +67,7 @@ const emit = defineEmits(['submit'])
 // 常量
 const modalTitles = {
   create: '创建体温单',
-  update: '更新体温单',
-  baby: '新生儿体温单'
+  update: '更新体温单'
 }
 
 // 显示弹窗
@@ -272,22 +268,16 @@ const handleSubmit = async (formData) => {
   loading.value = true
   generating.value = true // 开始生成，显示加载遮罩
   try {
-    // 简化代码，直接在现有体温单上创建新的体温单（不再清空）
     let result
     try {
       const iframe = editorComponent.value.$refs.editorIframe
       if (iframe?.contentWindow) {
-        const dataStr = JSON.stringify(formData)
-        const script = `
-          try {
-            const data = JSON.parse('${dataStr.replace(/'/g, "\\'")}');
-            return editor.createVitalSigns(data);
-          } catch(e) {
-            console.error('iframe执行错误:', e);
-            return null;
-          }
-        `
-        result = iframe.contentWindow.eval(script)
+        // 直接传递数据对象，避免使用eval
+        if (iframe.contentWindow.editor && typeof iframe.contentWindow.editor.createVitalSigns === 'function') {
+          result = iframe.contentWindow.editor.createVitalSigns(formData)
+        } else {
+          throw new Error('编辑器对象无效')
+        }
       } else if (window.iframeEditor) {
         result = window.iframeEditor.createVitalSigns(formData)
       } else {

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -6,7 +6,7 @@ export default {
   components: { WorkflowDetail },
   mounted () {
     this.$refs.workFlow.init({
-      workflowId: '1'
+      workflowId: '11'
     })
   },
   methods: {

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -2,30 +2,40 @@
   <!-- 抽屉 -->
   <a-drawer
     :visible="visible"
-    width="85vw"
+    width="95vw"
     :placement="direction"
     title="流程详情"
     @close="onClose"
+    class="modern-workflow-drawer"
+    :bodyStyle="{ padding: '0', background: '#f5f7fa' }"
+    :headerStyle="{ borderBottom: '1px solid #eaedf2', padding: '16px 24px' }"
   >
-    <div>
-      <!-- 基础信息 -->
-      <workflow-base-information
-        v-if="details"
-        ref="baseInformation"
-        :workflow-id="workflowId"
-        :details="details"
-        :visible="visible"
-      />
-      <div :style="{ height: screenHeight * 0.9 + 'px' }">
-        <a-card style="margin-top: 20px">
-          <a-tabs :activeKey="activeKey" @change="changeTab">
-            <a-tab-pane key="1" tab="查看 / 编辑进度">
+    <div class="workflow-container">
+      <!-- 基础信息卡片 -->
+      <div class="info-section">
+        <workflow-base-information
+          v-if="details"
+          ref="baseInformation"
+          :workflow-id="workflowId"
+          :details="details"
+          :visible="visible"
+          class="base-info-card"
+        />
+      </div>
+
+      <!-- 内容区域 -->
+      <div class="content-section" :style="{ minHeight: screenHeight * 0.7 + 'px' }">
+        <a-card class="content-card" :bordered="false">
+          <a-tabs
+            :activeKey="activeKey"
+            @change="changeTab"
+            class="modern-tabs"
+            :tabBarStyle="{ marginBottom: '5px', borderBottom: '1px solid #eaedf2' }"
+          >
+            <!-- 查看/编辑进度标签页 -->
+            <a-tab-pane key="1" tab="开始工作">
               <WorkFlowHandle
-                v-if="
-                  activeKey === '1' &&
-                    details.f_state !== undefined &&
-                    steps !== undefined
-                "
+                v-if="activeKey === '1' && details.f_state !== undefined && steps !== undefined"
                 ref="workflowHandle"
                 :workflow-id="workflowId"
                 :workflowState="details.f_state === 1"
@@ -37,29 +47,39 @@
                 @refresh="stepChanged"
                 @success="success"
                 @nextClick="nextClick"
+                class="handle-content"
               />
             </a-tab-pane>
-            <a-tab-pane key="2" tab="任务流转记录">
-              <workflow-log v-if="activeKey === '2'" :workflow-id="workflowId"/>
+
+            <!-- 任务流转记录标签页 -->
+            <a-tab-pane key="2" tab="流转记录">
+              <workflow-log
+                v-if="activeKey === '2'"
+                :workflow-id="workflowId"
+                class="log-content"
+              />
             </a-tab-pane>
+
+            <!-- 任务留言标签页 -->
             <a-tab-pane key="4">
-              <span slot="tab">
+              <span slot="tab" class="message-tab">
                 <span>任务留言</span>
                 <a-badge
                   :count="messageList.length"
-                  :offset="[4, -4]"
-                  :number-style="{ backgroundColor: '#b2b2b2' }"></a-badge>
+                  :offset="[8, -4]"
+                  :numberStyle="{ backgroundColor: '#5B6B8F', fontSize: '12px', padding: '0 6px', height: '18px', lineHeight: '18px', borderRadius: '9px' }"
+                />
               </span>
-              <a-row>
-                <a-col :span="14">
-                  <leave-message
-                    :workflowId="this.workflowId"
-                    :projectName="details.f_task_name"
-                    :data="messageList"
-                    :loading="messageLoading"
-                    @success="success"/>
-                </a-col>
-              </a-row>
+              <div class="message-content">
+                <leave-message
+                  :workflowId="workflowId"
+                  :projectName="details.f_task_name"
+                  :data="messageList"
+                  :loading="messageLoading"
+                  @success="success"
+                  class="leave-message-component"
+                />
+              </div>
             </a-tab-pane>
           </a-tabs>
         </a-card>
@@ -204,6 +224,71 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.workflow-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .info-section {
+    padding: 16px 24px;
+    background-color: #fff;
+    border-bottom: 1px solid #eaedf2;
+  }
+
+  .content-section {
+    flex: 1;
+    padding: 16px 24px;
+
+    .content-card {
+      border-radius: 8px;
+      box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+      /deep/ .ant-card-body {
+        padding: 12px 24px 24px;
+      }
+    }
+  }
+}
+
+.modern-tabs {
+  /deep/ .ant-tabs-nav {
+    margin-bottom: 0;
+  }
+
+  /deep/ .ant-tabs-tab {
+    padding: 12px 0;
+    margin-right: 48px;
+    font-size: 15px;
+  }
+
+  /deep/ .ant-tabs-tab-active {
+    font-weight: 500;
+  }
+
+  /deep/ .ant-tabs-ink-bar {
+    height: 3px;
+    border-radius: 3px 3px 0 0;
+  }
+}
+
+.message-tab {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.message-content {
+  max-width: 900px;
+
+  .leave-message-component {
+    width: 100%;
+  }
+}
+
+.log-content {
+  margin-top: 16px;
+}
+
 /deep/ .step-label {
   &:not(:first-child) {
     margin-left: 16px;
@@ -220,15 +305,15 @@ export default {
     margin-right: 8px;
 
     &.blue {
-      border: 3px solid rgb(24, 144, 255);
+      border: 3px solid #5B6B8F;
     }
 
     &.green {
-      border: 3px solid rgb(82, 196, 26);
+      border: 3px solid #4CAF50;
     }
 
     &.gray {
-      border: 3px solid rgb(191, 191, 191);
+      border: 3px solid #cfd8e3;
     }
   }
 }