sql接口对接

src/api/platform/feature/sqlInject.js

@@ -79,3 +79,47 @@ export function queryFileInfo(params) {
     params
   })
 }
+/**
+ * 补卡记录-查询
+ * @param {*} params
+ */
+export function queryAttendanceReissue(data) {
+  return request({
+    url: BPMN_URL() + '/employee/attendanceReissue/query',
+    method: 'post',
+    data
+  })
+}
+/**
+ * 投诉记录-查询
+ * @param {*} params
+ */
+export function complaintInfoQuery(data) {
+  return request({
+    url: BPMN_URL() + '/verification/complaintInfo/query',
+    method: 'post',
+    data
+  })
+}
+/**
+ * 调班列表-查询
+ * @param {*} params
+ */
+export function adjustQueryData(data) {
+  return request({
+    url: BPMN_URL() + '/sql/mobile/adjust/queryData',
+    method: 'post',
+    data
+  })
+}
+/**
+ * 用户信息沟通列表-查询
+ * @param {*} params
+ */
+export function communicateQueryData(data) {
+  return request({
+    url: BPMN_URL() + '/sql/mobile/communicate/queryData',
+    method: 'post',
+    data
+  })
+}

src/views/platform/bpmn/communication/communicationList.vue

@@ -7,7 +7,7 @@
                 left-arrow
                 @click-left="$router.push({ name: 'dashboard' })"
             />
-            <van-search v-model="twoParam" show-action placeholder="请输入表单编号/用户姓名" @search="onSearch">
+            <van-search v-model="twoParam" show-action placeholder="请输入表单编号" @search="onSearch">
                 <template #action>
                     <van-icon name="filter-o" :class="{'ibps-active':stateActive}" @click="clickMoreSearch" />
                 </template>
@@ -92,6 +92,7 @@ import IbpsToolbar from '@/components/ibps-toolbar'
 import IbpsListResultPage from '@/components/ibps-list-result-page'
 import IbpsTypeTree from '@/business/platform/cat/type/tree'
 import IbpsBpmnDefinition from '@/business/platform/bpmn/definition/field'
+import { communicateQueryData } from '@/api/platform/feature/sqlInject'
 
 import IbpsBpmnFormrenderDialog from '@/business/platform/bpmn/form/dialog'
 import communication from './communication.vue'
@@ -201,30 +202,34 @@ export default {
        */
     loadData(j) {
       this.loading = true
-      const params = this.getSearcFormData()
+      // 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}`
-      // 该表已取消
+      // const 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}`
+
+      communicateQueryData(this.getSearcFormData()).then(res => {
+        ActionUtils.handleListData(this, res.data)
+      })
+      // 临时注销
       // this.$common.request('sql', sql).then(response => {
       //     // 处理数据
       //     ActionUtils.handleListDataCommon(this, response.variables)
@@ -236,23 +241,31 @@ export default {
        * 获取格式化参数
        */
     getSearcFormData() {
-      let params = {}
+      const params = {}
+      const mid = ActionUtils.formatParams(params, this.pagination, this.sorts)
       if (this.$utils.isNotEmpty(this.twoParam)) {
-        params['two'] = this.twoParam
+        // params['keHuLianXiRen'] = this.twoParam
+        params['biaoDanBianHao'] = 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
-      // }
+      console.log(this.moreParams, 'this.moreParams')
       if (this.$utils.isNotEmpty(this.moreParams)) {
-        params = Object.assign(params, this.moreParams)
+        if (this.moreParams.hasOwnProperty('gou_tong_lei_xing')) {
+          params['gouTongLeiXing'] = this.moreParams['gou_tong_lei_xing']
+        }
+        if (this.moreParams.hasOwnProperty('biao_dan_bian_hao')) {
+          params['biaoDanBianHao'] = this.moreParams['biao_dan_bian_hao']
+        }
+        if (this.moreParams.hasOwnProperty('ke_hu_lian_xi_ren')) {
+          params['keHuLianXiRen'] = this.moreParams['ke_hu_lian_xi_ren']
+        }
+        if (this.moreParams.hasOwnProperty('gou_tong_lei_xing')) {
+          params['gouTongLeiXing'] = this.moreParams['gou_tong_lei_xing']
+        }
       }
-      return ActionUtils.formatParams(
-        params,
-        this.pagination,
-        this.sorts)
+      params['createBy'] = this.useId
+      params['xuanZeKeHu'] = this.useId
+
+      return { pageNo: mid.requestPage.pageNo, limit: mid.requestPage.limit, param: params }
     },
     LiftUpPop() {
       this.scrollWhere = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop

src/views/platform/bpmn/complaint/complaintList.vue

@@ -12,7 +12,7 @@
       <van-search
         v-model="twoParam"
         show-action
-        placeholder="输入搜索的投诉者/投诉单位"
+        placeholder="输入搜索的投诉者"
         @search="onSearch"
       >
         <template #action>
@@ -30,28 +30,28 @@
           <van-cell v-for="(item, index) in listData" :key="item.id + index">
             <div class="sectionBox verticalLine">
               <div class="left ">投诉者：</div>
-              <div>{{ item.tou_su_ren_ }}</div>
+              <div>{{ item.touSuRen }}</div>
             </div>
             <div class="sectionBox">
               <div class="left">投诉单位：</div>
-              <div>{{ item.tou_su_dan_wei_ }}</div>
+              <div>{{ item.touSuDanWei }}</div>
             </div>
             <div class="sectionBox">
               <div class="left">投诉受理时间：</div>
-              <div>{{ item.bian_zhi_shi_jian }}</div>
+              <div>{{ item.bianZhiShiJian }}</div>
             </div>
             <div class="sectionBox">
               <div class="left">投诉分类：</div>
-              <div>{{ item.tou_su_fen_lei_ }}</div>
+              <div>{{ item.touSuFenLei }}</div>
             </div>
             <div class="sectionBox">
               <div class="left">投诉方式：</div>
-              <div>{{ item.tou_su_fang_shi_ }}</div>
+              <div>{{ item.touSuFangShi }}</div>
             </div>
             <div class="sectionBox">
               <div class="left">状态：</div>
               <div style="color: #7349ff;">
-                {{ item.shi_fou_guo_shen_ }}
+                {{ item.shiFouGuoShen }}
               </div>
             </div>
             <div
@@ -63,7 +63,7 @@
 							<van-button type="warning" size="small" class="btn-back-color btn-sty" @click="getGo(item.id_,'1')">查阅
 							</van-button> -->
               <van-button
-                v-if="item.shi_fou_guo_shen_ == '已退回'"
+                v-if="item.shiFouGuoShen == '已退回'"
                 type="success"
                 size="small"
                 class="u-m-r-15 btn-sty"
@@ -145,6 +145,7 @@ import IbpsToolbar from '@/components/ibps-toolbar'
 import IbpsListResultPage from '@/components/ibps-list-result-page'
 import IbpsTypeTree from '@/business/platform/cat/type/tree'
 import IbpsBpmnDefinition from '@/business/platform/bpmn/definition/field'
+import { complaintInfoQuery } from '@/api/platform/feature/sqlInject'
 
 import IbpsBpmnFormrenderDialog from '@/business/platform/bpmn/form/dialog'
 import communication from './complaint.vue'
@@ -284,8 +285,10 @@ export default {
       }' ${itemSql}  ORDER BY create_time_ desc LIMIT ${this.page *
         params.requestPage.limit},${params.requestPage.limit}`
       // 与平台不匹配，临时注销
-      // this.$common
-      //   .request('sql', sql)
+      complaintInfoQuery(this.getSearcFormData()).then(res => {
+        ActionUtils.handleListData(this, res.data)
+      })
+      // this.$common.request('sql', sql)
       //   .then(response => {
       //     // 处理数据
       //     ActionUtils.handleListDataCommon(this, response.variables)
@@ -298,21 +301,27 @@ export default {
      * 获取格式化参数
      */
     getSearcFormData() {
-      let params = {}
+      const params = {}
       if (this.$utils.isNotEmpty(this.twoParam)) {
-        params['two'] = this.twoParam
+        params['Q^tou_su_ren_^S'] = 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)
+        if (this.moreParams.hasOwnProperty('tou_su_fen_lei_')) {
+          params['Q^tou_su_fen_lei_^S'] = this.moreParams['tou_su_fen_lei_']
+        }
+        if (this.moreParams.hasOwnProperty('tou_su_dan_wei_')) {
+          params['Q^tou_su_dan_wei_^S'] = this.moreParams['tou_su_dan_wei_']
+        }
+        if (this.moreParams.hasOwnProperty('tou_su_ren_')) {
+          params['Q^tou_su_ren_^S'] = this.moreParams['tou_su_ren_']
+        }
       }
-      console.log(params, 'paramsparamsparamsparams')
-      return ActionUtils.formatParams(params, this.pagination, this.sorts)
+      params['Q^create_by_^S'] = this.useId
+
+      return ActionUtils.formatParams(
+        params,
+        this.pagination,
+        this.sorts)
     },
     LiftUpPop() {
       this.scrollWhere =

src/views/platform/bpmn/my-reissue/index.vue

@@ -7,7 +7,7 @@
               left-arrow
               @click-left="$router.push({ name: 'dashboard' })"
           />
-          <van-search v-model="twoParam" show-action placeholder="请选择补卡记录" @search="onSearch">
+          <van-search v-model="twoParam" show-action placeholder="请填写补卡时间" @search="onSearch">
               <template #action>
                   <van-icon name="filter-o" :class="{'ibps-active':stateActive}" @click="clickMoreSearch" />
               </template>
@@ -19,30 +19,30 @@
                   <van-cell v-for="(item,index) in listData" :key="item.id+index">
                       <div class="sectionBox verticalLine">
                           <div class="left ">申请时间：</div>
-                          <div>{{ item.bian_zhi_shi_jian || '/' }} </div>
-                          <van-button class="right" size="mini" :color="item.zhuang_tai_==='已通过'?'#67c23a':item.zhuang_tai_==='待审核'?'#ae514a':item.zhuang_tai_==='未通过'?'#f78989':item.zhuang_tai_==='已撤销'?'#95989d':'#ae514a'" disabled plain hairline round type="info">{{ item.zhuang_tai_ }}</van-button>
+                          <div>{{ item.bianZhiShiJian || '/' }} </div>
+                          <van-button class="right" size="mini" :color="item.zhuangTai==='已通过'?'#67c23a':item.zhuangTai==='待审核'?'#ae514a':item.zhuangTai==='未通过'?'#f78989':item.zhuangTai==='已撤销'?'#95989d':'#ae514a'" disabled plain hairline round type="info">{{ item.zhuangTai }}</van-button>
                       </div>
                       <div class="sectionBox">
                           <div class="left">补卡日期：</div>
-                          <div>{{ item.bu_ka_ri_qi_ || '/' }} </div>
+                          <div>{{ item.buKaRiQi || '/' }} </div>
                       </div>
                       <div class="sectionBox">
                           <div class="left">补卡班次：</div>
-                          <div>{{ item.bu_ka_ban_ci_ || '/' }} </div>
+                          <div>{{ item.buKaBanCi || '/' }} </div>
                       </div>
                       <div class="sectionBox">
                           <div class="left">补卡时间：</div>
-                          <div>{{ item.bu_ka_shi_jian_ || '/' }} </div>
+                          <div>{{ item.buKaShiJian || '/' }} </div>
                       </div>
                       <div class="sectionBox">
                           <div class="left">补卡事由：</div>
-                          <div>{{ item.bu_ka_shi_you_ || '/' }} </div>
+                          <div>{{ item.buKaShiYou || '/' }} </div>
                       </div>
                       <div style=" width: 100%; text-align: right; padding-top: 5rpx;padding-bottom: 0rpx;">
                           <!-- <van-button v-if="item.lei_xing_ == '1' && item.shi_fou_guo_shen_ == '已编制'" type="warning" size="small" class="u-m-r-15 btn-sty" @click="getGo(item.id_,'2')">确定</van-button> -->
-                          <van-button v-if="item.zhuang_tai_ == '未通过'||item.zhuang_tai_ == '已撤销'" type="success" size="small" class="u-m-r-15 btn-sty" @click="getGo(item.id_,'4')">重新申请</van-button>
-                          <van-button v-if="item.zhuang_tai_ == '未通过'||item.zhuang_tai_ == '待审核'" type="success" size="small" class="u-m-r-15 btn-sty btn-yellow-color" @click="revocation(item.id_)">撤销</van-button>
-                          <van-button type="warning" size="small" class="btn-back-color btn-sty" @click="getGo(item.id_,'1')">查阅</van-button>
+                          <van-button v-if="item.zhuangTai == '未通过'||item.zhuangTai == '已撤销'" type="success" size="small" class="u-m-r-15 btn-sty" @click="getGo(item.id,'4')">重新申请</van-button>
+                          <van-button v-if="item.zhuangTai == '未通过'||item.zhuangTai == '待审核'" type="success" size="small" class="u-m-r-15 btn-sty btn-yellow-color" @click="revocation(item.id)">撤销</van-button>
+                          <van-button type="warning" size="small" class="btn-back-color btn-sty" @click="getGo(item.id,'1')">查阅</van-button>
                       </div>
                   </van-cell>
               </van-checkbox-group>
@@ -84,7 +84,7 @@ import ApprovePopup from '@/business/platform/bpmn/form-ext/approve'
 import IbpsMoreSearch from '@/components/ibps-more-search'
 import IbpsListResultPage from '@/components/ibps-list-result-page'
 import IbpsBpmnDefinition from '@/business/platform/bpmn/definition/field'
-
+import { queryAttendanceReissue } from '@/api/platform/feature/sqlInject'
 import reissueDialog from './components/reissueDialog'
 
 export default {
@@ -104,8 +104,8 @@ export default {
       stateActive: false,
       searchForms: {
         forms: [
-          { prop: 'bu_ka_ri_qi_', label: '补卡日期', fieldType: 'datePicker' },
-          { prop: 'zhuang_tai_', label: '状态', fieldType: 'checker', cols: 3, options: [
+          { prop: 'Q^bu_ka_ri_qi_^DL', label: '补卡日期', fieldType: 'datePicker' },
+          { prop: 'Q^zhuang_tai_^S', label: '状态', fieldType: 'checker', cols: 3, options: [
             {
               value: '全部',
               label: '全部'
@@ -184,23 +184,25 @@ export default {
      */
     loadData(j) {
       this.loading = true
-      const params = this.getSearcFormData()
+      // const params = this.getSearcFormData()
       if (j === 'search') {
         this.page = 0
       }
-      let itemSql = ``
-      const gtlx = params.parameters.find(i => i.key === 'zhuang_tai_') || ''
-      if (gtlx && gtlx.value !== '全部') {
-        itemSql = itemSql + `and zhuang_tai_ = '${gtlx.value}'`
-      }
-      const bdbh = params.parameters.find(i => i.key === 'bu_ka_ri_qi_' || i.key === 'two') || ''
-      if (bdbh && bdbh.value !== '') {
-        itemSql = itemSql + `and bu_ka_ri_qi_ like '%${bdbh.value}%'`
-      }
-
-      const sql =
-        `select * from t_attendance_reissue where (create_by_ = '${this.useId}' or bian_zhi_ren_ = '${this.useId}') ${itemSql}  ORDER BY create_time_ desc LIMIT ${this.page * params.requestPage.limit},${params.requestPage.limit}`
+      // let itemSql = ``
+      // const gtlx = params.parameters.find(i => i.key === 'zhuang_tai_') || ''
+      // if (gtlx && gtlx.value !== '全部') {
+      //   itemSql = itemSql + `and zhuang_tai_ = '${gtlx.value}'`
+      // }
+      // const bdbh = params.parameters.find(i => i.key === 'bu_ka_ri_qi_' || i.key === 'two') || ''
+      // if (bdbh && bdbh.value !== '') {
+      //   itemSql = itemSql + `and bu_ka_ri_qi_ like '%${bdbh.value}%'`
+      // }
 
+      // const sql =
+      //   `select * from t_attendance_reissue where (create_by_ = '${this.useId}' or bian_zhi_ren_ = '${this.useId}') ${itemSql}  ORDER BY create_time_ desc LIMIT ${this.page * params.requestPage.limit},${params.requestPage.limit}`
+      queryAttendanceReissue(this.getSearcFormData()).then(res => {
+        ActionUtils.handleListData(this, res.data)
+      })
       // 临时注释
       // this.$common.request('sql', sql).then(response => {
       //   // 处理数据
@@ -215,17 +217,14 @@ export default {
     getSearcFormData() {
       let params = {}
       if (this.$utils.isNotEmpty(this.twoParam)) {
-        params['two'] = this.twoParam
+        params['Q^bu_ka_ri_qi_^DL'] = this.twoParam
+        params['Q^bu_ka_ri_qi_^DG'] = 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)
       }
+      params['Q^bian_zhi_ren_^S'] = this.useId
+
       return ActionUtils.formatParams(
         params,
         this.pagination,

src/views/platform/bpmn/my-reissue/indexTab.vue

@@ -105,6 +105,7 @@ import ApprovePopup from '@/business/platform/bpmn/form-ext/approve'
 import IbpsMoreSearch from '@/components/ibps-more-search'
 import IbpsListResultPage from '@/components/ibps-list-result-page'
 import IbpsBpmnDefinition from '@/business/platform/bpmn/definition/field'
+import { adjustQueryData } from '@/api/platform/feature/sqlInject'
 
 import { queryAdjustment } from '@/api/platform/feature/changeShift'
 import reissueDialog from './components/reissueDialog'
@@ -232,8 +233,11 @@ export default {
       // const sql =
       // 		`select * from t_adjustment where ${typeActive} ${itemSql}  ORDER BY create_time_ desc LIMIT ${this.page * params.requestPage.limit},${params.requestPage.limit}`
       if (this.active === '我发起的') {
-        const sql =
-        `select a.id_ as id,a.tenant_id_ as tenantId,a.ip_ as ip,a.create_by_ as createBy,a.create_time_ as createTime,a.update_by_ as updateBy,a.update_time_ as updateTime,a.di_dian_ as diDian,a.reason_ as reason,a.status as status,a.executor_ as executor,a.execute_date_ as executeDate,a.overview_ as overview,a.schedule_id_ as scheduleId,a.type_ as type,a.reject_reason_ as rejectReason,a.partys from (select f.*,GROUP_CONCAT(z.party_) as partys from t_adjustment f left join t_adjustment_detail z on f.id_ = z.parent_id_  GROUP BY f.id_) a where create_by_ = '${this.useId}' ORDER BY a.create_time_ desc LIMIT ${this.page * params.requestPage.limit},${params.requestPage.limit}`
+        // const sql =
+        // `select a.id_ as id,a.tenant_id_ as tenantId,a.ip_ as ip,a.create_by_ as createBy,a.create_time_ as createTime,a.update_by_ as updateBy,a.update_time_ as updateTime,a.di_dian_ as diDian,a.reason_ as reason,a.status as status,a.executor_ as executor,a.execute_date_ as executeDate,a.overview_ as overview,a.schedule_id_ as scheduleId,a.type_ as type,a.reject_reason_ as rejectReason,a.partys from (select f.*,GROUP_CONCAT(z.party_) as partys from t_adjustment f left join t_adjustment_detail z on f.id_ = z.parent_id_  GROUP BY f.id_) a where create_by_ = '${this.useId}' ORDER BY a.create_time_ desc LIMIT ${this.page * params.requestPage.limit},${params.requestPage.limit}`
+        adjustQueryData(this.getSearcFormData()).then(res => {
+          ActionUtils.handleListData(this, res.data)
+        })
         // 临时注释
         // this.$common.request('sql', sql).then(response => {
         //   // 处理数据
@@ -305,22 +309,16 @@ export default {
      */
     getSearcFormData() {
       const params = {}
+      let mid = {}
       if (this.$utils.isNotEmpty(this.twoParam)) {
-        params['two'] = this.twoParam
+        params['Q^overview_^S'] = 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,
-        { page: this.page },
-        this.sorts)
+      if (this.active === '我发起的') {
+        params['userId'] = this.useId
+        mid = ActionUtils.formatParams(params, this.pagination, this.sorts)
+      }
+      console.log(this.active, ActionUtils.formatParams(params, this.pagination, this.sorts), 'sadsa')
+      return this.active === '待我处理' ? ActionUtils.formatParams(params, { page: this.page }, this.sorts) : { pageNo: mid.requestPage.pageNo, limit: mid.requestPage.limit, param: params }
     },
     LiftUpPop(id, typeValue) {
       this.scrollWhere = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop

src/views/platform/bpmn/shiftTransferApplication/staList.vue

@@ -37,7 +37,7 @@
                             <div class="left ">申请时间：</div>
                             <div>{{ $common.getFormatDate('string', 16, item.createTime) }} </div>
                             <!-- <div class="right">{{ item.status }} </div> -->
-                            <van-button class="right" size="mini" color="#ae514a" disabled plain hairline round type="info">{{ item.status }}</van-button>
+                            <van-button class="right" size="mini" color="#ae514a" disabled plain hairline round type="info">{{ item.STATUS }}</van-button>
                         </div>
                         <div class="sectionBox">
                             <div class="left">概览：</div>
@@ -49,12 +49,12 @@
                         </div>
 
                         <div style=" width: 100%; text-align: right; padding-top: 5rpx;padding-bottom: 0rpx;">
-                            <van-button v-if="active==='我发起的'&& item.status == '已暂存'" type="info" size="mini" class="btn-sty" @click="LiftUpPop(item.id,'6')">编辑</van-button>
-                            <van-button v-if="active==='我发起的'&& (item.status == '已取消' || item.status == '已拒绝')" type="info" size="mini" class="btn-sty" @click="LiftUpPop(item.id,'4')">再次申请</van-button>
+                            <van-button v-if="active==='我发起的'&& item.STATUS == '已暂存'" type="info" size="mini" class="btn-sty" @click="LiftUpPop(item.id,'6')">编辑</van-button>
+                            <van-button v-if="active==='我发起的'&& (item.STATUS == '已取消' || item.STATUS == '已拒绝')" type="info" size="mini" class="btn-sty" @click="LiftUpPop(item.id,'4')">再次申请</van-button>
                             <van-button v-if="active==='我发起的'" type="success" size="mini" class="u-m-l-15 btn-sty" @click="LiftUpPop(item.id,'1')">详情</van-button>
-                            <van-button v-if="active==='我发起的'&& item.status == '待审核'" type="warning" size="mini" class="u-m-l-15 btn-sty" @click="LiftUpPop(item.id,'7')">取消</van-button>
-                            <van-button v-if="active==='待我处理'&& (item.status == '待审核'||item.partys.some(obj => obj.value === useId && item.createBy !== useId && obj.status === '待审核'))" type="warning" size="mini" class="btn-back-color btn-sty" @click="LiftUpPop(item.id,'5')">审核</van-button>
-                            <van-button v-if="active==='待我处理'&& item.status == '待审批'" type="warning" size="mini" class="btn-back-color btn-sty" @click="LiftUpPop(item.id,'2')">审批</van-button>
+                            <van-button v-if="active==='我发起的'&& item.STATUS == '待审核'" type="warning" size="mini" class="u-m-l-15 btn-sty" @click="LiftUpPop(item.id,'7')">取消</van-button>
+                            <van-button v-if="active==='待我处理'&& (item.STATUS == '待审核'||item.partys.some(obj => obj.value === useId && item.createBy !== useId && obj.status === '待审核'))" type="warning" size="mini" class="btn-back-color btn-sty" @click="LiftUpPop(item.id,'5')">审核</van-button>
+                            <van-button v-if="active==='待我处理'&& item.STATUS == '待审批'" type="warning" size="mini" class="btn-back-color btn-sty" @click="LiftUpPop(item.id,'2')">审批</van-button>
                         </div>
                     </van-cell>
                 </van-checkbox-group>
@@ -100,6 +100,7 @@ import IbpsBpmnDefinition from '@/business/platform/bpmn/definition/field'
 
 import staForm from './staForm.vue'
 import { queryAdjustment } from '@/api/platform/feature/changeShift'
+import { adjustQueryData } from '@/api/platform/feature/sqlInject'
 
 export default {
   components: {
@@ -185,7 +186,7 @@ export default {
       if (j === 'search') {
         this.page = 0
       }
-      let itemSql = ``
+      const 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}'`
@@ -200,10 +201,10 @@ export default {
       //   }
 
       // v1
-      const two = params.parameters.find(i => i.key === 'two') || ''
-      if (two) {
-        itemSql = itemSql + `and overview_ like '%${two.value}%'`
-      }
+      // const two = params.parameters.find(i => i.key === 'two') || ''
+      // if (two) {
+      //   itemSql = itemSql + `and overview_ like '%${two.value}%'`
+      // }
       // const typeActive = this.active === '我发起的' ? `create_by_ = '${this.useId}' ` : `FIND_IN_SET('${this.useId}', executor_) and `
       // const sql =
       // 		`select * from t_adjustment where ${typeActive} ${itemSql}  ORDER BY create_time_ desc LIMIT ${this.page * params.requestPage.limit},${params.requestPage.limit}`
@@ -211,6 +212,9 @@ export default {
         // 临时注释
         // const sql =
         // 	`select a.id_ as id,a.tenant_id_ as tenantId,a.ip_ as ip,a.create_by_ as createBy,a.create_time_ as createTime,a.update_by_ as updateBy,a.update_time_ as updateTime,a.di_dian_ as diDian,a.reason_ as reason,a.status as status,a.executor_ as executor,a.execute_date_ as executeDate,a.overview_ as overview,a.schedule_id_ as scheduleId,a.type_ as type,a.reject_reason_ as rejectReason,a.partys from (select f.*,GROUP_CONCAT(z.party_) as partys from t_adjustment f left join t_adjustment_detail z on f.id_ = z.parent_id_  GROUP BY f.id_) a where create_by_ = '${this.useId}' ORDER BY a.create_time_ desc LIMIT ${this.page * params.requestPage.limit},${params.requestPage.limit}`
+        adjustQueryData(this.getSearcFormData()).then(res => {
+          ActionUtils.handleListData(this, res.data)
+        })
         // this.$common.request('sql', sql).then(response => {
         // // 处理数据
         //   ActionUtils.handleListDataCommon(this, response.variables)
@@ -218,7 +222,6 @@ export default {
         //   ActionUtils.handleErrorData(this, e)
         // })
       } else if (this.active === '待我处理') {
-        console.log('221312312321312321')
         queryAdjustment(this.getSearcFormData()).then(res => {
           res.data.dataResult.forEach((el) => { // 遍历子表提取审核人字段
             el.partys = this.getPartysList(el.adjustmentDetailPoList)
@@ -240,7 +243,7 @@ export default {
       const self = this
       const result = poList.map(item => ({
         value: item.party,
-        status: item.status,
+        STATUS: item.STATUS,
         label: self.userOption.filter(o => o.value === item.party).length > 0 ? (self.userOption.filter(o => o.value === item.party))[0].label : '',
         type: 'success'
       }))
@@ -264,11 +267,11 @@ export default {
         // acc.push(item)
 
         if (judge) {
-          if (userId && (item.partys.some(obj => obj.value === userId && item.createBy !== userId && obj.status === '待审核') || (item.executor && item.status === '待审批')) && (item.status === '待审核' || item.status === '待审批')) {
+          if (userId && (item.partys.some(obj => obj.value === userId && item.createBy !== userId && obj.STATUS === '待审核') || (item.executor && item.STATUS === '待审批')) && (item.STATUS === '待审核' || item.STATUS === '待审批')) {
             acc.push(item)
           }
         } else {
-          if (userId && (item.partys.some(obj => obj.value === userId && item.createBy !== userId && obj.status === '待审核') || (item.executor && item.executor.includes(userId) && item.status === '待审批'))) {
+          if (userId && (item.partys.some(obj => obj.value === userId && item.createBy !== userId && obj.STATUS === '待审核') || (item.executor && item.executor.includes(userId) && item.STATUS === '待审批'))) {
             acc.push(item)
           }
         }
@@ -281,22 +284,16 @@ export default {
        */
     getSearcFormData() {
       const params = {}
+      let mid = {}
       if (this.$utils.isNotEmpty(this.twoParam)) {
-        params['two'] = this.twoParam
+        params['Q^overview_^S'] = 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,
-        { page: this.page },
-        this.sorts)
+      if (this.active === '我发起的') {
+        params['userId'] = this.useId
+        mid = ActionUtils.formatParams(params, this.pagination, this.sorts)
+      }
+      console.log(this.active, ActionUtils.formatParams(params, this.pagination, this.sorts), 'sadsa')
+      return this.active === '待我处理' ? ActionUtils.formatParams(params, { page: this.page }, this.sorts) : { pageNo: mid.requestPage.pageNo, limit: mid.requestPage.limit, param: params }
     },
     LiftUpPop(id, typeValue) {
       this.scrollWhere = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop

src/views/system/dashboard/menu copy.json

@@ -3,70 +3,6 @@
     "alias": "userFeedback",
     "checked": "false",
     "children": [
-      {
-        "alias": "InfoComm",
-        "checked": "false",
-        "children": [],
-        "createBy": null,
-        "createTime": "2016-08-26 09:48:29",
-        "dataStatus": null,
-        "dbType": null,
-        "defaultUrl": "/bpmn/communication/communicationList",
-        "desc": "",
-        "displayInMenu": "1",
-        "dsAlias": null,
-        "icon": "title",
-        "iconBgColor": "#00aabb",
-        "iconFontColor": "#ffffff",
-        "iconType": "icon",
-        "id": "2",
-        "ip": null,
-        "isCommon": "N",
-        "isFolder": "Y",
-        "isOpen": "N",
-        "name": "信息沟通",
-        "parentId": "1",
-        "path": "1.1.2.1.1.2",
-        "pk": "",
-        "resourceType": "menu",
-        "sn": 1,
-        "systemId": "app",
-        "tenantId": "-999",
-        "updateBy": null,
-        "updateTime": null
-      },
-      {
-        "alias": "Complanint",
-        "checked": "false",
-        "children": [],
-        "createBy": null,
-        "createTime": "2016-08-26 09:48:29",
-        "dataStatus": null,
-        "dbType": null,
-        "defaultUrl": "/bpmn/complaint/complaintList",
-        "desc": "",
-        "displayInMenu": "1",
-        "dsAlias": null,
-        "icon": "completed",
-        "iconBgColor": "#e7505a",
-        "iconFontColor": "#ffffff",
-        "iconType": "icon",
-        "id": "3",
-        "ip": null,
-        "isCommon": "N",
-        "isFolder": "Y",
-        "isOpen": "N",
-        "name": "投诉",
-        "parentId": "1",
-        "path": "1.1.2.1.1.3",
-        "pk": "",
-        "resourceType": "menu",
-        "sn": 1,
-        "systemId": "app",
-        "tenantId": "-999",
-        "updateBy": null,
-        "updateTime": null
-      },
       {
         "alias": "Satisfaction",
         "checked": "false",
@@ -287,4 +223,4 @@
       }
     ]
   }
-]
+]

src/views/system/dashboard/menu.json

@@ -3,6 +3,70 @@
     "alias": "userFeedback",
     "checked": "false",
     "children": [
+      {
+        "alias": "InfoComm",
+        "checked": "false",
+        "children": [],
+        "createBy": null,
+        "createTime": "2016-08-26 09:48:29",
+        "dataStatus": null,
+        "dbType": null,
+        "defaultUrl": "/bpmn/communication/communicationList",
+        "desc": "",
+        "displayInMenu": "1",
+        "dsAlias": null,
+        "icon": "title",
+        "iconBgColor": "#00aabb",
+        "iconFontColor": "#ffffff",
+        "iconType": "icon",
+        "id": "2",
+        "ip": null,
+        "isCommon": "N",
+        "isFolder": "Y",
+        "isOpen": "N",
+        "name": "信息沟通",
+        "parentId": "1",
+        "path": "1.1.2.1.1.2",
+        "pk": "",
+        "resourceType": "menu",
+        "sn": 1,
+        "systemId": "app",
+        "tenantId": "-999",
+        "updateBy": null,
+        "updateTime": null
+      },
+      {
+        "alias": "Complanint",
+        "checked": "false",
+        "children": [],
+        "createBy": null,
+        "createTime": "2016-08-26 09:48:29",
+        "dataStatus": null,
+        "dbType": null,
+        "defaultUrl": "/bpmn/complaint/complaintList",
+        "desc": "",
+        "displayInMenu": "1",
+        "dsAlias": null,
+        "icon": "completed",
+        "iconBgColor": "#e7505a",
+        "iconFontColor": "#ffffff",
+        "iconType": "icon",
+        "id": "3",
+        "ip": null,
+        "isCommon": "N",
+        "isFolder": "Y",
+        "isOpen": "N",
+        "name": "投诉",
+        "parentId": "1",
+        "path": "1.1.2.1.1.3",
+        "pk": "",
+        "resourceType": "menu",
+        "sn": 1,
+        "systemId": "app",
+        "tenantId": "-999",
+        "updateBy": null,
+        "updateTime": null
+      },
       {
         "alias": "Satisfaction",
         "checked": "false",