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

src/business/platform/form/formrender/dynamic-form/mixins/relevanceTable.vue

@@ -27,7 +27,7 @@ export default {
     methods: {
         openDataTemplate (el) {
             this.openDataTemplateDialog(this.form, {
-                title: el.name,
+                title: !el.noTitleShow ? el.name : ' ',
                 templateId: el.templateId,
                 dynamicParams: el.filter
             })
@@ -83,4 +83,6 @@ export default {
         cursor: pointer;
     }
 }
+
+
 </style>

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

@@ -160,9 +160,14 @@ export default {
         }
     },
     created () {
+        this.getInit()
         this.loadData()
     },
     methods: {
+        // 初始化
+        getInit () {
+            this.filter[0].partyId = this.$store.getters.userInfo.employee.positions || ''
+        },
         getDelegatorId (value) {
             this.searchDelegatorId = value
         },

src/views/scientificPayoffs/index.vue

@@ -307,47 +307,47 @@ export default {
             const sql2 = `select * from t_kjhjcg where ${this.likeTongJi} order by create_time_ desc`
             const sql3 = `select * from t_SCIwztjb where ${this.likeTongJi} order by create_time_ desc`
             const sql4 = `select * from t_zwlw where ${this.likeTongJi} order by create_time_ desc`
-            const sql5 = `select * from t_zz where ${this.likeTongJi} order by create_time_ desc`
+            const sql5 = `select * from t_kyzz where ${this.likeTongJi} order by create_time_ desc`
             const sql6 = `select * from t_kyzl where ${this.likeTongJi} order by create_time_ desc`
             const sql7 = `select * from t_jxjyxmxshd where ${this.likeTongJi} 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) {
+                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) {
+                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) {
+                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) {
+                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) {
+                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) {
+                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) {
+                if (res7.state === 200) {
                     const datas = res7.variables.data
                     const config = indexFile.getJxjyxmxshdList(datas)
                     this.jxjyxmxshdData.config = config
@@ -411,7 +411,7 @@ export default {
 
         // 著作
         getZhuZuoDataAndList (month) {
-            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}`
+            const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kyzz 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