Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/business/platform/bpmn/definition/selector.vue

@@ -280,7 +280,7 @@
              * 通过ID获取数据
              */
             getDataInfo(id) {
-                if (this.valueKey === 'id') {
+                if (this.valueKey === 'id' || this.valueKey === 'defId') {
                     get({ defId: id }).then((response) => {
                         const data = response.data
                         this.cacheData[data[this.valueKey]] = data

src/business/platform/bpmn/form/action.js

@@ -664,13 +664,11 @@ export default {
                 // 等待一段时间后再次查询
                 await new Promise(resolve => setTimeout(resolve, intervalTime))
             }
-            // if (!(await this.isFinish(proId || proInstId))) {
-            //     return
-            // }
-            const sql = `select * from t_lcidglbdbb where shi_fou_zi_biao_ = 't_${key}'`
+            const sql = `select * from t_lcidglbdbb where shi_fou_zi_biao_ = 't_${key}' and ti_jiao_kuai_zhao = '是'`
             this.$common.request('sql', sql).then(res => {
                 const { data = [] } = res.variables || {}
                 if (!data.length) {
+                    this.updateState(id, key, '已完成', null)
                     return
                 }
                 const path = data[0].bao_biao_lu_jing_

src/business/platform/bpmn/setting/bpmn-setting/mixins/addRecord.js

@@ -3,6 +3,12 @@ import request from '@/utils/request'
 import ActionUtils from '@/utils/action'
 
 export default {
+    data () {
+        return {
+            // 标识是否初次创建
+            flag: false
+        }
+    },
     methods: {
         getRecord (id) {
             const sql = `select * from t_lcidglbdbb where liu_cheng_xuan_ze = '${id}'`
@@ -11,15 +17,20 @@ export default {
                 if (!data.length) {
                     return
                 }
-                this.bao_biao_lu_jing_ = data[0].bao_biao_lu_jing_
-                this.fu_jian_nei_rong_ = data[0].fu_jian_nei_rong_
-                this.shi_fou_zi_biao_ = data[0].shi_fou_zi_biao_
-                this.guan_lian_zi_duan = data[0].guan_lian_zi_duan
-                this.liu_cheng_xuan_ze = id
+                const { bao_biao_lu_jing_, fu_jian_nei_rong_, shi_fou_zi_biao_, guan_lian_zi_duan, ti_jiao_kuai_zhao, bo_hui_kuai_zhao_ } = data[0]
+                Object.assign(this, {
+                    bao_biao_lu_jing_,
+                    fu_jian_nei_rong_,
+                    shi_fou_zi_biao_,
+                    guan_lian_zi_duan,
+                    liu_cheng_xuan_ze: id,
+                    ti_jiao_kuai_zhao,
+                    bo_hui_kuai_zhao_
+                })
             })
         },
         addRecord () {
-            if (this.liu_cheng_xuan_ze) return this.updateRecord()
+            if (this.flag || this.liu_cheng_xuan_ze) return this.updateRecord()
             this.add()
         },
         add () {
@@ -30,10 +41,13 @@ export default {
                     fu_jian_nei_rong_: this.fu_jian_nei_rong_,
                     liu_cheng_xuan_ze: this.data.id,
                     guan_lian_zi_duan: this.guan_lian_zi_duan,
-                    shi_fou_zi_biao_: this.shi_fou_zi_biao_
+                    shi_fou_zi_biao_: this.shi_fou_zi_biao_,
+                    ti_jiao_kuai_zhao: this.ti_jiao_kuai_zhao,
+                    bo_hui_kuai_zhao_: this.bo_hui_kuai_zhao_
                 }]
             }
             curdPost('add', params).then(() => {
+                this.flag = true
                 this.$message({
                     message: '添加成功',
                     type: 'success'
@@ -51,9 +65,10 @@ export default {
                         param: {
                             bao_biao_lu_jing_: this.bao_biao_lu_jing_,
                             fu_jian_nei_rong_: this.fu_jian_nei_rong_,
-                            liu_cheng_xuan_ze: this.liu_cheng_xuan_ze,
                             guan_lian_zi_duan: this.guan_lian_zi_duan,
-                            shi_fou_zi_biao_: this.shi_fou_zi_biao_
+                            shi_fou_zi_biao_: this.shi_fou_zi_biao_,
+                            ti_jiao_kuai_zhao: this.ti_jiao_kuai_zhao,
+                            bo_hui_kuai_zhao_: this.bo_hui_kuai_zhao_
                         }
                     }
                 ]

src/business/platform/bpmn/setting/bpmn-setting/types/global.vue

@@ -1,164 +1,178 @@
 <template>
-  <div>
-    <div v-sticky class="setting-title" @click="onTitle">
-      全局设置 <i class=" el-icon-caret-bottom"></i>
-    </div>
-    <el-collapse v-model="activeNames">
-      <el-collapse-item title="业务对象绑定" name="boSetting">
-        <bo-setting
-          :data="boData"
-          :has-call-activity="hasCallActivity"
-          :parent-def-key="parentDefKey"
-          @clean="cleanFormData"
-        />
-      </el-collapse-item>
-      <el-collapse-item title="表单设置" name="formSeting">
-        <form-setting
-          :data="formData"
-          :attributes="attributes"
-          :bo-data="boData"
-          :def-key="defKey"
-          :node-id="nodeId"
-          :parent-def-key="parentDefKey"
-          :form-opinions.sync="formOpinions"
-          form-type="flow"
-          @change-form="changeForm"
-        />
-      </el-collapse-item>
-      <el-collapse-item title="实例表单设置" name="instFormSetting">
-        <form-setting
-          :data="instFormData"
-          :def-key="defKey"
-          :bo-data="boData"
-          :node-id="nodeId"
-          :parent-def-key="parentDefKey"
-          form-type="inst"
-        />
-      </el-collapse-item>
-
-      <!-- <el-collapse-item title="流程变量设置" name="varSetting">
-        <variable-setting
-          :data="variables"
-        />
-      </el-collapse-item> -->
-     <el-collapse-item title="记录保存" name="varSetting">
-    <div style="margin-left:5%;">
-       报表路径以半角","分割： <el-input placeholder="报表路径" type="textarea" rows="5" v-model="bao_biao_lu_jing_"> </el-input>
-       附件字段名以半角"，"分割 (多个数据表以'.'分割)：<el-input placeholder="附件字段"  v-model="fu_jian_nei_rong_"></el-input>
-       附件所在数据库 (多个数据表以'.'分割)：<el-input placeholder="附件数据库"  v-model="shi_fou_zi_biao_"></el-input>
-       [ 当前表默认id主键 ] 附件子表的外键字段[选填] (多个数据表以'.'分割)：<el-input placeholder="关联字段"  v-model="guan_lian_zi_duan"></el-input>
-    </div>
+    <div>
+        <div v-sticky class="setting-title" @click="onTitle">
+            全局设置 <i class=" el-icon-caret-bottom" />
+        </div>
+        <el-collapse v-model="activeNames">
+            <el-collapse-item title="业务对象绑定" name="boSetting">
+                <bo-setting
+                    :data="boData"
+                    :has-call-activity="hasCallActivity"
+                    :parent-def-key="parentDefKey"
+                    @clean="cleanFormData"
+                />
+            </el-collapse-item>
+            <el-collapse-item title="表单设置" name="formSeting">
+                <form-setting
+                    :data="formData"
+                    :attributes="attributes"
+                    :bo-data="boData"
+                    :def-key="defKey"
+                    :node-id="nodeId"
+                    :parent-def-key="parentDefKey"
+                    :form-opinions.sync="formOpinions"
+                    form-type="flow"
+                    @change-form="changeForm"
+                />
+            </el-collapse-item>
+            <el-collapse-item title="实例表单设置" name="instFormSetting">
+                <form-setting
+                    :data="instFormData"
+                    :def-key="defKey"
+                    :bo-data="boData"
+                    :node-id="nodeId"
+                    :parent-def-key="parentDefKey"
+                    form-type="inst"
+                />
+            </el-collapse-item>
 
-       <el-button type="success" plain style="margin: 5px; float: right;"  @click="addRecord">保存 / 修改</el-button>
-     </el-collapse-item>
+            <!-- <el-collapse-item title="流程变量设置" name="varSetting">
+                <variable-setting
+                    :data="variables"
+                />
+            </el-collapse-item> -->
+            <el-collapse-item title="流程归档设置" name="varSetting">
+                <div style="margin-left:5%;">
+                    报表路径（以半角','分割）：<el-input v-model="bao_biao_lu_jing_" placeholder="报表路径" type="textarea" rows="5" />
+                    附件字段名（多字段以半角','分割 多个数据表以'.'分割）：<el-input v-model="fu_jian_nei_rong_" placeholder="附件字段" />
+                    附件所在数据库（多个数据表以'.'分割）：<el-input v-model="shi_fou_zi_biao_" placeholder="附件数据库" />
+                    附件子表的外键字段（选填，当前表默认id主键，多个数据表以'.'分割）：<el-input v-model="guan_lian_zi_duan" placeholder="关联字段" />
+                    是否生成提交快照：
+                    <el-switch
+                        v-model="ti_jiao_kuai_zhao"
+                        active-value="是"
+                        inactive-value="否"
+                        style="margin-right: 80px;"
+                    />
+                    是否生成驳回快照：
+                    <el-switch
+                        v-model="bo_hui_kuai_zhao_"
+                        active-value="是"
+                        inactive-value="否"
+                    />
+                </div>
 
+                <el-button type="success" plain style="margin: 5px; float: right;" @click="addRecord">保存 / 修改</el-button>
+            </el-collapse-item>
 
-      <el-collapse-item name="endNotify">
-        <template slot="title">
-          办结抄送设置
-          <el-tooltip class="item" effect="light" content="进行设置流程结束时抄送给某批人！" placement="bottom">
-            <i class="header-icon el-icon-info" />
-          </el-tooltip>
-        </template>
-        <notify-setting :data="procNotify" />
-      </el-collapse-item>
-      <el-collapse-item title="其他设置" name="otherAttribute">
-        <other-attribute :data="attributes" />
-      </el-collapse-item>
-    </el-collapse>
-  </div>
+            <el-collapse-item name="endNotify">
+                <template slot="title">
+                    办结抄送设置
+                    <el-tooltip class="item" effect="light" content="进行设置流程结束时抄送给某批人！" placement="bottom">
+                        <i class="header-icon el-icon-info" />
+                    </el-tooltip>
+                </template>
+                <notify-setting :data="procNotify" />
+            </el-collapse-item>
+            <el-collapse-item title="其他设置" name="otherAttribute">
+                <other-attribute :data="attributes" />
+            </el-collapse-item>
+        </el-collapse>
+    </div>
 </template>
 <script>
 import mixins from '../mixins/type'
 import addRecord from '../mixins/addRecord.js'
 export default {
-  mixins: [mixins,addRecord],
-  props: {
-    defKey: String,
-    nodeId: String, // 节点ID
-    hasCallActivity: Boolean, // 是否有外部子流程
-    parentDefKey: String ,// 父类key
-  },
-  data() {
-    return {
-      activeNames: ['boSetting', 'formSeting', 'instFormSetting', 'varSetting', 'endNotify', 'otherAttribute'],
-      bao_biao_lu_jing_:'',
-      fu_jian_nei_rong_:'',
-      shi_fou_zi_biao_:'',
-      liu_cheng_xuan_ze:'',
-      guan_lian_zi_duan:''
-    }
-  },
-  created() {
-    setTimeout(() => {
-		if(this.data && this.data.id) this.getRecord(this.getDataId)
-    }, 500)
-  },
-  watch:{
-    data:{
-    handler: function(data,outData) {
-        this.getRecord(this.getDataId)
-        },
-    }
-  },
-  computed: {
-    // 业务对象
-    boData() {
-      return this.data ? this.data.bo || {} : {}
-    },
-     //流程id
-    getDataId() {
-      return this.data ? this.data.id || {} : {}
-    },
-    boCode() {
-      return this.boData ? this.boData.code || '' : ''
+    mixins: [mixins, addRecord],
+    props: {
+        defKey: String,
+        nodeId: String, // 节点ID
+        hasCallActivity: Boolean, // 是否有外部子流程
+        parentDefKey: String // 父类key
     },
-    // 表单
-    formData() {
-      return this.data ? this.data.form || {} : {}
+    data () {
+        return {
+            activeNames: ['boSetting', 'formSeting', 'instFormSetting', 'varSetting', 'endNotify', 'otherAttribute'],
+            bao_biao_lu_jing_: '',
+            fu_jian_nei_rong_: '',
+            shi_fou_zi_biao_: '',
+            liu_cheng_xuan_ze: '',
+            guan_lian_zi_duan: '',
+            ti_jiao_kuai_zhao: '否',
+            bo_hui_kuai_zhao_: '否'
+        }
     },
-    // 实例表单
-    instFormData() {
-      return this.data ? this.data.instForm || {} : {}
-    },
-    // 表单意见
-    formOpinions: {
-      get() {
-        return this.data ? this.data.formOpinions || {} : {}
-      },
-      set(value) {
-        this.data.formOpinions = value || {}
-      }
+    computed: {
+    // 业务对象
+        boData () {
+            return this.data ? this.data.bo || {} : {}
+        },
+        // 流程id
+        getDataId () {
+            return this.data ? this.data.id || {} : {}
+        },
+        boCode () {
+            return this.boData ? this.boData.code || '' : ''
+        },
+        // 表单
+        formData () {
+            return this.data ? this.data.form || {} : {}
+        },
+        // 实例表单
+        instFormData () {
+            return this.data ? this.data.instForm || {} : {}
+        },
+        // 表单意见
+        formOpinions: {
+            get () {
+                return this.data ? this.data.formOpinions || {} : {}
+            },
+            set (value) {
+                this.data.formOpinions = value || {}
+            }
+        },
+        // 流程变量
+        variables () {
+            return this.data ? this.data.variables || [] : []
+        },
+        // 抄送
+        procNotify () {
+            return this.data ? this.data.procNotify || [] : []
+        },
+        // 其它属性
+        attributes () {
+            if (!this.data.attributes) return
+            this.data.attributes.subjectRule = this.data.attributes.subjectRule == '{发起人:startorName}在{发起时间:startTime}发起{流程标题:title}'
+                ? '{发起人:startorName} |启动：{流程标题:title}' : this.data.attributes.subjectRule
+            return this.data ? this.data.attributes || {} : {}
+        }
     },
-    // 流程变量
-    variables() {
-      return this.data ? this.data.variables || [] : []
+    watch: {
+        data: {
+            handler: function (data, outData) {
+                this.getRecord(this.getDataId)
+            }
+        }
     },
-    // 抄送
-    procNotify() {
-      return this.data ? this.data.procNotify || [] : []
+    created () {
+        setTimeout(() => {
+            if (this.data && this.data.id) this.getRecord(this.getDataId)
+        }, 500)
     },
-    // 其它属性
-    attributes() {
-      if(!this.data.attributes) return
-      this.data.attributes.subjectRule =  this.data.attributes.subjectRule == "{发起人:startorName}在{发起时间:startTime}发起{流程标题:title}" ?
-     "{发起人:startorName} |启动：{流程标题:title}" : this.data.attributes.subjectRule
-      return this.data ? this.data.attributes || {} : {}
+    methods: {
+        handleData (key, data) {
+            this.$emit('input', data)
+        },
+        changeForm (key, value) {
+            this.instFormData[key] = value
+        },
+        cleanFormData () {
+            this.$emit('clean-form-data')
+        },
+        saveCont () {
+            this.data.id// 流程id
+        }
     }
-  },
-  methods: {
-    handleData(key, data) {
-      this.$emit('input', data)
-    },
-    changeForm(key, value) {
-      this.instFormData[key] = value
-    },
-    cleanFormData() {
-      this.$emit('clean-form-data')
-    },
-    saveCont(){
-      this.data.id//流程id
-      }
-  }
 }
 </script>

src/business/platform/data/templaterender/templates/list.vue

@@ -227,8 +227,6 @@ export default {
             scanVisible: false,
             scanName: '',
             obj: '',
-            previewPath:'',
-            downloadPath:'',
             initialization: false,
             tableHeight: document.body.clientHeight,
             listIdentity: '',
@@ -791,12 +789,11 @@ export default {
                         this.npmDialogFormVisible = true
                         break
                     case 'consult': // 查阅
-                        console.log(button)
                         if (!button.reportPath) {
                             this.$message.warning('请先配置对应报表路径！')
                             return
                         }
-                        src = `${this.$reportPath.replace('show', 'pdf')}${this.previewPath}&id_=${selection}`
+                        src = `${this.$reportPath.replace('show', 'pdf')}${button.reportPath}&id_=${selection}`
                         preview(this, src)
                         break
                     case 'download': // 下载记录
@@ -805,7 +802,7 @@ export default {
                             return
                         }
                         this.$common.snapshoot({
-                            url: this.$getReportFile(this.downloadPath, `id_=${selection}`),
+                            url: this.$getReportFile(button.reportPath, `id_=${selection}`),
                             name: selection,
                             type: 'pdf'
                         }).then(res => {
@@ -1023,17 +1020,6 @@ export default {
             // this.template.attrs ? this.$utils.toBoolean(this.template.attrs.manage_effect) : false
 
             const functionButtons = this.template.buttons ? this.template.buttons.function_buttons || [] : []
-            for(var i of functionButtons){
-                if(i.button_type=='openTask'){
-                    this.defId = i.deflow
-                }
-                if(i.button_type === 'consult'){
-                    this.previewPath = i.reportPath
-                }
-                if(i.button_type === 'download'){
-                    this.downloadPath = i.reportPath
-                }
-            }
             // 工具栏
             const toolbarButtons = []
             // 管理列
@@ -1042,7 +1028,9 @@ export default {
             // 功能按钮
             functionButtons.forEach((rf, i) => {
                 const btn = this.buildButton(rf, i)
-
+                if (rf.button_type === 'openTask') {
+                    this.defId = rf.deflow
+                }
                 // 查询列默认是顶部
                 if (hasSearchPermission(rf.button_type) && !rf.position) {
                     rf.position = 'toolbar'
@@ -1203,7 +1191,7 @@ export default {
             }
 
             // 处理当前用户，当前组织控件
-            if (fieldType === 'currentUser' || fieldType === 'currentOrg') {
+            if (fieldType === 'currentUser' || fieldType === 'currentOrg' || fieldType === 'currentPosition') {
                 fieldType = 'selector'
             }
 

src/views/scientificPayoffs/index.vue

@@ -22,14 +22,13 @@
                 </div>
             </div>
             <dv-border-box-1 class="contentBorder">
+                <!-- :style="indexData == 1 && kyxmListShow && kyxmDataShow ? 'display: block' : 'display: none'" -->
                 <scientificBoxVue v-if="indexData == 1 && kyxmListShow && kyxmDataShow" class="contentBorderBox" :list-show="kyxmListShow" :data-show="kyxmDataShow" :data-item="kyxmData" />
-
                 <scientificBoxVue v-if="indexData == 1 && SCIwztjbDataShow && SCIwztjbListShow" class="contentBorderBox" :bottom-border="false" :list-show="SCIwztjbListShow" :data-show="SCIwztjbDataShow" :data-item="SCIwztjbData" />
                 <scientificBoxVue v-if="indexData == 2 && zwlwListShow && zwlwDataShow" class="contentBorderBox" :list-show="zwlwListShow" :data-show="zwlwDataShow" :data-item="zwlwData" />
                 <scientificBoxVue v-if="indexData == 2 && zhuZuoListShow && zhuZuoDataShow" class="contentBorderBox" :bottom-border="false" :list-show="zhuZuoListShow" :data-show="zhuZuoDataShow" :data-item="zhuZuoData" />
                 <scientificBoxVue v-if="indexData == 3 && zhuanLiListShow && zhuanLiDataShow" class="contentBorderBox" :list-show="zhuanLiListShow" :data-show="zhuanLiDataShow" :data-item="zhuanLiData" />
                 <scientificBoxVue v-if="indexData == 3 && jxjyxmxshdListShow && jxjyxmxshdDataShow" class="contentBorderBox" :bottom-border="false" :list-show="jxjyxmxshdListShow" :data-show="jxjyxmxshdDataShow" :data-item="jxjyxmxshdData" />
-
                 <scientificBoxVue v-if="indexData == 4 && kjhjcgDataShow && kjhjcgListShow" class="contentBorderBox" :bottom-border="false" :list-show="kjhjcgListShow" :data-show="kjhjcgDataShow" :data-item="kjhjcgData" />
             </dv-border-box-1>
         </dv-full-screen-container>
@@ -50,6 +49,7 @@ export default {
             month: '',
             timer: '',
             timer2: '',
+            timer3: '',
             indexData: 1,
             // 科研项目
             kyxmListShow: false,
@@ -133,18 +133,26 @@ export default {
                     header: '',
                     data: []
                 }
-            }
+            },
+
+            likeParams: "ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ != '1115242459127873536' and ie.ID_ != '1115242765924433920' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_"
         }
     },
     created () {
         if (screenfull.isEnabled && !screenfull.isFullscreen) {
             this.allView()
         }
+
         this.getInit()
+        this.getKeYanChengGuoList()
 
         this.timer = setInterval(() => {
             this.getInit()
         }, 600000)
+
+        this.timer3 = setInterval(() => {
+            this.getKeYanChengGuoList()
+        }, 1000 * 60 * 60)
         this.getCreate()
     },
     beforeDestroy () {
@@ -153,6 +161,7 @@ export default {
         }
         clearInterval(this.timer)
         clearInterval(this.timer2)
+        clearInterval(this.timer3)
     },
     methods: {
         // 初始化数据
@@ -165,7 +174,7 @@ export default {
         getCreate () {
             this.timer2 = setInterval(() => {
                 this.next()
-            }, 30000) // 180000
+            }, 1000 * 60) // 180000
         },
         allView () {
             // 默认显示全屏
@@ -211,20 +220,65 @@ export default {
                 this.getKjhjcgDataAndList(e)
             }
         },
-
-        // 接口
-        // 科研项目
-        getKyxmDataAndList (month) {
-            // let sql1 = `select tk.*,ie.NAME_,tk2.xiang_mu_bian_hao as xiangMuBianHao from t_kyxm tk  left join t_kyxm tk2 on tk.xiang_mu_bian_hao = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            const sql1 = `select * from t_kyxm where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kyxm tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
+        getKeYanChengGuoList () {
+            const sql1 = `select * from t_kyxm where lei_xing_ = '统计' order by create_time_ desc`
+            const sql2 = `select * from t_kjhjcg where lei_xing_ = '统计' order by create_time_ desc`
+            const sql3 = `select * from t_SCIwztjb where lei_xing_ = '统计' order by create_time_ desc`
+            const sql4 = `select * from t_zwlw where lei_xing_ = '统计' order by create_time_ desc`
+            const sql5 = `select * from t_zz where lei_xing_ = '统计' order by create_time_ desc`
+            const sql6 = `select * from t_zl where lei_xing_ = '统计' order by create_time_ desc`
+            const sql7 = `select * from t_jxjyxmxshd where lei_xing_ = '统计' order by create_time_ desc`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2), curdPost('sql', sql3), curdPost('sql', sql4), curdPost('sql', sql5), curdPost('sql', sql6), curdPost('sql', sql7)]).then(([res1, res2, res3, res4, res5, res6, res7]) => {
                 if (res1.state == 200) {
                     const datas = res1.variables.data
                     const config = indexFile.getKyxmList(datas)
                     this.kyxmData.config = JSON.parse(JSON.stringify(config))
                     this.kyxmListShow = true
                 }
+                if (res2.state == 200) {
+                    const datas = res2.variables.data
+                    const config = indexFile.getkjhjcgList(datas)
+                    this.kjhjcgData.config = config
+                    this.kjhjcgListShow = true
+                }
+                if (res3.state == 200) {
+                    const datas = res3.variables.data
+                    const config = indexFile.getSCIwztjbList(datas)
+                    this.SCIwztjbData.config = config
+                    this.SCIwztjbListShow = true
+                }
+                if (res4.state == 200) {
+                    const datas = res4.variables.data
+                    const config = indexFile.getZwlwList(datas)
+                    this.zwlwData.config = config
+                    this.zwlwListShow = true
+                }
+                if (res5.state == 200) {
+                    const datas = res5.variables.data
+                    const config = indexFile.getZhuZuoList(datas)
+                    this.zhuZuoData.config = config
+                    this.zhuZuoListShow = true
+                }
+                if (res6.state == 200) {
+                    const datas = res6.variables.data
+                    const config = indexFile.getZhuanLiList(datas)
+                    this.zhuanLiData.config = config
+                    this.zhuanLiListShow = true
+                }
+                if (res7.state == 200) {
+                    const datas = res7.variables.data
+                    const config = indexFile.getJxjyxmxshdList(datas)
+                    this.jxjyxmxshdData.config = config
+                    this.jxjyxmxshdListShow = true
+                }
+            })
+        },
+
+        // 接口
+        // 科研项目
+        getKyxmDataAndList (month) {
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kyxm tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ${this.likeParams}`
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     const datas = res2.variables.data
                     const config = indexFile.getKyxmData(datas)
@@ -236,16 +290,8 @@ export default {
 
         // 科技获奖成果
         getKjhjcgDataAndList (month) {
-            // let sql1 = `select tk.*,ie.NAME_,tk2.jiang_li_xiang_mu as jiangLiXiangMu  from t_kjhjcg tk left join t_kjhjcg tk2 on  tk.dan_wei_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            const sql1 = `select * from t_kjhjcg where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kjhjcg tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
-                if (res1.state == 200) {
-                    const datas = res1.variables.data
-                    const config = indexFile.getkjhjcgList(datas)
-                    this.kjhjcgData.config = config
-                    this.kjhjcgListShow = true
-                }
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kjhjcg tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ${this.likeParams}`
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     const datas = res2.variables.data
                     const config = indexFile.getKyxmData(datas)
@@ -257,16 +303,8 @@ export default {
 
         // SCI文章统计表
         getSCIwztjbDataAndList (month) {
-            // let sql1 = `select tk.*,ie.NAME_,tk2.lun_wen_ti_mu_ as lunWenTiMu from t_SCIwztjb tk  left join t_SCIwztjb tk2 on  tk.lun_wen_ti_mu_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            const sql1 = `select * from t_SCIwztjb where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_SCIwztjb tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
-                if (res1.state == 200) {
-                    const datas = res1.variables.data
-                    const config = indexFile.getSCIwztjbList(datas)
-                    this.SCIwztjbData.config = config
-                    this.SCIwztjbListShow = true
-                }
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_SCIwztjb tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ${this.likeParams}`
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     const datas = res2.variables.data
                     const config = indexFile.getKyxmData(datas)
@@ -278,16 +316,8 @@ export default {
 
         // 中文论文
         getZwlwDataAndList (month) {
-            // let sql1 = `select tk.*,ie.NAME_,tk2.lun_wen_ti_mu_ as lunWenTiMu from t_zwlw tk left join t_zwlw tk2 on  tk.lun_wen_ti_mu_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            const sql1 = `select * from t_zwlw where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zwlw tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
-                if (res1.state == 200) {
-                    const datas = res1.variables.data
-                    const config = indexFile.getZwlwList(datas)
-                    this.zwlwData.config = config
-                    this.zwlwListShow = true
-                }
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zwlw tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ${this.likeParams}`
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     const datas = res2.variables.data
                     const config = indexFile.getKyxmData(datas)
@@ -299,16 +329,8 @@ export default {
 
         // 著作
         getZhuZuoDataAndList (month) {
-            // let sql1 = `select tk.*,ie.NAME_,tk2.zhuan_zhuo_ming_c as zhuanZhuoMingCheng from t_zz tk left join t_zz tk2 on  tk.zhuan_zhuo_ming_c = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            const sql1 = `select * from t_zz where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zz tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
-                if (res1.state == 200) {
-                    const datas = res1.variables.data
-                    const config = indexFile.getZhuZuoList(datas)
-                    this.zhuZuoData.config = config
-                    this.zhuZuoListShow = true
-                }
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zz tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ${this.likeParams}`
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     const datas = res2.variables.data
                     const config = indexFile.getKyxmData(datas)
@@ -320,16 +342,8 @@ export default {
 
         // 专利
         getZhuanLiDataAndList (month) {
-            // let sql1 = `select tk.*,ie.NAME_,tk2.zhuan_li_ming_che as zhuanLiMingCheng from t_zl tk left join t_zl tk2 on  tk.zhuan_li_ming_che = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            const sql1 = `select * from t_zl where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zl tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
-                if (res1.state == 200) {
-                    const datas = res1.variables.data
-                    const config = indexFile.getZhuanLiList(datas)
-                    this.zhuanLiData.config = config
-                    this.zhuanLiListShow = true
-                }
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zl tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ${this.likeParams}`
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     const datas = res2.variables.data
                     const config = indexFile.getKyxmData(datas)
@@ -341,16 +355,8 @@ export default {
 
         // 继续教育项目/学术活动
         getJxjyxmxshdDataAndList (month) {
-            // let sql1 = `select tk.*,ie.NAME_,tk2.xiang_mu_bian_hao as xiangmMuBianHao from t_jxjyxmxshd tk left join t_jxjyxmxshd tk2 on  tk.xiang_mu_bian_hao = tk2.id_  left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
-            const sql1 = `select * from t_jxjyxmxshd where lei_xing_ = '统计' and create_time_ like '%${month}%' order by create_time_ desc`
-            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_jxjyxmxshd tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
-                if (res1.state == 200) {
-                    const datas = res1.variables.data
-                    const config = indexFile.getJxjyxmxshdList(datas)
-                    this.jxjyxmxshdData.config = config
-                    this.jxjyxmxshdListShow = true
-                }
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_jxjyxmxshd tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ${this.likeParams}`
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     const datas = res2.variables.data
                     const config = indexFile.getKyxmData(datas)