cyy před 11 měsíci
rodič
revize
95a2c445f4

+ 1 - 0
.env.development

@@ -29,6 +29,7 @@ VUE_APP_BASE_API_2_0_DEMO2 = http://demo2.local/ibps
 VUE_APP_BASE_API_1_0_134WY = http://192.168.2.134:5100/ibps
 # ---本地环境2
 VUE_APP_BASE_API_2_0_8GZL = http://192.168.2.8:5100/ibps
+VUE_APP_BASE_API_2_0_7XXH = http://192.168.2.7:5100/ibps
 # ---演示环境
 VUE_APP_BASE_API_2_0_9LY = http://192.168.2.9:5100/ibps
 # ---测试环境

+ 69 - 0
src/api/platform/feature/sqlInject.js

@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+import { BPMN_URL } from '@/api/baseUrl'
+
+/**
+ * 附加检验申请查询
+ * @param {*} params
+ */
+export function queryAdd(data) {
+  return request({
+    url: BPMN_URL() + '/sql/inspection/queryData',
+    method: 'post',
+    data
+  })
+}
+/**
+ * 延迟报告查询
+ * @param {*} params
+ */
+export function queryDelay(data) {
+  return request({
+    url: BPMN_URL() + '/employee/delayReportRecord/query',
+    method: 'post',
+    data
+  })
+}
+/**
+ * 口头报告查询
+ * @param {*} params
+ */
+export function queryOral(data) {
+  return request({
+    url: BPMN_URL() + '/employee/oralReport/query',
+    method: 'post',
+    data
+  })
+}
+/**
+ * 备忘录查询
+ * @param {*} params
+ */
+export function queryMemorandum(data) {
+  return request({
+    url: BPMN_URL() + '/sql/memorandum/query',
+    method: 'post',
+    data
+  })
+}
+/**
+ * 考试列表查询
+ * @param {*} params
+ */
+export function queryMoblie(data) {
+  return request({
+    url: BPMN_URL() + '/sql/query/exam/mobile',
+    method: 'post',
+    data
+  })
+}
+/**
+ * 催办列表查询
+ * @param {*} params
+ */
+export function queryRem(data) {
+  return request({
+    url: BPMN_URL() + '/sql/remindersJob/query',
+    method: 'post',
+    data
+  })
+}

+ 21 - 4
src/store/modules/ibps/modules/user.js

@@ -1,5 +1,6 @@
 import { getUserInfo } from '@/api/oauth2/user'
 import common from '@/utils/common'
+import { dbSqlConfig } from '@/constant'
 
 export default {
   namespaced: true,
@@ -166,7 +167,7 @@ export default {
           : '%%'
       const sql = `select * from ibps_party_role`
       common
-        .request('sql', sql)
+        .request(dbSqlConfig ? 'query' : 'sql', dbSqlConfig ? { key: 'yddhqqbjs', params: [null] } : sql)
         .then(res => {
           const { data = [] } = res.variables || {}
           dispatch('ibps/param/setRoleList', data, {
@@ -188,8 +189,16 @@ export default {
           ? `'%${first}%'`
           : '%%'
       const sql = `select users.id_ as userId, users.name_ as userName, ifnull(users.mobile_, '') as phone, ifnull(group_concat(distinct positions.id_ order by positions.id_ separator ','), '') as positionId, ifnull(group_concat(distinct positions.name_ order by positions.id_ separator ','), '') as positions, ifnull(group_concat(distinct roles.id_ order by roles.role_note_ asc separator ','), '') as roleId, ifnull(group_concat(distinct roles.name_ order by roles.role_note_ asc separator ','), '') as roles, (select ifnull(people.qian_zi_tu_wen_, '') from t_ryjbqk as people where people.parent_id_ = users.id_) as signatureId, (select ifnull(files.file_name_, '') from ibps_file_attachment as files where files.id_ = signatureId) as signatureName from ibps_party_employee as users left join (select ur.user_id_, r.role_note_, group_concat(distinct r.id_ order by r.id_ separator ',') as id_, group_concat(distinct r.name_ order by r.id_ separator ',') as name_ from ibps_party_user_role as ur join ibps_party_role as r on ur.role_id_ = r.id_ group by ur.user_id_) as roles on users.id_ = roles.user_id_ left join ibps_party_entity as positions on find_in_set(positions.id_, users.positions_) where exists (select 1 from ibps_party_entity as entity where find_in_set(entity.id_, users.positions_) and (entity.path_ like ${params})) group by users.id_`
+      const parm1 = { key: 'yddhqqbyh1', params: [second, first] }
+      const parm2 = { key: 'yddhqqbyh2', params: [first] }
+      const parm3 = { key: 'yddhqqbyh3', params: [null] }
+      const parm = second
+        ? parm1
+        : first
+          ? parm2
+          : parm3
       common
-        .request('sql', sql)
+        .request(dbSqlConfig ? 'query' : 'sql', dbSqlConfig ? parm : sql)
         .then(res => {
           const { data = [] } = res.variables || {}
           dispatch('ibps/param/setUserList', data, {
@@ -212,8 +221,16 @@ export default {
           : ''
       // const sql = `select id_ as positionId, name_ as positionName, path_ as path, depth_ as depth, sn_ as sn from ibps_party_entity where party_type_ = 'position'${params} order by depth_ asc, sn_ asc`
       const sql = `select pe.id_ as positionId, pe.name_ as positionName, pe.path_ as path, pe.depth_ as depth, pe.sn_ as sn, ifnull(r.name_, '') as manager, ifnull(r.id_, '') as managerId from ibps_party_entity as pe left join (select em.id_, em.positions_, em.name_ from ibps_party_employee as em left join ibps_party_user_role as ur on em.id_ = ur.user_id_ left join ibps_party_role as pr on pr.id_ = ur.role_id_ where role_alias_ in ('zhsfzr', 'syszr', 'zhglzzc')) as r on find_in_set(pe.id_, r.positions_) > 0 where pe.party_type_ = 'position'${params} group by pe.id_ order by pe.depth_ asc, pe.sn_ asc,pe.id_ asc`
+      const parm1 = { key: 'yddhqsybmxx1', params: [second, first] }
+      const parm2 = { key: 'yddhqsybmxx2', params: [first] }
+      const parm3 = { key: 'yddhqsybmxx3', params: [null] }
+      const parm = second
+        ? parm1
+        : first
+          ? parm2
+          : parm3
       common
-        .request('sql', sql)
+        .request(dbSqlConfig ? 'query' : 'sql', dbSqlConfig ? parm : sql)
         .then(res => {
           const { data = [] } = res.variables || {}
           dispatch('ibps/param/setDeptList', data, {
@@ -231,7 +248,7 @@ export default {
     getFlowList({ state, dispatch }, { first, second }) {
       const sql = `select * from t_applcgl`
       common
-        .request('sql', sql)
+        .request(dbSqlConfig ? 'query' : 'sql', dbSqlConfig ? { key: 'yddhqkzslc', params: [null] } : sql)
         .then(res => {
           const { data = [] } = res.variables || {}
           dispatch('ibps/param/setflowList', data, {

+ 111 - 60
src/views/platform/bpmn/addiInspect/index.vue

@@ -185,6 +185,8 @@ import IbpsAvatar from '@/components/ibps-avatar'
 import IbpsToolbar from '@/components/ibps-toolbar'
 import IbpsListResultPage from '@/components/ibps-list-result-page'
 import IbpsBpmnFormrenderDialog from '@/business/platform/bpmn/form/dialog'
+import { dbSqlConfig } from '@/constant'
+import { queryAdd } from '@/api/platform/feature/sqlInject'
 
 export default {
   components: {
@@ -198,8 +200,14 @@ export default {
   },
   mixins: [random, bpmnStatus],
   data() {
+    const { first = '', second = '' } = this.$store.getters.level
+    const level = second || first
+    const { userList = [], deptList = [] } = this.$store.getters
     return {
-      page: 0,
+      userList,
+      deptList,
+      level,
+      page: 1,
       id: '',
       // footText: false,
       // noData: false,
@@ -244,7 +252,8 @@ export default {
       defId: '',
       formrenderVisible: false,
       formrenderTitle: '',
-      current: 0
+      current: 0,
+      nlfwData: []
     }
   },
 
@@ -269,79 +278,120 @@ export default {
       */
     async loadData(j) {
       this.loading = true
-      await this.getPositionobj()
+      // await this.getPositionobj()
+      if (this.nlfwData.length === 0) {
+        await this.getNLFWB()
+      }
+      // console.log(this.userList, this.deptList, 'pppppppppp')
       const params = await this.getSearcFormData()
       if (j == 'search') {
-        this.page = 0
+        this.page = 1
       }
       // let sql = `select t_fjjysqdjb.*,m.bianzhibumen,m.shenqingneirong,m.bianzhiren,m.dengjirenyuan,m.jieshourenyuan from t_fjjysqdjb LEFT JOIN (select g.*,h.jieshourenyuan from (select e.*,f.dengjirenyuan from (select c.*,d.bianzhiren from (select a.*,b.shenqingneirong from (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_fjjysqdjb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN (select t.id_ ,group_concat(u.jian_yan_xiang_mu order by find_in_set(u.id_,t.shen_qing_nei_ron)) as shenqingneirong from t_fjjysqdjb as t inner join t_nlfwb as u on find_in_set(u.id_,t.shen_qing_nei_ron)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ =b.id_) as c LEFT JOIN (select t.id_ ,u.NAME_ as bianzhiren from t_fjjysqdjb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as d on c.id_ = d.id_) as e LEFT JOIN (select t.id_ ,u.NAME_ as dengjirenyuan from t_fjjysqdjb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.deng_ji_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as f on e.id_ = f.id_) as g LEFT JOIN (select t.id_ ,u.NAME_ as jieshourenyuan from t_fjjysqdjb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.jie_shou_ren_yuan)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as h on g.id_ = h.id_) as m on t_fjjysqdjb.id_ = m.id_ where find_in_set(t_fjjysqdjb.bian_zhi_bu_men_,'${this.positionObj}') and t_fjjysqdjb.yang_pin_bian_hao LIKE '%` + key + `%' ORDER BY t_fjjysqdjb.create_time_ DESC LIMIT ${page},10`
       const sql = `select t_fjjysqdjb.*,m.bianzhibumen,m.shenqingneirong,m.bianzhiren,m.dengjirenyuan,m.jieshourenyuan from t_fjjysqdjb LEFT JOIN (select g.*,h.jieshourenyuan from (select e.*,f.dengjirenyuan from (select c.*,d.bianzhiren from (select a.*,b.shenqingneirong from (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_fjjysqdjb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN (select t.id_ ,group_concat(u.jian_yan_xiang_mu order by find_in_set(u.id_,t.shen_qing_nei_ron)) as shenqingneirong from t_fjjysqdjb as t inner join t_nlfwb as u on find_in_set(u.id_,t.shen_qing_nei_ron)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ =b.id_) as c LEFT JOIN (select t.id_ ,u.NAME_ as bianzhiren from t_fjjysqdjb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as d on c.id_ = d.id_) as e LEFT JOIN (select t.id_ ,u.NAME_ as dengjirenyuan from t_fjjysqdjb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.deng_ji_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as f on e.id_ = f.id_) as g LEFT JOIN (select t.id_ ,u.NAME_ as jieshourenyuan from t_fjjysqdjb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.jie_shou_ren_yuan)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as h on g.id_ = h.id_) as m on t_fjjysqdjb.id_ = m.id_ where find_in_set(t_fjjysqdjb.bian_zhi_bu_men_,'${this.positionObj}') and t_fjjysqdjb.yang_pin_bian_hao LIKE '%${this.subject}%' ORDER BY t_fjjysqdjb.create_time_ DESC LIMIT ${this.page * params.requestPage.limit},${params.requestPage.limit} `
-
-      // sql注入接口
-      this.$common.request('sql', sql).then(res => {
-        ActionUtils.handleListDataCommon(this, res.variables)
+      // queryAdd(params).then(response => {
+      //   console.log(response)
+      // })
+      queryAdd({
+        pageNo: this.page + '',
+        limit: params.requestPage.limit + '',
+        yangPinBianHao: this.subject,
+        shenQingRenZh: '',
+        keShiZh: '',
+        bianZhiBuMen: ''
+      }).then(res => {
+        const data = res.data
+        data.dataResult.forEach(element => {
+          element['bianzhibumen'] = this.deptList.find(t => t.positionId === element.bian_zhi_bu_men_) ? this.deptList.find(t => t.positionId === element.bian_zhi_bu_men_).positionName : ''
+          element['shenqingneirong'] = this.nlfwData.filter(t => t.id_ === element.shen_qing_nei_ron).length > 0 ? this.nlfwData.filter(t => t.id_ === element.shen_qing_nei_ron).map(t => { return t.jian_yan_xiang_mu }).join(',') : ''
+          element['bianzhiren'] = this.userList.find(t => t.userId === element.bian_zhi_ren_) ? this.userList.find(t => t.userId === element.bian_zhi_ren_).userName : ''
+          element['dengjirenyuan'] = this.userList.find(t => t.userId === element.deng_ji_ren_) ? this.userList.find(t => t.userId === element.deng_ji_ren_).userName : ''
+          element['jieshourenyuan'] = this.userList.find(t => t.userId === element.jie_shou_ren_yuan) ? this.userList.find(t => t.userId === element.jie_shou_ren_yuan).userName : ''
+        })
+        // if (this.page == 1) {
+        //   this.listData = data
+        // } else if (this.page > 1) {
+        //   this.listData.push(...res.data.dataResult)
+        // }
+        ActionUtils.handleListData(this, data)
+        // console.log(this.listData, 'eqweqqeqweqwe')
       }).catch(e => {
         ActionUtils.handleErrorData(this, e)
       })
+
+      // sql注入接口
+      // this.$common.request('sql', sql).then(res => {
+      //   ActionUtils.handleListDataCommon(this, res.variables)
+      //   console.log(this.listData, 'tttttttttttt')
+      // }).catch(e => {
+      //   ActionUtils.handleErrorData(this, e)
+      // })
+    },
+    async getNLFWB() {
+      const sql = `select * from t_nlfwb where di_dian_ = ${this.level}`
+      this.$common.request(dbSqlConfig ? 'query' : 'sql', dbSqlConfig ? { key: 'yddnlfwbcx', params: [this.level] } : sql).then(res => {
+        this.nlfwData = res.variables.data
+        console.log(this.nlfwData, 'nnnnnnnnnnnnnnn')
+      })
     },
     // 获取positionobj数据,列表查询变更后就不需要了
     // sql注入接口
-    async getPositionobj() {
-      if (this.info && this.info.positions && this.info.positions.length > 0) {
-        let posiList = []
-        this.info.positions.forEach(item => {
-          const obj = `${item.id}.`
-          const objList = item.path.split(obj)
-          objList.forEach(it => {
-            posiList.push(it)
-          })
-        })
-        const position = this.info.positions.map(item => {
-          return item.id
-        })
-        let posiSql = ``
-        position.forEach((item, index) => {
-          if (index == 0) {
-            const obj = `path_ like '%${item}%'`
-            posiSql += obj
-          } else {
-            const obj = `or path_ like '%${item}%'`
-            posiSql += obj
-          }
-        })
-        const sql = `select * from ibps_party_entity where party_type_ = 'position' and (${posiSql})`
-        await this.$common.request('sql', sql).then(res => {
-          if (res.state == '200') {
-            const data = res.variables.data
-            if (data.length > 0) {
-              data.forEach(item => {
-                posiList.push(item.ID_)
-              })
-              // 数组去空值
-              posiList = posiList.filter(item => item)
-              // 部门上下级的id去重
-              const positionSet = Array.from(new Set(posiList))
-              this.positionObj = positionSet.join(',')
-            } else {
-              this.positionObj = ''
-            }
-          }
-        })
-      } else {
-        this.positionObj = ''
-      }
-    },
+    // async getPositionobj() {
+    //   if (this.info && this.info.positions && this.info.positions.length > 0) {
+    //     let posiList = []
+    //     this.info.positions.forEach(item => {
+    //       const obj = `${item.id}.`
+    //       const objList = item.path.split(obj)
+    //       objList.forEach(it => {
+    //         posiList.push(it)
+    //       })
+    //     })
+    //     const position = this.info.positions.map(item => {
+    //       return item.id
+    //     })
+    //     let posiSql = ``
+    //     position.forEach((item, index) => {
+    //       if (index == 0) {
+    //         const obj = `path_ like '%${item}%'`
+    //         posiSql += obj
+    //       } else {
+    //         const obj = `or path_ like '%${item}%'`
+    //         posiSql += obj
+    //       }
+    //     })
+    //     const sql = `select * from ibps_party_entity where party_type_ = 'position' and (${posiSql})`
+    //     await this.$common.request('sql', sql).then(res => {
+    //       if (res.state == '200') {
+    //         const data = res.variables.data
+    //         if (data.length > 0) {
+    //           data.forEach(item => {
+    //             posiList.push(item.ID_)
+    //           })
+    //           // 数组去空值
+    //           posiList = posiList.filter(item => item)
+    //           // 部门上下级的id去重
+    //           const positionSet = Array.from(new Set(posiList))
+    //           this.positionObj = positionSet.join(',')
+    //         } else {
+    //           this.positionObj = ''
+    //         }
+    //       }
+    //     })
+    //   } else {
+    //     this.positionObj = ''
+    //   }
+    // },
     /**
        * 获取格式化参数
        */
     getSearcFormData() {
-      let params = {}
-      if (this.$utils.isNotEmpty(this.subject)) {
-        params['Q^subject_^SL'] = this.subject
-      }
-      if (this.$utils.isNotEmpty(this.moreParams)) {
-        params = Object.assign(params, this.moreParams)
-      }
+      const params = {}
+      // if (this.$utils.isNotEmpty(this.subject)) {
+      //   params['Q^subject_^SL'] = this.subject
+      // }
+      // if (this.$utils.isNotEmpty(this.moreParams)) {
+      //   params = Object.assign(params, this.moreParams)
+      // }
       return ActionUtils.formatParams(
         params,
         this.pagination,
@@ -408,6 +458,7 @@ export default {
     onClick(item, index) {
       this.id = item.id_
       this.ReachBottomShow = true
+
       this.oralPopup = item
     },
     onRefreshPage() {

+ 238 - 237
src/views/platform/bpmn/communication/communicationList.vue

@@ -97,267 +97,268 @@ import IbpsBpmnFormrenderDialog from '@/business/platform/bpmn/form/dialog'
 import communication from './communication.vue'
 
 export default {
-    components: {
-        IbpsMoreSearch,
-        IbpsAvatar,
-        IbpsListResultPage,
-        IbpsTypeTree,
-        IbpsBpmnDefinition,
-        IbpsToolbar,
-        ApprovePopup,
-        IbpsBpmnFormrenderDialog,
-        communication
-    },
-    mixins: [random, bpmnStatus],
-    data() {
-        const useId = this.$store.getters.userId
-        return {
-            useId,
-            moreSearchPopup: false,
-            stateActive: false,
-            searchForms: {
-                forms: [
-                    { prop: 'biao_dan_bian_hao', label: '表单编号', fieldType: 'text' },
-                    { prop: 'ke_hu_lian_xi_ren', label: '用户姓名', fieldType: 'text' },
-                    { prop: 'gou_tong_lei_xing', label: '沟通类型', fieldType: 'checker', cols: 3, options: [
-                        {
-                            value: '全部',
-                            label: '全部'
-                        }, {
-                            value: '投诉',
-                            label: '投诉'
-                        }, {
-                            value: '检验项目',
-                            label: '检验项目'
-                        }, {
-                            value: '危机值报告',
-                            label: '危机值报告'
-                        }, {
-                            value: '口头报告结果',
-                            label: '口头报告结果'
-                        }, {
-                            value: '延迟报告',
-                            label: '延迟报告'
-                        }, {
-                            value: '其它',
-                            label: '其它'
-                        }
-                    ]
-                    }
-                ]
-            },
-            subject: '',
-            typeId: '',
-            defKey: '',
-            twoParam: '',
-            moreParams: {},
+  components: {
+    IbpsMoreSearch,
+    IbpsAvatar,
+    IbpsListResultPage,
+    IbpsTypeTree,
+    IbpsBpmnDefinition,
+    IbpsToolbar,
+    ApprovePopup,
+    IbpsBpmnFormrenderDialog,
+    communication
+  },
+  mixins: [random, bpmnStatus],
+  data() {
+    const useId = this.$store.getters.userId
+    return {
+      useId,
+      moreSearchPopup: false,
+      stateActive: false,
+      searchForms: {
+        forms: [
+          { prop: 'biao_dan_bian_hao', label: '表单编号', fieldType: 'text' },
+          { prop: 'ke_hu_lian_xi_ren', label: '用户姓名', fieldType: 'text' },
+          { prop: 'gou_tong_lei_xing', label: '沟通类型', fieldType: 'checker', cols: 3, options: [
+            {
+              value: '全部',
+              label: '全部'
+            }, {
+              value: '投诉',
+              label: '投诉'
+            }, {
+              value: '检验项目',
+              label: '检验项目'
+            }, {
+              value: '危机值报告',
+              label: '危机值报告'
+            }, {
+              value: '口头报告结果',
+              label: '口头报告结果'
+            }, {
+              value: '延迟报告',
+              label: '延迟报告'
+            }, {
+              value: '其它',
+              label: '其它'
+            }
+          ]
+          }
+        ]
+      },
+      subject: '',
+      typeId: '',
+      defKey: '',
+      twoParam: '',
+      moreParams: {},
 
-            listData: [],
-            pagination: {},
-            sorts: {},
+      listData: [],
+      pagination: {},
+      sorts: {},
 
-            loading: false,
-            finished: false,
-            refreshing: false,
-            resultType: 'init',
-            errorType: null,
-            resultMessage: null,
+      loading: false,
+      finished: false,
+      refreshing: false,
+      resultType: 'init',
+      errorType: null,
+      resultMessage: null,
 
-            checkMode: false,
-            checkedIds: [],
-            show: false,
-            batchOpinionPopup: false,
-            actionName: 'agree',
+      checkMode: false,
+      checkedIds: [],
+      show: false,
+      batchOpinionPopup: false,
+      actionName: 'agree',
 
-            typeTreePopup: false,
-            scrollWhere: 0,
-            taskId: '',
-            formrenderVisible: false,
-            formrenderTitle: '',
-            page: 0,
-            showPop: false,
-            typeValue: '0',
-            id: ''
-        }
+      typeTreePopup: false,
+      scrollWhere: 0,
+      taskId: '',
+      formrenderVisible: false,
+      formrenderTitle: '',
+      page: 0,
+      showPop: false,
+      typeValue: '0',
+      id: ''
+    }
+  },
+  computed: {
+    rightText() {
+      return this.checkMode ? this.$t('common.button.cancel') : this.$t('common.button.manage')
+    },
+    selectedIds() {
+      return this.checkedIds.join(',')
+    }
+  },
+  methods: {
+    updataSet(v) {
+      this.showPop = v
+      this.startScroll()
     },
-    computed: {
-        rightText() {
-            return this.checkMode ? this.$t('common.button.cancel') : this.$t('common.button.manage')
-        },
-        selectedIds() {
-            return this.checkedIds.join(',')
-        }
+    generateTitle(name, title) { // generateTitle by vue-i18n
+      return i18n.generateTitle(name, title)
     },
-    methods: {
-        updataSet(v) {
-            this.showPop = v
-            this.startScroll()
-        },
-        generateTitle(name, title) { // generateTitle by vue-i18n
-            return i18n.generateTitle(name, title)
-        },
-        /**
+    /**
        * 加载数据
        */
-        loadData(j) {
-            this.loading = true
-            const params = this.getSearcFormData()
-            if (j === 'search') {
-                this.page = 0
-            }
-            let itemSql = ``
-            const gtlx = params.parameters.find(i => i.key === 'gou_tong_lei_xing') || ''
-            if (gtlx && gtlx.value !== '全部') {
-                itemSql = itemSql + `and gou_tong_lei_xing = '${gtlx.value}'`
-            }
-            const bdbh = params.parameters.find(i => i.key === 'biao_dan_bian_hao') || ''
-            if (bdbh && bdbh.value !== '') {
-                itemSql = itemSql + `and biao_dan_bian_hao like '%${bdbh.value}%'`
-            }
-            const khlxr = params.parameters.find(i => i.key === 'ke_hu_lian_xi_ren') || ''
-            if (khlxr && khlxr.value !== '') {
-                itemSql = itemSql + `and ke_hu_lian_xi_ren like '%${khlxr.value}%'`
-            }
-            const two = params.parameters.find(i => i.key === 'two') || ''
-            if (two) {
-                itemSql = itemSql + `and (ke_hu_lian_xi_ren like '%${two.value}%' or biao_dan_bian_hao like '%${two.value}%')`
-            }
-            const sql =
+    loadData(j) {
+      this.loading = true
+      const params = this.getSearcFormData()
+      if (j === 'search') {
+        this.page = 0
+      }
+      let itemSql = ``
+      const gtlx = params.parameters.find(i => i.key === 'gou_tong_lei_xing') || ''
+      if (gtlx && gtlx.value !== '全部') {
+        itemSql = itemSql + `and gou_tong_lei_xing = '${gtlx.value}'`
+      }
+      const bdbh = params.parameters.find(i => i.key === 'biao_dan_bian_hao') || ''
+      if (bdbh && bdbh.value !== '') {
+        itemSql = itemSql + `and biao_dan_bian_hao like '%${bdbh.value}%'`
+      }
+      const khlxr = params.parameters.find(i => i.key === 'ke_hu_lian_xi_ren') || ''
+      if (khlxr && khlxr.value !== '') {
+        itemSql = itemSql + `and ke_hu_lian_xi_ren like '%${khlxr.value}%'`
+      }
+      const two = params.parameters.find(i => i.key === 'two') || ''
+      if (two) {
+        itemSql = itemSql + `and (ke_hu_lian_xi_ren like '%${two.value}%' or biao_dan_bian_hao like '%${two.value}%')`
+      }
+      const sql =
 					`select * from t_khgtjlb where (create_by_ = '${this.useId}' or xuan_ze_ke_hu_ = '${this.useId}') ${itemSql}  ORDER BY create_time_ desc LIMIT ${this.page * params.requestPage.limit},${params.requestPage.limit}`
-            this.$common.request('sql', sql).then(response => {
-                // 处理数据
-                ActionUtils.handleListDataCommon(this, response.variables)
-            }).catch((e) => {
-                ActionUtils.handleErrorData(this, e)
-            })
-        },
-        /**
+      // 该表已取消
+      // this.$common.request('sql', sql).then(response => {
+      //     // 处理数据
+      //     ActionUtils.handleListDataCommon(this, response.variables)
+      // }).catch((e) => {
+      //     ActionUtils.handleErrorData(this, e)
+      // })
+    },
+    /**
        * 获取格式化参数
        */
-        getSearcFormData() {
-            let params = {}
-            if (this.$utils.isNotEmpty(this.twoParam)) {
-                params['two'] = this.twoParam
-            }
-            // if (this.$utils.isNotEmpty(this.typeId)) {
-            //   params['Q^temp.TYPE_ID_^S'] = this.typeId
-            // }
-            // if (this.$utils.isNotEmpty(this.defKey)) {
-            //   params['Q^temp.proc_def_key_^S'] = this.defKey
-            // }
-            if (this.$utils.isNotEmpty(this.moreParams)) {
-                params = Object.assign(params, this.moreParams)
-            }
-            return ActionUtils.formatParams(
-                params,
-                this.pagination,
-                this.sorts)
-        },
-        LiftUpPop() {
-            this.scrollWhere = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop
-            this.stopScroll()
-            this.getGo('', '3')
-        },
-        /**
+    getSearcFormData() {
+      let params = {}
+      if (this.$utils.isNotEmpty(this.twoParam)) {
+        params['two'] = this.twoParam
+      }
+      // if (this.$utils.isNotEmpty(this.typeId)) {
+      //   params['Q^temp.TYPE_ID_^S'] = this.typeId
+      // }
+      // if (this.$utils.isNotEmpty(this.defKey)) {
+      //   params['Q^temp.proc_def_key_^S'] = this.defKey
+      // }
+      if (this.$utils.isNotEmpty(this.moreParams)) {
+        params = Object.assign(params, this.moreParams)
+      }
+      return ActionUtils.formatParams(
+        params,
+        this.pagination,
+        this.sorts)
+    },
+    LiftUpPop() {
+      this.scrollWhere = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop
+      this.stopScroll()
+      this.getGo('', '3')
+    },
+    /**
        * 下拉刷新
        */
-        onRefresh() {
-            this.refreshing = true
-            this.finished = false
-            this.loading = true
-            this.onSearch()
-        },
-        /**
+    onRefresh() {
+      this.refreshing = true
+      this.finished = false
+      this.loading = true
+      this.onSearch()
+    },
+    /**
        * 查询
        */
-        onSearch() {
-            this.stateActive = false
-            ActionUtils.initListData(this)
-            this.loadData('search')
-        },
-        /**
+    onSearch() {
+      this.stateActive = false
+      ActionUtils.initListData(this)
+      this.loadData('search')
+    },
+    /**
        * 高级查询
        */
-        onMoreSearch(params) {
-            this.moreParams = params
-            this.onSearch()
-            if (this.$utils.isNotEmpty(params)) {
-                this.stateActive = true
-            }
-        },
-        /**
+    onMoreSearch(params) {
+      this.moreParams = params
+      this.onSearch()
+      if (this.$utils.isNotEmpty(params)) {
+        this.stateActive = true
+      }
+    },
+    /**
        * 弹窗更多查询条件
        */
-        clickMoreSearch() {
-            this.moreSearchPopup = true
-            this.stateActive = false
-        },
-        /**
+    clickMoreSearch() {
+      this.moreSearchPopup = true
+      this.stateActive = false
+    },
+    /**
        * 重置表单
        */
-        resetForm() {
-            this.typeId = ''
-            this.defKey = ''
-        },
+    resetForm() {
+      this.typeId = ''
+      this.defKey = ''
+    },
 
-        onRefreshPage() {
-            this.checkedIds = []
-            this.checkMode = false
-            this.onRefresh()
-        },
+    onRefreshPage() {
+      this.checkedIds = []
+      this.checkMode = false
+      this.onRefresh()
+    },
 
-        onClick(item, index) {
-            if (this.checkMode) {
-                this.$refs.checkboxes[index].toggle()
-            } else {
-                this.taskId = item.id
-                this.formrenderTitle = item.procDefName
-                this.formrenderVisible = true
-            }
-        },
-        clickType() {
-            this.typeTreePopup = true
-        },
-        clickTypeNode(data) {
-            this.typeId = data.id
-            this.onMoreSearch({})
-        },
-        toCheckMode() {
-            if (this.$utils.isEmpty(this.listData)) {
-                return
-            }
-            if (this.checkMode) {
-                this.show = true
-                this.checkedIds = []
-            }
-            this.checkMode = !this.checkMode
-        },
-        stopScroll() {
-            const mid = this.scrollWhere
-            // document.documentElement.style.overflow='hidden';
-            document.body.style.overflow = 'hidden'
-            // document.documentElement.style.position='fixed';
-            document.body.style.position = 'fixed'
-            // document.documentElement.style.top=-mid+'px';
-            document.body.style.top = -mid + 'px'
-        },
-        // 启用页面滚动
-        startScroll() {
-        // document.documentElement.style.overflow='';
-            document.body.style.overflow = 'auto'
-            document.body.style.position = 'static'
-            window.scrollTo(0, this.scrollWhere)
-            this.scrollWhere = 0
-        },
-        getGo(id, typeValue) {
-            this.id = id
-            this.typeValue = typeValue
-            this.showPop = true
-            // uni.navigateTo({
-            // 	url: `./communication?id=${id}&typeValue=${typeValue}`
-            // })
-        }
+    onClick(item, index) {
+      if (this.checkMode) {
+        this.$refs.checkboxes[index].toggle()
+      } else {
+        this.taskId = item.id
+        this.formrenderTitle = item.procDefName
+        this.formrenderVisible = true
+      }
+    },
+    clickType() {
+      this.typeTreePopup = true
+    },
+    clickTypeNode(data) {
+      this.typeId = data.id
+      this.onMoreSearch({})
+    },
+    toCheckMode() {
+      if (this.$utils.isEmpty(this.listData)) {
+        return
+      }
+      if (this.checkMode) {
+        this.show = true
+        this.checkedIds = []
+      }
+      this.checkMode = !this.checkMode
+    },
+    stopScroll() {
+      const mid = this.scrollWhere
+      // document.documentElement.style.overflow='hidden';
+      document.body.style.overflow = 'hidden'
+      // document.documentElement.style.position='fixed';
+      document.body.style.position = 'fixed'
+      // document.documentElement.style.top=-mid+'px';
+      document.body.style.top = -mid + 'px'
+    },
+    // 启用页面滚动
+    startScroll() {
+      // document.documentElement.style.overflow='';
+      document.body.style.overflow = 'auto'
+      document.body.style.position = 'static'
+      window.scrollTo(0, this.scrollWhere)
+      this.scrollWhere = 0
+    },
+    getGo(id, typeValue) {
+      this.id = id
+      this.typeValue = typeValue
+      this.showPop = true
+      // uni.navigateTo({
+      // 	url: `./communication?id=${id}&typeValue=${typeValue}`
+      // })
     }
+  }
 }
 </script>
 <style lang="scss" scoped>

+ 10 - 9
src/views/platform/bpmn/complaint/complaintList.vue

@@ -283,15 +283,16 @@ export default {
         this.useId
       }' ${itemSql}  ORDER BY create_time_ desc LIMIT ${this.page *
         params.requestPage.limit},${params.requestPage.limit}`
-      this.$common
-        .request('sql', sql)
-        .then(response => {
-          // 处理数据
-          ActionUtils.handleListDataCommon(this, response.variables)
-        })
-        .catch(e => {
-          ActionUtils.handleErrorData(this, e)
-        })
+      // 与平台不匹配,临时注销
+      // this.$common
+      //   .request('sql', sql)
+      //   .then(response => {
+      //     // 处理数据
+      //     ActionUtils.handleListDataCommon(this, response.variables)
+      //   })
+      //   .catch(e => {
+      //     ActionUtils.handleErrorData(this, e)
+      //   })
     },
     /**
      * 获取格式化参数

+ 53 - 19
src/views/platform/bpmn/memorandum/index.vue

@@ -22,7 +22,7 @@
                 <van-swipe-cell v-for="(item,index) in listData" :key="index" :right-width="65">
                     <van-cell
                         :key="index"
-                        :title="item.title_"
+                        :title="item.title"
                         @click="onEdit(item,index)"
                     >
                         <template slot="icon">
@@ -35,9 +35,9 @@
                             />
                         </template>
                         <template slot="label">
-                            <div class="content">{{ item.content_ }}</div>
+                            <div class="content">{{ item.content }}</div>
                         </template>
-                        <span>{{ item.create_time_|formatRelativeTime }}</span>
+                        <span>{{ item.createTime|formatRelativeTime }}</span>
                         <div>
                             <van-tag v-if="tabActive===0" type="primary" size="medium" @click.stop="onClose(item,index)">关闭</van-tag>
                             <van-tag v-else color="#ccc" plain size="medium">已关闭</van-tag>
@@ -105,6 +105,7 @@ import IbpsBpmnFormrenderDialog from '@/business/platform/bpmn/form/dialog'
 import { Notify, Dialog } from 'vant'
 import Template from '../../../../business/platform/data/data-template/template.vue'
 import { dbSqlConfig } from '@/constant'
+import { queryMemorandum } from '@/api/platform/feature/sqlInject'
 
 export default {
   name: 'new-process',
@@ -203,7 +204,7 @@ export default {
           updList: [
             {
               where: {
-                id_: editData.id_
+                id_: editData.id
               },
               param: params
             }
@@ -221,8 +222,8 @@ export default {
       this.editOrAdd = true
       this.addShow = true
       this.editFrom = item
-      this.ruleForm.title_ = item.title_
-      this.ruleForm.content_ = item.content_
+      this.ruleForm.title_ = item.title
+      this.ruleForm.content_ = item.content
       if (this.tabActive === 0) {
         this.shiFouEdit = false
       } else {
@@ -233,7 +234,7 @@ export default {
     onClose(item) {
       Dialog.alert({
         title: '提示',
-        message: `确定要关闭标题为<span style="color:red">${item.title_}</span>备忘信息吗?`,
+        message: `确定要关闭标题为<span style="color:red">${item.title}</span>备忘信息吗?`,
         showCancelButton: true
       }).then(() => {
         const params = { state_: '已关闭' }
@@ -242,7 +243,7 @@ export default {
           updList: [
             {
               where: {
-                id_: item.id_
+                id_: item.id
               },
               param: params
             }
@@ -274,12 +275,12 @@ export default {
         page = this.current * 10
       }
       const subject = this.subject
-      // sql注入接口
-      const sql = `select * from t_notes where state_='${conState}' AND title_ like '%${subject}%' ORDER BY create_time_ DESC limit ${page},10`
-      this.$common.request('sql', sql).then(res => {
-        const { data = [] } = res.variables || {}
+      queryMemorandum(
+        this.getSearcFormData(conState)
+      ).then(res => {
+        const { dataResult = [] } = res.data || {}
         // this.listData = data
-        if (data.length === 0) {
+        if (dataResult.length === 0) {
           if (this.current === 0) {
             this.noData = true
           } else {
@@ -291,8 +292,8 @@ export default {
           return
         }
 
-        this.listData.push(...data)
-
+        this.listData.push(...dataResult)
+        console.log(this.listData, 'ssssssssssssss')
         // 判断是否还有更多数据
         if ((this.listData.length) % 10 !== 0) {
           this.footText = true
@@ -303,9 +304,39 @@ export default {
 
         this.loading = false
         this.refreshing = false
-      }).catch(e => {
-        console.log('e', e)
       })
+      // sql注入接口
+      // const sql = `select * from t_notes where state_='${conState}' AND title_ like '%${subject}%' ORDER BY create_time_ DESC limit ${page},10`
+      // this.$common.request('sql', sql).then(res => {
+      //   const { data = [] } = res.variables || {}
+      //   // this.listData = data
+      //   if (data.length === 0) {
+      //     if (this.current === 0) {
+      //       this.noData = true
+      //     } else {
+      //       this.footText = true
+      //     }
+      //     this.finished = true
+      //     this.loading = false
+      //     this.refreshing = false
+      //     return
+      //   }
+
+      //   this.listData.push(...data)
+
+      //   // 判断是否还有更多数据
+      //   if ((this.listData.length) % 10 !== 0) {
+      //     this.footText = true
+      //     this.finished = true
+      //   } else {
+      //     this.current++
+      //   }
+
+      //   this.loading = false
+      //   this.refreshing = false
+      // }).catch(e => {
+      //   console.log('e', e)
+      // })
     },
     generateTitle(name, title) { // generateTitle by vue-i18n
       return i18n.generateTitle(name, title)
@@ -321,10 +352,13 @@ export default {
     /**
        * 获取格式化参数
        */
-    getSearcFormData() {
+    getSearcFormData(val) {
       let params = {}
       if (this.$utils.isNotEmpty(this.subject)) {
-        params['Q^name_^SL'] = this.subject
+        params['Q^title_^SL'] = this.subject
+      }
+      if (this.$utils.isNotEmpty(val)) {
+        params['Q^state_^SL'] = val
       }
       if (this.$utils.isNotEmpty(this.moreParams)) {
         params = Object.assign(params, this.moreParams)

+ 59 - 10
src/views/platform/bpmn/my-test/index.vue

@@ -241,6 +241,7 @@ import { Notify } from 'vant'
 import examPop from './examPop.vue'
 import examDetail from './examDetail.vue'
 import { dbSqlConfig } from '@/constant'
+import { queryMoblie } from '@/api/platform/feature/sqlInject'
 
 export default {
   components: {
@@ -742,11 +743,11 @@ export default {
       this.loading = true
       this.noData = false
       this.footText = false
-      let page = 0
+      let page = 1
       if (this.current === 0) {
-        page = 0
+        page = 1
       } else {
-        page = this.current * 10
+        page = (this.current + 1) * 10
       }
       const aa = JSON.parse(JSON.stringify(this.moreParams))
       let canshu3 = ''
@@ -759,8 +760,11 @@ export default {
         if (aa.bankName !== '' && aa.bankName !== undefined && aa.bankName !== null) {
           this.subjectTitle = aa.bankName
         }
+        console.log(aa.examType, 'nnnnnnnnn')
         if (aa.examType !== '' && aa.examType !== undefined && aa.examType !== null) {
           this.name = aa.examType === 'trainingExam' ? '培训考试' : aa.examType === 'POCTtraining' ? 'POCT培训' : aa.examType === 'selfAssessment' ? '自主考核' : aa.examType === 'routine' ? '常规' : '全部'
+        } else {
+          this.name = '全部'
         }
         this.startTime = []
         if (aa.limitDateDL || aa.limitDateDG) {
@@ -784,6 +788,7 @@ export default {
       } else {
         this.moreSubject = ''
         this.subjectTitle = ''
+        this.name = '全部'
       }
       const key = this.subject
       const key1 = this.moreSubject
@@ -802,10 +807,27 @@ export default {
       const sql = this.tabActive === 0 ? sql1 : sql2
       // let sql2 = `select * from (select * from t-exams ) a LEFT JOIN () B ON a.examId=b.exam_id_`
       // const { variables: { data }} = await this.$common.request('sql', sql)
-
-      // sql注入接口
-      this.$common.request('sql', sql).then(res => {
-        if (res.variables.data.length === 0) {
+      queryMoblie(
+        {
+          'pageNo': page,
+          'limit': 20,
+          'param': {
+            'examinee': this.info.employee.id,
+            'examName': key1,
+            'examType': [this.name === '全部' ? '' : this.name],
+            'bankName': key2,
+            'startDate^S': aa.startDateDL,
+            'startDate^E': aa.startDateDG,
+            'limitDate^S': aa.limitDateDL,
+            'limitDate^E': aa.limitDateDG,
+            'paperState': this.tabActive === 0 ? ['未开始'] : ['已交卷', '已完成', '进行中']
+          },
+          'sort': {
+            'startDate': 'DESC'
+          }
+        }
+      ).then(res => {
+        if (res.data.dataResult.length === 0) {
           if (this.current === 0) {
             this.noData = true
           } else {
@@ -817,7 +839,7 @@ export default {
           return
         }
 
-        this.listData.push(...res.variables.data)
+        this.listData.push(...res.data.dataResult)
 
         // 判断是否还有更多数据
         if ((this.listData.length) % 10 !== 0) {
@@ -829,9 +851,36 @@ export default {
 
         this.loading = false
         this.refreshing = false
-      }).catch(err => {
-        console.log(err)
       })
+      // sql注入接口
+      // this.$common.request('sql', sql).then(res => {
+      //   if (res.variables.data.length === 0) {
+      //     if (this.current === 0) {
+      //       this.noData = true
+      //     } else {
+      //       this.footText = true
+      //     }
+      //     this.finished = true
+      //     this.loading = false
+      //     this.refreshing = false
+      //     return
+      //   }
+
+      //   this.listData.push(...res.variables.data)
+
+      //   // 判断是否还有更多数据
+      //   if ((this.listData.length) % 10 !== 0) {
+      //     this.footText = true
+      //     this.finished = true
+      //   } else {
+      //     this.current++
+      //   }
+
+      //   this.loading = false
+      //   this.refreshing = false
+      // }).catch(err => {
+      //   console.log(err)
+      // })
     },
     // 获取格式化参数
     getSearcFormData() {

+ 93 - 31
src/views/platform/bpmn/reminders/index.vue

@@ -23,9 +23,9 @@
         <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
             <van-list v-model="loading" :finished="finished" @load="loadData">
                 <van-checkbox-group v-model="checkedIds">
-                    <van-cell v-for="(item,index) in listData" :key="item.id+index" :title="item.shi_wu_ming_cheng" class="vantCell" @click="onClick(item,index)">
+                    <van-cell v-for="(item,index) in listData" :key="item.id+index" :title="item.shiWuMingCheng" class="vantCell" @click="onClick(item,index)">
                         <template slot="icon">
-                            <van-checkbox v-if="checkMode" ref="checkboxes" :name="item.id_" class="ibps-mr-10" />
+                            <van-checkbox v-if="checkMode" ref="checkboxes" :name="item.id" class="ibps-mr-10" />
                             <ibps-avatar
                                 v-else
                                 :icon="_randomIcon(4)"
@@ -40,14 +40,14 @@
                         </template>
                         <template #label>
                             <van-row @click="overlayShow(item)">
-                                <van-col span="24">{{ item.shi_wu_shuo_ming_==''?'/':item.shi_wu_shuo_ming_==null?'/':item.shi_wu_shuo_ming_ }}</van-col>
+                                <van-col span="24">{{ item.shiWuShuoMing==''?'/':item.shiWuShuoMing==null?'/':item.shiWuShuoMing }}</van-col>
                             </van-row>
                         </template>
                         <!-- 插入内容 -->
-                        <span>{{ item.create_time_|formatRelativeTime }}</span>
+                        <span>{{ item.createTime|formatRelativeTime }}</span>
                         <div>
                             <!-- 系统消息 -->
-                            <van-icon v-if="item.ti_xing_shi_jian_&&currentTime-new Date(item.ti_xing_shi_jian_).getTime()<7200000" name="comment-o" size="1.3rem" color="#ccc" @click="prompt(item,'mesg')" />
+                            <van-icon v-if="item.tiXingShiJian&&currentTime-new Date(item.tiXingShiJian).getTime()<7200000" name="comment-o" size="1.3rem" color="#ccc" @click="prompt(item,'mesg')" />
                             <van-icon v-else name="comment-o" size="1.3rem" color="#1E90FF" @click.stop="sendSystemInfo(item)" />
                             <!-- <van-icon v-else name="bell" size="1.3rem" color="#1E90FF" @click.stop="sendSystemInfo(item)" /> -->
                         </div>
@@ -95,6 +95,7 @@ import { sendSmsList } from './sendSms'
 import { Notify } from 'vant'
 import { Toast } from 'vant'
 import { dbSqlConfig } from '@/constant'
+import { queryRem } from '@/api/platform/feature/sqlInject'
 
 export default {
   components: {
@@ -217,9 +218,9 @@ export default {
   methods: {
     prompt(item, type) {
       if (type === 'mesg') {
-        Notify({ type: 'warning', message: `上次消息催办时间为${item.ti_xing_shi_jian_.substring(0, 16)},距今不足两小时,请勿频繁催办!` })
+        Notify({ type: 'warning', message: `上次消息催办时间为${item.tiXingShiJian.substring(0, 16)},距今不足两小时,请勿频繁催办!` })
       } else {
-        Notify({ type: 'warning', message: `上次短信催办时间为${item.duan_xin_shi_jian.substring(0, 16)},距今不足两小时,请勿频繁催办!` })
+        Notify({ type: 'warning', message: `上次短信催办时间为${item.tiXingShiJian.substring(0, 16)},距今不足两小时,请勿频繁催办!` })
       }
     },
     // 设置定时器
@@ -229,6 +230,7 @@ export default {
       }, 1000)
     },
     sendFunction(listData) {
+      console.log(listData, 'llllllllllll')
       const sendNotice = (req, ups) => {
         req.forEach((item, i) => {
           this.$common.sendMsg(item)
@@ -265,29 +267,31 @@ export default {
       const currentTime = new Date(new Date().getTime() + 28800000).toJSON().slice(0, 16).replace('T', ' ')
       console.log('currentTime', currentTime)
       listData.forEach(item => {
+        console.log(item, 'listDatalistDatalistDatalistData')
+
         const notice = {
-          subject: msgTitle[item.guo_qi_zhuang_tai],
-          content: `${item.shi_wu_ming_cheng}【${item.shi_wu_shuo_ming_}】${msgContent[item.guo_qi_zhuang_tai]}`,
-          receiverId: item.chu_li_ren_id_,
+          subject: msgTitle[item.guoQiZhuangTai],
+          content: `${item.shiWuMingCheng}【${item.shiWuShuoMing}】${msgContent[item.guoQiZhuangTai]}`,
+          receiverId: item.chuLiRenId,
           canreplay: '0'
         }
         const up = {
           where: {
-            id_: item.id_
+            id_: item.id
           },
           param: {
-            ti_xing_ci_shu_: parseInt(item.ti_xing_ci_shu_) + 1,
+            ti_xing_ci_shu_: parseInt(item.tiXingCiShu) + 1,
             ti_xing_shi_jian_: currentTime
           }
         }
         noticeList.push(notice)
         upList.push(up)
         // 校验提醒时间 (间隔不足2小时不允许发送)
-        const D = new Date(item.ti_xing_shi_jian_).getTime()
+        const D = new Date(item.tiXingShiJian).getTime()
         const N = new Date(currentTime).getTime()
         if (N - D < 7200000) {
           flag = true
-          msg = `事务【${item.shi_wu_ming_cheng}】上次消息催办时间为${item.ti_xing_shi_jian_},距今不足两小时,请勿频繁催办!`
+          msg = `事务【${item.shiWuMingCheng}】上次消息催办时间为${item.tiXingShiJian},距今不足两小时,请勿频繁催办!`
         }
       })
       if (flag) {
@@ -346,7 +350,38 @@ export default {
           const listData = []
           res.variables.data.forEach(item => {
             if (list.includes(item.id_)) {
-              listData.push(item)
+              const obj = {
+                id: item.id_ || '',
+                tenantId: item.tenant_id_ || '',
+                ip: item.ip_ || '',
+                createBy: item.create_by_ || '',
+                createTime: item.create_time_ || '',
+                updateBy: item.update_by_ || '',
+                updateTime: item.update_time_ || '',
+                shiFouGuoShen: item.shi_fou_guo_shen_ || '',
+                bianZhiRen: item.bian_zhi_ren_ || '',
+                bianZhiBuMen: item.bian_zhi_bu_men_ || '',
+                bianZhiShiJian: item.bian_zhi_shi_jian || '',
+                shiWuId: item.shi_wu_id_ || '',
+                wanZhengMingCheng: item.wan_zheng_ming_ch || '',
+                shiWuMingCheng: item.shi_wu_ming_cheng || '',
+                shiWuLeiXing: item.shi_wu_lei_xing_ || '',
+                shiWuZhuangTai: item.shi_wu_zhuang_tai || '',
+                shiWuShuoMing: item.shi_wu_shuo_ming_ || '',
+                chuLiRenMing: item.chu_li_ren_ming_ || '',
+                chuLiRenId: item.chu_li_ren_id_ || '',
+                chuLiRenDianHua: item.chu_li_ren_dian_h || '',
+                buMen: item.bu_men_ || '',
+                buMenId: item.bu_men_id_ || '',
+                zhuGuanId: item.zhu_guan_id_ || '',
+                zhuGuanDianHua: item.zhu_guan_dian_hua || '',
+                tiXingCiShu: item.ti_xing_ci_shu_ || '',
+                duanXinCiShu: item.duan_xin_ci_shu_ || '',
+                tiXingShiJian: item.ti_xing_shi_jian_ || '',
+                duanXinShiJian: item.duan_xin_shi_jian || '',
+                guoQiZhuangTai: item.guo_qi_zhuang_tai || ''
+              }
+              listData.push(obj)
             }
           })
           resolve(listData)// 将处理后的数据作为参数传递给resolve
@@ -369,19 +404,19 @@ export default {
     },
     // 短信催办函数
     smsFunction(item) {
-      if (item.chu_li_ren_dian_h) {
+      if (item.chuLiRenDianH) {
         const obj = {
-          sig: item.id_,
+          sig: item.id,
           list: [
-            { chu_li_ren_: item.chu_li_ren_ming_, chu_li_ren_dian_h: item.chu_li_ren_dian_h, ren_wu_ming_cheng: item.shi_wu_ming_cheng }
+            { chu_li_ren_: item.chuLiRenMing, chu_li_ren_dian_h: item.chuLiRenDianH, ren_wu_ming_cheng: item.shiWuMingCheng }
           ]
         }
         // 获取当时时间
         const currentTime = new Date(new Date().getTime() + 28800000).toJSON().slice(0, 16).replace('T', ' ')
-        const D = new Date(item.duan_xin_shi_jian).getTime()
+        const D = new Date(item.duanXinShiJian).getTime()
         const N = new Date(currentTime).getTime()
         if (N - D < 7200000) {
-          Notify({ type: 'primary', message: `事务【${item.shi_wu_ming_cheng}】上次信息催办时间为${item.duan_xin_shi_jian},距今不足两小时,请勿频繁催办!` })
+          Notify({ type: 'primary', message: `事务【${item.shiWuMingCheng}】上次信息催办时间为${item.duanXinShiJian},距今不足两小时,请勿频繁催办!` })
           return
         }
         sendSmsList(obj).then((res) => {
@@ -391,10 +426,10 @@ export default {
             updList: [
               {
                 where: {
-                  id_: item.id_
+                  id_: item.id
                 },
                 param: {
-                  duan_xin_ci_shu_: parseInt(item.duan_xin_ci_shu_) + 1,
+                  duan_xin_ci_shu_: parseInt(item.duanXinCiShu) + 1,
                   duan_xin_shi_jian: this.getCurrentDateTime()
                 }
               }]
@@ -501,11 +536,12 @@ export default {
         page = this.current * 10
       }
       const key = this.subject
-      const sql = `select * from t_gqswb where t_gqswb.shi_wu_ming_cheng like'%` + key + `%'  ORDER BY t_gqswb.create_time_ DESC LIMIT ${page},10 `
 
-      // sql注入接口
-      this.$common.request('sql', sql).then(res => {
-        if (res.variables.data.length === 0) {
+      // const sql = `select * from t_gqswb where t_gqswb.shi_wu_ming_cheng like'%` + key + `%'  ORDER BY t_gqswb.create_time_ DESC LIMIT ${page},10 `
+      queryRem(
+        this.getSearcFormData()
+      ).then(res => {
+        if (res.data.dataResult.length === 0) {
           if (this.current === 0) {
             this.noData = true
           } else {
@@ -517,8 +553,7 @@ export default {
           return
         }
 
-        this.listData.push(...res.variables.data)
-
+        this.listData.push(...res.data.dataResult)
         // 判断是否还有更多数据
         if ((this.listData.length) % 10 !== 0) {
           this.footText = true
@@ -529,15 +564,42 @@ export default {
 
         this.loading = false
         this.refreshing = false
-      }).catch(err => {
-        console.log(err)
       })
+      // sql注入接口
+      // this.$common.request('sql', sql).then(res => {
+      //   if (res.variables.data.length === 0) {
+      //     if (this.current === 0) {
+      //       this.noData = true
+      //     } else {
+      //       this.footText = true
+      //     }
+      //     this.finished = true
+      //     this.loading = false
+      //     this.refreshing = false
+      //     return
+      //   }
+
+      //   this.listData.push(...res.variables.data)
+
+      //   // 判断是否还有更多数据
+      //   if ((this.listData.length) % 10 !== 0) {
+      //     this.footText = true
+      //     this.finished = true
+      //   } else {
+      //     this.current++
+      //   }
+
+      //   this.loading = false
+      //   this.refreshing = false
+      // }).catch(err => {
+      //   console.log(err)
+      // })
     },
     // 获取格式化参数
     getSearcFormData() {
       let params = {}
       if (this.$utils.isNotEmpty(this.subject)) {
-        params['Q^subject_^SL'] = this.subject
+        params['Q^shi_wu_ming_cheng^SL'] = this.subject
       }
       if (this.$utils.isNotEmpty(this.moreParams)) {
         params = Object.assign(params, this.moreParams)

+ 35 - 35
src/views/platform/bpmn/reminders/reminder.vue

@@ -8,11 +8,11 @@
         <div style="width:90%;margin:5% auto;">
             <van-row>
                 <van-col span="8" class="prompt">事务名称:</van-col>
-                <van-col span="16" class="content"> {{ sonData.shi_wu_ming_cheng==''?'/':sonData.shi_wu_ming_cheng==null?'/':sonData.shi_wu_ming_cheng==undefined?'/':sonData.shi_wu_ming_cheng }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.shiWuMingCheng==''?'/':sonData.shiWuMingCheng==null?'/':sonData.shiWuMingCheng==undefined?'/':sonData.shiWuMingCheng }}</van-col>
             </van-row>
             <van-row>
                 <van-col span="8" class="prompt">部门:</van-col>
-                <van-col span="16" class="content"> {{ sonData.bu_men_==''?'/':sonData.bu_men_==null?'/':sonData.bu_men_==undefined?'/':sonData.bu_men_ }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.buMen==''?'/':sonData.buMen==null?'/':sonData.buMen==undefined?'/':sonData.buMen }}</van-col>
             </van-row>
             <!-- <van-row>
                 <van-col span="8" class="prompt">事务类型:</van-col>
@@ -21,40 +21,40 @@
 
             <van-row>
                 <van-col span="8" class="prompt">过期时间:</van-col>
-                <van-col span="16" class="content"> {{ sonData.shi_wu_ming_cheng==''?'/':sonData.shi_wu_ming_cheng==null?'/':sonData.shi_wu_ming_cheng==undefined?'/':sonData.shi_wu_ming_cheng }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.bianZhiShiJian==''?'/':sonData.bianZhiShiJian==null?'/':sonData.bianZhiShiJian==undefined?'/':sonData.bianZhiShiJian }}</van-col>
             </van-row>
             <van-row>
                 <van-col span="8" class="prompt">事务状态:</van-col>
-                <van-col span="16" class="content"> {{ sonData.shi_wu_zhuang_tai==''?'/':sonData.shi_wu_zhuang_tai==null?'/':sonData.shi_wu_zhuang_tai==undefined?'/':sonData.shi_wu_zhuang_tai }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.shiWuZhuangTai==''?'/':sonData.shiWuZhuangTai==null?'/':sonData.shiWuZhuangTai==undefined?'/':sonData.shiWuZhuangTai }}</van-col>
             </van-row>
             <van-row>
                 <van-col span="8" class="prompt">处理人:</van-col>
-                <van-col span="16" class="content"> {{ sonData.chu_li_ren_ming_==''?'/':sonData.chu_li_ren_ming_==null?'/':sonData.chu_li_ren_ming_==undefined?'/':sonData.chu_li_ren_ming_ }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.chuLiRenMing==''?'/':sonData.chuLiRenMing==null?'/':sonData.chuLiRenMing==undefined?'/':sonData.chuLiRenMing }}</van-col>
             </van-row>
             <van-row>
                 <van-col span="8" class="prompt">事务说明:</van-col>
-                <van-col span="16" class="content"> {{ sonData.shi_wu_shuo_ming_==''?'/':sonData.shi_wu_shuo_ming_==null?'/':sonData.shi_wu_shuo_ming_==undefined?'/':sonData.shi_wu_shuo_ming_ }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.shiWuShuoMing==''?'/':sonData.shiWuShuoMing==null?'/':sonData.shiWuShuoMing==undefined?'/':sonData.shiWuShuoMing }}</van-col>
             </van-row>
 
             <van-row>
                 <van-col span="8" class="prompt">处理人电话:</van-col>
-                <van-col span="16" class="content"> {{ sonData.chu_li_ren_dian_h==''?'/':sonData.chu_li_ren_dian_h==null?'/':sonData.chu_li_ren_dian_h==undefined?'/':sonData.chu_li_ren_dian_h }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.chuLiRenDianH==''?'/':sonData.chuLiRenDianH==null?'/':sonData.chuLiRenDianH==undefined?'/':sonData.chuLiRenDianH }}</van-col>
             </van-row>
             <van-row>
                 <van-col span="8" class="prompt">部门主管:</van-col>
-                <van-col span="16" class="content"> {{ sonData.zhu_guan_id_==''?'/':sonData.zhu_guan_id_==null?'/':sonData.zhu_guan_id_==undefined?'/':changUserName(sonData) }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.zhuGuanId==''?'/':sonData.zhuGuanId==null?'/':sonData.zhuGuanId==undefined?'/':changUserName(sonData) }}</van-col>
             </van-row>
             <van-row>
                 <van-col span="8" class="prompt">主管电话:</van-col>
-                <van-col span="16" class="content"> {{ sonData.zhu_guan_dian_hua==''?'/':sonData.zhu_guan_dian_hua==null?'/':sonData.zhu_guan_dian_hua==undefined?'/':sonData.zhu_guan_dian_hua }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.zhuGuanDianHua==''?'/':sonData.zhuGuanDianHua==null?'/':sonData.zhuGuanDianHua==undefined?'/':sonData.zhuGuanDianHua }}</van-col>
             </van-row>
             <van-row>
                 <van-col span="8" class="prompt">催办次数:</van-col>
-                <van-col span="16" class="content"> {{ sonData.ti_xing_ci_shu_==''?'/':sonData.ti_xing_ci_shu_==null?'/':sonData.ti_xing_ci_shu_==undefined?'/':sonData.ti_xing_ci_shu_ }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.tiXingCiShu==''?'/':sonData.tiXingCiShu==null?'/':sonData.tiXingCiShu==undefined?'/':sonData.tiXingCiShu }}</van-col>
             </van-row>
             <van-row>
                 <van-col span="8" class="prompt">上次催办时间:</van-col>
-                <van-col span="16" class="content"> {{ sonData.ti_xing_shi_jian_==''?'/':sonData.ti_xing_shi_jian_==null?'/':sonData.ti_xing_shi_jian_==undefined?'/':sonData.ti_xing_shi_jian_ }}</van-col>
+                <van-col span="16" class="content"> {{ sonData.tiXingShiJian==''?'/':sonData.tiXingShiJian==null?'/':sonData.tiXingShiJian==undefined?'/':sonData.tiXingShiJian }}</van-col>
             </van-row>
             <!-- <van-row>
                 <van-col span="8" class="prompt">过期状态:</van-col>
@@ -65,34 +65,34 @@
 </template>
 <script>
 export default {
-    props: {
-        sonData: {
-            type: Object,
-            default: {}
-        }
-    },
-    data() {
-        const userList = this.$store.getters.userList
-        return {
-            userList: userList
-        }
-    },
-    created() {
+  props: {
+    sonData: {
+      type: Object,
+      default: {}
+    }
+  },
+  data() {
+    const userList = this.$store.getters.userList
+    return {
+      userList: userList
+    }
+  },
+  created() {
 
-        // 使用人id转换为用户名称
+    // 使用人id转换为用户名称
 
+  },
+  methods: {
+    changUserName(data) {
+      const user = this.userList.find(item => item.userId === data.zhuGuanId)
+      if (user) {
+        return user.userName
+      }
     },
-    methods: {
-        changUserName(data) {
-            const user = this.userList.find(item => item.userId === data.zhu_guan_id_)
-            if (user) {
-                return user.userName
-            }
-        },
-        onClose() {
-            this.$emit('son', false)
-        }
+    onClose() {
+      this.$emit('son', false)
     }
+  }
 }
 </script>
 <style scoped lang="less">

+ 52 - 21
src/views/platform/bpmn/report/delayReport.vue

@@ -23,7 +23,7 @@
                     <van-cell
                         v-for="(item,index) in listData"
                         :key="item.id+index"
-                        :title="item.yang_pin_hao_==''?'/':item.yang_pin_hao_==null?'/':item.yang_pin_hao_"
+                        :title="item.yangPinHao==''?'/':item.yangPinHao==null?'/':item.yangPinHao"
                         @click="onClick(item,index)"
                     >
                         <template slot="icon">
@@ -34,23 +34,23 @@
                         <template #label>
                             <van-row class="delayShow">
                                 <van-col span="6">病员姓名:</van-col>
-                                <van-col span="17">{{ item.xing_ming_==''?'/':item.xing_ming_==null?'/':item.xing_ming_ }}</van-col>
+                                <van-col span="17">{{ item.xingMing==''?'/':item.xingMing==null?'/':item.xingMing }}</van-col>
                             </van-row>
                             <van-row class="delayShow">
                                 <van-col span="6">检验项目:</van-col>
-                                <van-col span="17">{{ item.xiang_mu_==''?'/':item.xiang_mu_==null?'/':item.xiang_mu_ }}</van-col>
+                                <van-col span="17">{{ item.xiangMu==''?'/':item.xiangMu==null?'/':item.xiangMu }}</van-col>
                             </van-row>
                             <van-row class="delayShow">
                                 <van-col span="6">延迟原因:</van-col>
                                 <van-col
                                     span="17"
-                                >{{ item.yan_chi_yuan_yin_==''?'/':item.yan_chi_yuan_yin_==null?'/':item.yan_chi_yuan_yin_ }}</van-col>
+                                >{{ item.yanChiYuanYin==''?'/':item.yanChiYuanYin==null?'/':item.yanChiYuanYin }}</van-col>
                             </van-row>
                             <van-row class="delayShow">
                                 <van-col span="6">编制日期:</van-col>
                                 <van-col
                                     span="17"
-                                >{{ item.bian_zhi_shi_jian.slice(0,10)==''?'/':item.bian_zhi_shi_jian.slice(0,10)==null?'/':item.bian_zhi_shi_jian.slice(0,10) }}</van-col>
+                                >{{ item.bianZhiShiJian.slice(0,10)==''?'/':item.bianZhiShiJian.slice(0,10)==null?'/':item.bianZhiShiJian.slice(0,10) }}</van-col>
                             </van-row>
                         </template>
                     </van-cell>
@@ -89,7 +89,7 @@
                 <div style="width: 90%;margin: 1% auto;">
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">科室/病区:</van-col>
-                        <van-col span="14">{{ oralPopup.bing_qu_==''?'/':oralPopup.bing_qu_==null?'/':oralPopup.bing_qu_ }}</van-col>
+                        <van-col span="14">{{ oralPopup.bingQu==''?'/':oralPopup.bingQu==null?'/':oralPopup.bingQu }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">接收者:</van-col>
@@ -101,7 +101,7 @@
                         <van-col span="10" class="leftPopups">病员姓名:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.xing_ming_==''?'/':oralPopup.xing_ming_==null?'/':oralPopup.xing_ming_ }}</van-col>
+                        >{{ oralPopup.xingMing==''?'/':oralPopup.xingMing==null?'/':oralPopup.xingMing }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">审核人:</van-col>
@@ -113,7 +113,7 @@
                         <van-col span="10" class="leftPopups">样品号:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.yang_pin_hao_==''?'/':oralPopup.yang_pin_hao_==null?'/':oralPopup.yang_pin_hao_ }}</van-col>
+                        >{{ oralPopup.yangPinHao==''?'/':oralPopup.yangPinHao==null?'/':oralPopup.yangPinHao }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">编制部门:</van-col>
@@ -125,7 +125,7 @@
                         <van-col span="10" class="leftPopups">检验项目:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.xiang_mu_==''?'/':oralPopup.xiang_mu_==null?'/':oralPopup.xiang_mu_ }}</van-col>
+                        >{{ oralPopup.xiangMu==''?'/':oralPopup.xiangMu==null?'/':oralPopup.xiangMu }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">编制人员:</van-col>
@@ -137,7 +137,7 @@
                         <van-col span="10" class="leftPopups">延迟原因:</van-col>
                         <van-col span="14">
                             <div style="max-height: 200px;overflow-y: auto;">
-                                {{ oralPopup.yan_chi_yuan_yin_==''?'/':oralPopup.yan_chi_yuan_yin_==null?'/':oralPopup.yan_chi_yuan_yin_ }}
+                                {{ oralPopup.yanChiYuanYin==''?'/':oralPopup.yanChiYuanYin==null?'/':oralPopup.yanChiYuanYin }}
                             </div>
                         </van-col>
                     </van-row>
@@ -145,7 +145,7 @@
                         <van-col span="10" class="leftPopups">编制日期:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.bian_zhi_shi_jian==''?'/':oralPopup.bian_zhi_shi_jian==null?'/':oralPopup.bian_zhi_shi_jian }}</van-col>
+                        >{{ oralPopup.bianZhiShiJian==''?'/':oralPopup.bianZhiShiJian==null?'/':oralPopup.bianZhiShiJian }}</van-col>
                     </van-row>
                     <van-row v-if="oralPopup.aa=='空'" class="showPopups">
                         <van-col span="10" class="leftPopups">附件:</van-col>
@@ -156,7 +156,7 @@
               multiple clearable :readonly="true" /> -->
                         <van-col span="24">
                             <ibps-uploader
-                                v-model="oralPopup.fu_jian_"
+                                v-model="oralPopup.fuJian"
                                 download
                                 :have-padding="false"
                                 label="附件"
@@ -169,7 +169,7 @@
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">备注:</van-col>
-                        <van-col span="14">{{ oralPopup.bei_zhu_==''?'/':oralPopup.bei_zhu_==null?'/':oralPopup.bei_zhu_ }}</van-col>
+                        <van-col span="14">{{ oralPopup.beiZhu==''?'/':oralPopup.beiZhu==null?'/':oralPopup.beiZhu }}</van-col>
 
                         <!-- <van-col span="16">{{oralPopup.bian_zhi_shi_jian.slice(0,10)}}</van-col> -->
                     </van-row>
@@ -198,6 +198,8 @@ import IbpsAvatar from '@/components/ibps-avatar'
 import IbpsToolbar from '@/components/ibps-toolbar'
 import IbpsListResultPage from '@/components/ibps-list-result-page'
 import IbpsBpmnFormrenderDialog from '@/business/platform/bpmn/form/dialog'
+import { dbSqlConfig } from '@/constant'
+import { queryDelay } from '@/api/platform/feature/sqlInject'
 
 export default {
   components: {
@@ -210,7 +212,10 @@ export default {
   },
   mixins: [random, bpmnStatus],
   data() {
+    const { userInfo } = this.$store.getters
+
     return {
+      userInfo,
       footText: false,
       noData: false,
       oralPopup: '',
@@ -281,7 +286,7 @@ export default {
       this.loading = true
       this.noData = false
       this.footText = false
-      await this.getPositionobj()
+      // await this.getPositionobj()
       let page = 0
       if (this.current === 0) {
         page = 0
@@ -289,11 +294,10 @@ export default {
         page = this.current * 10
       }
       const key = this.subject
-
-      // sql注入接口
-      const sql = `select t_ycbgjlb.*,(case t_ycbgjlb.fu_jian_ when '' then '空' else t_ycbgjlb.fu_jian_ END) as aa,g.bianzhibumen,g.bianzhiren,g.shenheren,g.jieshouzhe from t_ycbgjlb LEFT JOIN (select e.*,f.jieshouzhe from (select c.*,d.shenheren from (select a.*,b.bianzhiren from (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_ycbgjlb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN (select t.id_ ,u.NAME_ as bianzhiren from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ = b.id_) as c LEFT JOIN (select t.id_ ,u.NAME_ as shenheren from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.shen_he_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as d on c.id_ = d.id_) as e LEFT JOIN (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.jie_shou_zhe_)) as jieshouzhe from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.jie_shou_zhe_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as f on e.id_ = f.id_)as g on t_ycbgjlb.id_ =g.id_ where find_in_set(t_ycbgjlb.bian_zhi_bu_men_,'${this.positionObj}') and t_ycbgjlb.yang_pin_hao_ like'%` + key + `%' ORDER BY t_ycbgjlb.create_time_ DESC LIMIT ${page},10`
-      this.$common.request('sql', sql).then(res => {
-        if (res.variables.data.length === 0) {
+      queryDelay(
+        this.getSearcFormData()
+      ).then(res => {
+        if (res.data.dataResult.length === 0) {
           if (this.current === 0) {
             this.noData = true
           } else {
@@ -304,7 +308,7 @@ export default {
           this.refreshing = false
           return
         }
-        this.listData.push(...res.variables.data)
+        this.listData.push(...res.data.dataResult)
         // 判断是否还有更多数据
         if ((this.listData.length) % 10 !== 0) {
           this.footText = true
@@ -316,6 +320,33 @@ export default {
         this.loading = false
         this.refreshing = false
       })
+
+      // sql注入接口
+      // const sql = `select t_ycbgjlb.*,(case t_ycbgjlb.fu_jian_ when '' then '空' else t_ycbgjlb.fu_jian_ END) as aa,g.bianzhibumen,g.bianzhiren,g.shenheren,g.jieshouzhe from t_ycbgjlb LEFT JOIN (select e.*,f.jieshouzhe from (select c.*,d.shenheren from (select a.*,b.bianzhiren from (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_ycbgjlb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN (select t.id_ ,u.NAME_ as bianzhiren from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ = b.id_) as c LEFT JOIN (select t.id_ ,u.NAME_ as shenheren from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.shen_he_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as d on c.id_ = d.id_) as e LEFT JOIN (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.jie_shou_zhe_)) as jieshouzhe from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.jie_shou_zhe_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as f on e.id_ = f.id_)as g on t_ycbgjlb.id_ =g.id_ where find_in_set(t_ycbgjlb.bian_zhi_bu_men_,'${this.positionObj}') and t_ycbgjlb.yang_pin_hao_ like'%` + key + `%' ORDER BY t_ycbgjlb.create_time_ DESC LIMIT ${page},10`
+      // this.$common.request('sql', sql).then(res => {
+      //   if (res.variables.data.length === 0) {
+      //     if (this.current === 0) {
+      //       this.noData = true
+      //     } else {
+      //       this.footText = true
+      //     }
+      //     this.finished = true
+      //     this.loading = false
+      //     this.refreshing = false
+      //     return
+      //   }
+      //   this.listData.push(...res.variables.data)
+      //   // 判断是否还有更多数据
+      //   if ((this.listData.length) % 10 !== 0) {
+      //     this.footText = true
+      //     this.finished = true
+      //   } else {
+      //     this.current++
+      //   }
+
+      //   this.loading = false
+      //   this.refreshing = false
+      // })
     },
     // 获取positionobj数据
     async getPositionobj() {
@@ -370,7 +401,7 @@ export default {
     getSearcFormData() {
       let params = {}
       if (this.$utils.isNotEmpty(this.subject)) {
-        params['Q^subject_^SL'] = this.subject
+        params['Q^yang_pin_hao_^SL'] = this.subject
       }
       if (this.$utils.isNotEmpty(this.moreParams)) {
         params = Object.assign(params, this.moreParams)

+ 57 - 26
src/views/platform/bpmn/report/oralReport.vue

@@ -23,7 +23,7 @@
                     <van-cell
                         v-for="(item,index) in listData"
                         :key="item.id+index"
-                        :title="item.xing_ming_==''?'/':item.xing_ming_==null?'/':item.xing_ming_"
+                        :title="item.xingMing==''?'/':item.xingMing==null?'/':item.xingMing"
                         @click="onClick(item,index)"
                     >
                         <template slot="icon">
@@ -34,21 +34,21 @@
                         <template #label>
                             <van-row>
                                 <van-col span="6">门诊/住院号:</van-col>
-                                <van-col span="17">{{ item.zhu_yuan_hao_==''?'/':item.xing_ming_==null?'/':item.xing_ming_ }}</van-col>
+                                <van-col span="17">{{ item.zhuYuanHao==''?'/':item.zhuYuanHao==null?'/':item.zhuYuanHao }}</van-col>
                             </van-row>
                             <van-row>
                                 <van-col span="6">床号:</van-col>
-                                <van-col span="17">{{ item.chuang_hao_==''?'/':item.chuang_hao_==null?'/':item.chuang_hao_ }}</van-col>
+                                <van-col span="17">{{ item.chuangHao==''?'/':item.chuangHao==null?'/':item.chuangHao }}</van-col>
                             </van-row>
                             <van-row>
                                 <van-col span="6">检验项目:</van-col>
-                                <van-col span="17">{{ item.xiang_mu_==''?'/':item.xiang_mu_==null?'/':item.xiang_mu_ }}</van-col>
+                                <van-col span="17">{{ item.xiangMu==''?'/':item.xiangMu==null?'/':item.xiangMu }}</van-col>
                             </van-row>
                             <van-row>
                                 <van-col span="6">编制日期:</van-col>
                                 <van-col
                                     span="17"
-                                >{{ item.bian_zhi_shi_jian.slice(0,10)==''?'/':item.bian_zhi_shi_jian.slice(0,10)==null?'/':item.bian_zhi_shi_jian.slice(0,10) }}</van-col>
+                                >{{ item.bianZhiShiJian==''?'/':item.bianZhiShiJian==null?'/':item.bianZhiShiJian.slice(0,10) }}</van-col>
                             </van-row>
                         </template>
                     </van-cell>
@@ -90,66 +90,66 @@
                         <van-col span="10" class="leftPopups">病员姓名:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.xing_ming_==''?'/':oralPopup.xing_ming_==null?'/':oralPopup.xing_ming_ }}</van-col>
+                        >{{ oralPopup.xingMing==''?'/':oralPopup.xingMing==null?'/':oralPopup.xingMing }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">性别:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.xing_bie_==''?'/':oralPopup.xing_bie_==null?'/':oralPopup.xing_bie_ }}</van-col>
+                        >{{ oralPopup.xingBie==''?'/':oralPopup.xingBie==null?'/':oralPopup.xingBie }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">科室/病区:</van-col>
-                        <van-col span="14">{{ oralPopup.bing_qu_==''?'/':oralPopup.bing_qu_==null?'/':oralPopup.bing_qu_ }}</van-col>
+                        <van-col span="14">{{ oralPopup.bingQu==''?'/':oralPopup.bingQu==null?'/':oralPopup.bingQu }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">门诊/住院部:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.zhu_yuan_hao_==''?'/':oralPopup.zhu_yuan_hao_==null?'/':oralPopup.zhu_yuan_hao_ }}</van-col>
+                        >{{ oralPopup.zhuYuanHao==''?'/':oralPopup.zhuYuanHao==null?'/':oralPopup.zhuYuanHao }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">床号:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.chuang_hao_==''?'/':oralPopup.chuang_hao_==null?'/':oralPopup.chuang_hao_ }}</van-col>
+                        >{{ oralPopup.chuangHao==''?'/':oralPopup.chuangHao==null?'/':oralPopup.chuangHao }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">接听者:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.jie_ting_zhe_==''?'/':oralPopup.jie_ting_zhe_==null?'/':oralPopup.jie_ting_zhe_ }}</van-col>
+                        >{{ oralPopup.jieTingZhe==''?'/':oralPopup.jieTingZhe==null?'/':oralPopup.jieTingZhe }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">补发书面报告时间:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.bao_gao_shi_jian_==''?'/':oralPopup.bao_gao_shi_jian_==null?'/':oralPopup.bao_gao_shi_jian_ }}</van-col>
+                        >{{ oralPopup.baoGaoShiJian==''?'/':oralPopup.baoGaoShiJian==null?'/':oralPopup.baoGaoShiJian }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">补发书面报告编号:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.bao_gao_bian_hao_==''?'/':oralPopup.bao_gao_bian_hao_==null?'/':oralPopup.bao_gao_bian_hao_ }}</van-col>
+                        >{{ oralPopup.baoGaoBianHao==''?'/':oralPopup.baoGaoBianHao==null?'/':oralPopup.baoGaoBianHao }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">检验项目:</van-col>
                         <van-col span="14">
                             <div style="max-height: 200px;overflow-y: auto;">
-                                {{ oralPopup.xiang_mu_==''?'/':oralPopup.xiang_mu_==null?'/':oralPopup.xiang_mu_ }}</div>
+                                {{ oralPopup.xiangMu==''?'/':oralPopup.xiangMu==null?'/':oralPopup.xiangMu }}</div>
                         </van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">检验结果:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.jian_ce_jie_guo_==''?'/':oralPopup.jian_ce_jie_guo_==null?'/':oralPopup.jian_ce_jie_guo_ }}</van-col>
+                        >{{ oralPopup.jianCeJieGuo==''?'/':oralPopup.jianCeJieGuo==null?'/':oralPopup.jianCeJieGuo }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">复查结果:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.fu_cha_jie_guo_==''?'/':oralPopup.fu_cha_jie_guo_==null?'/':oralPopup.fu_cha_jie_guo_ }}</van-col>
+                        >{{ oralPopup.fuChaJieGuo==''?'/':oralPopup.fuChaJieGuo==null?'/':oralPopup.fuChaJieGuo }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">编制部门:</van-col>
@@ -161,7 +161,7 @@
                         <van-col span="10" class="leftPopups">沟通说明:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.shuo_ming_==''?'/':oralPopup.shuo_ming_==null?'/':oralPopup.shuo_ming_ }}</van-col>
+                        >{{ oralPopup.shuoMing==''?'/':oralPopup.shuoMing==null?'/':oralPopup.shuoMing }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">编制人员:</van-col>
@@ -178,7 +178,7 @@
               multiple clearable :readonly="true" /> -->
                         <van-col span="24">
                             <ibps-uploader
-                                v-model="oralPopup.fu_jian_"
+                                v-model="oralPopup.fuJian"
                                 download
                                 :have-padding="false"
                                 label="附件"
@@ -193,7 +193,7 @@
                         <van-col span="10" class="leftPopups">编制日期:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.bian_zhi_shi_jian==''?'/':oralPopup.bian_zhi_shi_jian==null?'/':oralPopup.bian_zhi_shi_jian }}</van-col>
+                        >{{ oralPopup.bianZhiShiJian==''?'/':oralPopup.bianZhiShiJian==null?'/':oralPopup.bianZhiShiJian }}</van-col>
 
                         <!-- <van-col span="16">{{oralPopup.bian_zhi_shi_jian.slice(0,10)}}</van-col> -->
                     </van-row>
@@ -223,6 +223,8 @@ import IbpsAvatar from '@/components/ibps-avatar'
 import IbpsToolbar from '@/components/ibps-toolbar'
 import IbpsListResultPage from '@/components/ibps-list-result-page'
 import IbpsBpmnFormrenderDialog from '@/business/platform/bpmn/form/dialog'
+import { dbSqlConfig } from '@/constant'
+import { queryOral } from '@/api/platform/feature/sqlInject'
 
 export default {
   components: {
@@ -308,7 +310,7 @@ export default {
       this.loading = true
       this.noData = false
       this.footText = false
-      await this.getPositionobj()
+      // await this.getPositionobj()
       let page = 0
       if (this.current === 0) {
         page = 0
@@ -316,10 +318,11 @@ export default {
         page = this.current * 10
       }
       const key = this.subject
-      // sql注入接口
-      const sql = `select t_ktbglcjgjlb.*,(case t_ktbglcjgjlb.fu_jian_ when '' then '空' else t_ktbglcjgjlb.fu_jian_ END) as aa,c.bianzhibumen,c.bianzhiren from t_ktbglcjgjlb LEFT JOIN (select a.*,b.bianzhiren from(select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_ktbglcjgjlb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN(select t.id_ ,u.NAME_ as bianzhiren from t_ktbglcjgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ = b.id_) as c on c.id_ =t_ktbglcjgjlb.id_ where find_in_set(t_ktbglcjgjlb.bian_zhi_bu_men_,'${this.positionObj}') and t_ktbglcjgjlb.xing_ming_ like'%` + key + `%' ORDER BY  t_ktbglcjgjlb.create_time_ DESC LIMIT ${page},10`
-      this.$common.request('sql', sql).then(res => {
-        if (res.variables.data.length === 0) {
+
+      queryOral(
+        this.getSearcFormData()
+      ).then(res => {
+        if (res.data.dataResult.length === 0) {
           if (this.current === 0) {
             this.noData = true
           } else {
@@ -331,7 +334,7 @@ export default {
           return
         }
 
-        this.listData.push(...res.variables.data)
+        this.listData.push(...res.data.dataResult)
 
         // 判断是否还有更多数据
         if ((this.listData.length) % 10 !== 0) {
@@ -344,6 +347,34 @@ export default {
         this.loading = false
         this.refreshing = false
       })
+      // sql注入接口
+      // const sql = `select t_ktbglcjgjlb.*,(case t_ktbglcjgjlb.fu_jian_ when '' then '空' else t_ktbglcjgjlb.fu_jian_ END) as aa,c.bianzhibumen,c.bianzhiren from t_ktbglcjgjlb LEFT JOIN (select a.*,b.bianzhiren from(select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_ktbglcjgjlb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN(select t.id_ ,u.NAME_ as bianzhiren from t_ktbglcjgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ = b.id_) as c on c.id_ =t_ktbglcjgjlb.id_ where find_in_set(t_ktbglcjgjlb.bian_zhi_bu_men_,'${this.positionObj}') and t_ktbglcjgjlb.xing_ming_ like'%` + key + `%' ORDER BY  t_ktbglcjgjlb.create_time_ DESC LIMIT ${page},10`
+      // this.$common.request('sql', sql).then(res => {
+      //   if (res.variables.data.length === 0) {
+      //     if (this.current === 0) {
+      //       this.noData = true
+      //     } else {
+      //       this.footText = true
+      //     }
+      //     this.finished = true
+      //     this.loading = false
+      //     this.refreshing = false
+      //     return
+      //   }
+
+      //   this.listData.push(...res.variables.data)
+
+      //   // 判断是否还有更多数据
+      //   if ((this.listData.length) % 10 !== 0) {
+      //     this.footText = true
+      //     this.finished = true
+      //   } else {
+      //     this.current++
+      //   }
+
+      //   this.loading = false
+      //   this.refreshing = false
+      // })
     },
     // 获取positionobj数据
     async getPositionobj() {
@@ -398,7 +429,7 @@ export default {
     getSearcFormData() {
       let params = {}
       if (this.$utils.isNotEmpty(this.subject)) {
-        params['Q^subject_^SL'] = this.subject
+        params['Q^xing_ming_^SL'] = this.subject
       }
       if (this.$utils.isNotEmpty(this.moreParams)) {
         params = Object.assign(params, this.moreParams)