[update] bug444、bug466归档问题调整

src/views/platform/bpmn/bpmInstHis/corresponding/index.js

@@ -6,32 +6,32 @@ export const listTypeData = {
     '747865628878045184': 'huanJing',
     '747865535110184960': 'jiLiang',
     '747865562742259712': 'heCha',
-    '848876704007979008': 'gongYing', //8.供应商
-    '848877659185217536': 'fangFa',//9.方法管理
-    '848877794631876608': "touSu",//11、投诉
-    '848877706840899584': "jieGuo",//13、结果有效性
-    '859879431471104000': "keHu",//13、结果有效性
-    '848877774067204096': 'ceLiang',//测量不确定度评定
-    '747865515833163776': 'jiuZheng',//不符合项与纠正措施
-    '859878561996079104': 'nengLiYanZheng',// 能力验证与实验室间比对
+    '848876704007979008': 'gongYing', // 8.供应商
+    '848877659185217536': 'fangFa', // 9.方法管理
+    '848877794631876608': 'touSu', // 11、投诉
+    '848877706840899584': 'jieGuo', // 13、结果有效性
+    '859879431471104000': 'keHu', // 13、结果有效性
+    '848877774067204096': 'ceLiang', // 测量不确定度评定
+    '747865515833163776': 'jiuZheng', // 不符合项与纠正措施
+    '859878561996079104': 'nengLiYanZheng', // 能力验证与实验室间比对
     '859879122875187200': 'fengXianKongZhi', // 风险控制
-    '859879582994530304': 'neiShen',//内审
-    '859879751135789056': 'guangShen', //管审
+    '859879582994530304': 'neiShen', // 内审
+    '859879751135789056': 'guangShen', // 管审
     '1069257469332553728': 'sheBeiWeiXiu', // 设备维修
     '1069257517135036416': 'sheBeiBaoFei', // 设备报废
     '1022458306758705152': 'sheBeiYanShou', // 设备验收
-    '1022458337893023744': 'sheBeiWeiHu',
+    '1022458337893023744': 'sheBeiWeiHu'
 }
 
 // 内审管审类型ID
 const neishen = '1148206659160506368'
 const guanshen = '859879751135789056'
 
-let specialType = {}
-let specialBtn = {}
-let specialParams = {}
-let specialTable = {}
-let specialField = {}
+const specialType = {}
+const specialBtn = {}
+const specialParams = {}
+const specialTable = {}
+const specialField = {}
 
 specialType[neishen] = [
     '首次会议签到',
@@ -42,7 +42,7 @@ specialType[neishen] = [
     '不符合项整改'
 ]
 specialType[guanshen] = [
-    
+
 ]
 
 specialBtn[neishen] = {
@@ -73,4 +73,4 @@ export {
     specialParams,
     specialTable,
     specialField
-}
+}

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -436,7 +436,7 @@ export default {
             const requestOrder = []
             table.forEach((item, index) => {
                 const sql = `select ${file[index]} from ${item} where ${field.length && field[index] ? field[index] : 'id_'} = '${bizKey}'`
-                resultList.push(this.getFile(sql, file[index]))
+                resultList.push(this.getFile(sql, file[index], item))
                 requestOrder.push(index)
             })
             Promise.all(resultList).then(res => {
@@ -451,7 +451,7 @@ export default {
             })
         },
         // 获取单个请求中的文件
-        getFile (sql, fileField) {
+        getFile (sql, fileField, table) {
             return new Promise((resolve, reject) => {
                 this.$common.request('sql', sql).then(res => {
                     const result = {
@@ -461,20 +461,23 @@ export default {
                     const fileList = fileField.split(',')
                     let { data = [] } = res.variables || {}
                     data = data.filter(i => i)
+                    // 若配置的附件字段中含创建时间，先将结果按时间升序排列
+                    if (fileList.includes('create_time_')) {
+                        data.sort((a, b) => a.create_time_ - b.create_time_)
+                    }
                     data.forEach(item => {
-                        // 能获取到值说明文件字段只有一个
-                        // 将快照文件单独拿出来
+                        // 能获取到值说明文件字段只有一个，将快照文件单独拿出来（内审归档中部分快照未存放在快照字段中，需单独处理）
                         if (item[fileField]) {
-                            if (fileField === 'kuai_zhao_') {
+                            if (fileField === 'kuai_zhao_' || (fileField === 'shang_chuan_fu_ji' && table === 't_nbss') || (fileField === 'bao_gao_wen_jian_' && table === 't_nbshbgb')) {
                                 result.snapshot.push(this.getFileId(item[fileField]))
                             } else {
                                 result.file.push(this.getFileId(item[fileField]))
                             }
                         } else if (fileList.length > 1) {
-                            // 否则文件字段为多个，需嵌套循环
+                            // 否则文件字段为多个，需嵌套循环，并过滤掉用于排序的创建时间字段
                             fileList.forEach(i => {
-                                if (item[i]) {
-                                    if (i === 'kuai_zhao_') {
+                                if (item[i] && i !== 'create_time_') {
+                                    if (i === 'kuai_zhao_' || (i === 'shang_chuan_fu_ji' && table === 't_nbss') || (i === 'bao_gao_wen_jian_' && table === 't_nbshbgb')) {
                                         result.snapshot.push(this.getFileId(item[i]))
                                     } else {
                                         result.file.push(this.getFileId(item[i]))