vue2-client 1.14.69 → 1.14.71

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

@@ -48,11 +48,12 @@
                     填写历史
                   </p>
                   <a-descriptions-item
-                    v-for="(item, index) in formPreviewNoFileData"
-                    :key="`${item.label}-${index}`"
+                    v-for="(value,key) in formCompletedDataPreview.data"
+                    :key="key"
+                    v-show="key !== '附件上传'"
                   >
-                    <span slot="label" style="color: #000">{{ item.label }}</span>
-                    <div style="white-space: pre-wrap">{{ item.value }}</div>
+                    <span slot="label" style="color: #000">{{ key }}</span>
+                    <div style="white-space: pre-wrap">{{ value }}</div>
                   </a-descriptions-item>
                 </a-descriptions>
                 <a-descriptions
@@ -809,28 +810,33 @@ export default {
         formCompletedDataPreview = JSON.parse(JSON.stringify(this.formCompletedData))
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名
         const formData = formCompletedDataPreview.data
-        // 新增：有序处理表单数据，保证顺序与formJson一致
-        const orderedFormData = []
-        for (const stepDefine of this.targetStepDefine) {
-          const key = stepDefine.model
-          if (formData && Object.prototype.hasOwnProperty.call(formData, key)) {
-            let value = formData[key]
-            // 读取字典值
-            if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
-              for (const item of this.$appdata.getDictionaryList(stepDefine.selectKey)) {
-                if (item.value === value) {
-                  value = item.label
-                  break
+        for (const key in formData) {
+          for (let i = 0; i < this.targetStepDefine.length; i++) {
+            const stepDefine = this.targetStepDefine[i]
+            if (key === stepDefine.model) {
+              if (!['FilesId', 'Images'].includes(key)) {
+                // 读取字典值
+                if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
+                  for (const item of this.$appdata.getDictionaryList(stepDefine.selectKey)) {
+                    if (item.value === formData[key]) {
+                      formData[stepDefine.name] = item.label
+                      break
+                    }
+                  }
+                } else {
+                  formData[stepDefine.name] = formData[key]
                 }
               }
+              if (key !== stepDefine.name) {
+                delete formData[key]
+              }
+              break
             }
-            orderedFormData.push({
-              label: stepDefine.name,
-              value
-            })
           }
         }
-        formCompletedDataPreview.data = orderedFormData
+        if (!Object.keys(formCompletedDataPreview.data).length) {
+          formCompletedDataPreview.data = null
+        }
         // 备注
         formCompletedDataPreview.note = this.stepsForChild[stepId - 1].note
         if (!formCompletedDataPreview.data && !formCompletedDataPreview.files.length && !formCompletedDataPreview.images.length && !formCompletedDataPreview.note) {

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

@@ -58,14 +58,14 @@ routerResource.example = {
   // 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'),
-  // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // 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/base-client/components/common/XConversation/XConversationDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),