受控文件查阅优先级(深圳三院)

src/views/component/fileTraining/index.vue

@@ -207,11 +207,13 @@ export default {
                 if (newVal !== temp) {
                     this.leftData = temp
                 }
-                // this.fileShow(this.leftData[0])
-
-                newVal.forEach(val => {
-                    this.fileShow(val)
+                temp.forEach(val => {
+                    this.fileShow(temp[0])
                 })
+
+                // newVal.forEach(val => {
+                //     this.fileShow(val)
+                // })
             },
             deep: true, // 深度监听，确保对象属性变化也能触发(本人修改)
             immediate: true

src/views/infosManage/fileIE.vue

@@ -443,7 +443,7 @@ export default {
             // 重复发放的文件，在权限表会存在重复的文件信息
             //   let fileSearchSql = `select  wj.wen_jian_xi_lei_,wj.wen_jian_bian_hao,wj.wen_jian_ming_che,wj.ban_ben_,wj.wen_jian_fu_jian_ AS fu_jian_,qx.bian_zhi_shi_jian
             //    FROM (SELECT *FROM (SELECT * FROM t_wjcysqb  ORDER BY create_time_ DESC LIMIT 99999999) a GROUP BY a.yong_hu_id_,a.wen_jian_id_) qx LEFT JOIN t_wjxxb wj ON qx.wen_jian_id_=wj.wen_jian_fu_jian_ WHERE qx.yong_hu_id_='${this.userId}' AND qx.shou_quan_='1' ${wheres1} GROUP BY qx.yong_hu_id_,qx.wen_jian_id_`
-            const selectSql = `select  wj.id_ as id,cy.id_ as cy_id_,sc.id_ as sc_id_,concat(file.file_name_,'.',file.ext_,'（大小：',
+            const selectSql = `select  wj.id_ as id,cy.id_ as cy_id_,sc.id_ as sc_id_,wj.shu_ju_lai_yuan_ AS shu_ju_lai_yuan_,concat(file.file_name_,'.',file.ext_,'（大小：',
                CASE
                 WHEN file.total_bytes_ >= 1024 * 1024 THEN CONCAT(ROUND(file.total_bytes_ / (1024.0 * 1024), 2), ' M')
                 WHEN file.total_bytes_ >= 1024 THEN CONCAT(ROUND(file.total_bytes_ / 1024.0, 2), ' K')
@@ -482,7 +482,7 @@ export default {
             // WHERE wj.shi_fou_guo_shen_ ='有效'
             // and (${isPower} or wj.quan_xian_xin_xi_ like '%${this.userId}%')  ${wheres3} `
 
-            const authoritySql = `select wj.id_ as id,cy.id_ as cy_id_,sc.id_ as sc_id_,
+            const authoritySql = `select wj.id_ as id,cy.id_ as cy_id_,sc.id_ as sc_id_,wj.shu_ju_lai_yuan_ AS shu_ju_lai_yuan_,
             CONCAT(file.file_name_, '.', file.ext_, '（',
             CASE
                WHEN file.total_bytes_ >= 1024 * 1024 THEN CONCAT(ROUND(file.total_bytes_ / (1024.0 * 1024), 2), ' M')
@@ -542,7 +542,9 @@ export default {
             }
             const fileSearchSql = needSelType.join('union all')
             // ` order by  ${sorts.sortBy}  ${sorts.order === 'ascending' ? 'asc' : 'desc'}`
-            const sql = this.pageKey === 'nbwj' ? `select sq.* from (${fileSearchSql}) sq ORDER BY sq.wen_jian_bian_hao ${ascDesc},sq.wen_jian_ming_che DESC` : oldRecordSql
+            // const sql = this.pageKey === 'nbwj' ? `select sq.* from (${fileSearchSql}) sq ORDER BY sq.wen_jian_bian_hao ${ascDesc},sq.wen_jian_ming_che DESC` : oldRecordSql
+            // 优先显示盖章文件,修订文件，最后原文件
+            const sql = this.pageKey === 'nbwj' ? `select sq.id,sq.cy_id_,sq.sc_id_,sq.shu_ju_lai_yuan_,sq.file_info_,sq.wen_jian_xi_lei_,sq.wen_jian_bian_hao,sq.wen_jian_ming_che,sq.ban_ben_,COALESCE(wjxz.gai_zhang_fu_jian,wjxz.xiu_ding_fu_jian_,sq.fu_jian_) AS fu_jian_,sq.fa_fang_shi_jian_,sq.cha_yue_jie_zhi_s from (${fileSearchSql}) sq LEFT JOIN t_wjxzxdjlb wjxz ON sq.shu_ju_lai_yuan_ = wjxz.id_ ORDER BY sq.wen_jian_bian_hao ${ascDesc},sq.wen_jian_ming_che DESC` : oldRecordSql
             // console.log(sql, 'sssssssssssssssssss')
             curdPost('sql', sql).then(res => {
                 const tableDatas = res.variables.data
@@ -807,7 +809,7 @@ export default {
             const sql1 = `select t_wjxxb.*, t_wjxzxdjlb.xiu_ding_ban_ben_, t_wjxzxdjlb.xiu_ding_nei_rong,t_wjxzxdjlb.yuan_yin_
             from  t_wjxxb
             INNER JOIN t_wjxzxdjlb ON  t_wjxxb.shu_ju_lai_yuan_ = t_wjxzxdjlb.id_ WHERE  tou_ban_wen_jian_='${val.id}' AND t_wjxxb.shi_fou_guo_shen_='有效'`
-            // 1
+            // 文件修订
             const sql = `select wjxzxdjlb.* FROM t_wjxxb wjxxb 
             LEFT JOIN t_wjxzxdjlb wjxzxdjlb ON 
             wjxxb.wen_jian_fu_jian_ = wjxzxdjlb.wen_jian_fu_jian_
@@ -815,12 +817,15 @@ export default {
             this.$common.request('sql', sql).then(res => {
                 const list = res.variables.data
                 list.forEach(el => {
+                    console.log('el12', el)
+                    console.log('12', el.gai_zhang_fu_jian ? el.gai_zhang_fu_jian : (el.xiu_ding_fu_jian ? el.xiu_ding_fu_jian : el.wen_jian_fu_jian_))
                     const obj = {
                         zId: val.id,
                         id: el.id_,
                         wen_jian_ming_che: el.wen_jian_ming_che,
                         ban_ben_: el.ban_ben_,
-                        fu_jian_: el.wen_jian_fu_jian_,
+                        // fu_jian_: el.wen_jian_fu_jian_,
+                        fu_jian_: el.gai_zhang_fu_jian ? el.gai_zhang_fu_jian : (el.xiu_ding_fu_jian ? el.xiu_ding_fu_jian : el.wen_jian_fu_jian_),
                         xiu_ding_nei_rong: el.xiu_ding_nei_rong,
                         yuan_yin_: el.yuan_yin_,
                         fa_fang_shi_jian_: el.bian_zhi_shi_jian,