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

src/views/platform/message/inner/detail/dialog.vue

@@ -126,6 +126,13 @@ export default {
                 this.handleCallback(true)
             })
         },
+        getId(arr){
+            let idArrs=[]
+            for(var i of arr){
+                idArrs.push(i.id)
+            }
+            return idArrs.join(',')
+        },
         // 消息确认，受控文件用
         confirmMsg () {
             // TODO
@@ -136,22 +143,26 @@ export default {
                 showClose: false,
                 closeOnClickModal: false
             }).then(() => {
+                console.log('userInfo',this.$store.getters.userInfo)
                 // TODO 受控文件逻辑处理
                 const perInfosId = this.$store.getters.userInfo.user.id
-                const perInfosorgId = this.$store.getters.userInfo.org.id
+                const perInfosName = this.$store.getters.userInfo.user.name
+                // const perInfosorgId = this.$store.getters.userInfo.org.id
+                const perInfosPositions = this.$store.getters.userInfo.positions
+
                 const sql = "select qian_zi_tu_wen_ FROM t_ryjbqk WHERE parent_id_ = '" + perInfosId + "'"
                 curdPost('sql', sql).then((ryjbqkRes) => {
                     const ryjbqkDatas = ryjbqkRes.variables.data
                     const tempObj = {
                         id_: generateUUID(),
                         parent_id_: this.tableId,
-                        tong_zhi_bu_men_i: perInfosorgId,
+                        tong_zhi_bu_men_: this.getId(perInfosPositions),
                         que_ren_qian_ming: JSON.stringify([{
                             id: ryjbqkDatas[0].qian_zi_tu_wen_,
                             fileName: '确认签名'
                         }]),
                         que_ren_ri_qi_: this.$common.getNow(10),
-                        qian_ming_id_: ryjbqkDatas[0].qian_zi_tu_wen_
+                        que_ren_ren_xing_: perInfosName
                     }
                     const returnParams = {
                         tableName: this.tableName.slice(0, this.tableName.indexOf('（')), // 字符串 "表名（发放时间）"

src/views/platform/message/inner/receive.vue

@@ -165,14 +165,20 @@ export default {
                             icon: 'ibps-icon-reply-all',
                             label: '回复',
                             hidden: function (row, index) {
-                                return (row.canreply === 0 || row.messageType === 'system' || row.messageType === 'bulletin')
+                                return (row.canreply === 0 || row.messageType === 'system' || row.messageType === 'bulletin' || row.subject==="文件发放通知")
                             }
                         },
                         {
-                            key: 'remove'
+                            key: 'remove',
+                            hidden: function (row, index) {
+                                return (row.subject==="文件发放通知")
+                            }
                         },
                         {
-                            key: 'detail'
+                            key: 'detail',
+                            hidden: function (row, index) {
+                                return (row.subject==="文件发放通知")
+                            }
                         }
                     ]
                 }

src/views/scientificPayoffs/js/index.js

@@ -6,8 +6,8 @@ export default {
             header: data.header,
             data: data.data,
             rowNum: 6,
-            headerHeight: 45
-            // columnWidth: [100]
+            headerHeight: 45,
+            columnWidth: data.columnWidth
         }
         return config
     },
@@ -30,7 +30,8 @@ export default {
         })
         const dataList = {
             header: header,
-            data: data
+            data: data,
+            columnWidth: [200, 200, 200, 150, 200, 130, 130, 200]
         }
         const config = this.getDataList(dataList)
         return config
@@ -50,7 +51,8 @@ export default {
         })
         const dataList = {
             header: header,
-            data: data
+            data: data,
+            columnWidth: [300, 400, 200, 150, 130]
         }
         const config = this.getDataList(dataList)
         return config
@@ -74,7 +76,8 @@ export default {
         })
         const dataList = {
             header: header,
-            data: data
+            data: data,
+            columnWidth: [200, 200, 200, 150, 130, 200, 200, 200]
         }
         const config = this.getDataList(dataList)
         return config
@@ -97,7 +100,8 @@ export default {
         })
         const dataList = {
             header: header,
-            data: data
+            data: data,
+            columnWidth: [200, 200, 200, 150, 130, 150, 200, 200]
         }
         const config = this.getDataList(dataList)
         return config
@@ -117,7 +121,8 @@ export default {
         })
         const dataList = {
             header: header,
-            data: data
+            data: data,
+            columnWidth: [300, 300, 300, 130, 150]
         }
         const config = this.getDataList(dataList)
         return config
@@ -138,7 +143,8 @@ export default {
         })
         const dataList = {
             header: header,
-            data: data
+            data: data,
+            columnWidth: [300, 300, 150, 150, 130, 130]
         }
         const config = this.getDataList(dataList)
         return config
@@ -161,7 +167,8 @@ export default {
         })
         const dataList = {
             header: header,
-            data: data
+            data: data,
+            columnWidth: [200, 200, 300, 150, 100, 130, 200, 200]
         }
         const config = this.getDataList(dataList)
         return config