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

public/index.html

@@ -28,12 +28,12 @@
     <script src="https://cdn.jsdelivr.net/npm/luckysheet/dist/luckysheet.umd.js"></script> -->
 
     <!-- 使用luckysheet文件 本地引入 -->
-    <link rel='stylesheet' href='./lib/luckysheet/plugins/css/pluginsCss.css' />
-    <link rel='stylesheet' href='./lib/luckysheet/plugins/plugins.css' />
-    <link rel='stylesheet' href='./lib/luckysheet/css/luckysheet.css' />
-    <link rel='stylesheet' href='./lib/luckysheet/assets/iconfont/iconfont.css' />
-    <script src="./lib/luckysheet/plugins/js/plugin.js"></script>
-    <script src="./lib/luckysheet/luckysheet.umd.js"></script>
+    <link rel='stylesheet' href='lib/luckysheet/plugins/css/pluginsCss.css' />
+    <link rel='stylesheet' href='lib/luckysheet/plugins/plugins.css' />
+    <link rel='stylesheet' href='lib/luckysheet/css/luckysheet.css' />
+    <link rel='stylesheet' href='lib/luckysheet/assets/iconfont/iconfont.css' />
+    <script src="lib/luckysheet/plugins/js/plugin.js"></script>
+    <script src="lib/luckysheet/luckysheet.umd.js"></script>
 
 
     <title><%= VUE_APP_TITLE %></title>

src/views/onLineEditing/index.vue

@@ -17,8 +17,8 @@
             <input ref="inputFile" type="file" style="display: none" @change="chageFile">
         </div>
         <!--web spreadsheet组件-->
-        <div class="excel">
-            <div id="luckysheetDom" style="margin: 0px; padding: 0px; width: 100%; height: 100%" />
+        <div class="excel" :style="{height: height + 'px'}">
+            <div id="luckysheetDom" ref="luckysheet" style="margin: 0px; padding: 0px; width: 100%; height: 100%" />
         </div>
     </div>
 </template>
@@ -36,6 +36,10 @@ export default {
         id: {
             type: String,
             default: ''
+        },
+        dialogShow: {
+            type: Boolean,
+            default: false
         }
     },
     data () {
@@ -65,16 +69,16 @@ export default {
                 verticalAlignMode: true, // '垂直对齐方式'
                 textWrapMode: true, // '换行方式'
                 textRotateMode: false, // '文本旋转方式'
-                image: true, // '插入图片'
+                image: false, // '插入图片'
                 link: false, // '插入链接'
                 chart: false, // '图表'（图标隐藏，但是如果配置了chart插件，右击仍然可以新建图表）
                 postil: false, // '批注'
                 pivotTable: false, // '数据透视表'
                 function: true, // '公式'
                 frozenMode: false, // '冻结方式'
-                sortAndFilter: true, // '排序和筛选'
-                conditionalFormat: true, // '条件格式'
-                dataVerification: true, // '数据验证'
+                sortAndFilter: false, // '排序和筛选'
+                conditionalFormat: false, // '条件格式'
+                dataVerification: false, // '数据验证'
                 splitColumn: false, // '分列'
                 screenshot: true, // '截图'
                 findAndReplace: true, // '查找替换'
@@ -97,12 +101,12 @@ export default {
                 columnWidth: true, // 列宽
                 clear: true, // 清除内容
                 matrix: false, // 矩阵操作选区
-                sort: true, // 排序选区
-                filter: true, // 筛选选区
+                sort: false, // 排序选区
+                filter: false, // 筛选选区
                 chart: false, // 图表生成
-                image: true, // 插入图片
+                image: false, // 插入图片
                 link: false, // 插入链接
-                data: true, // 数据验证
+                data: false, // 数据验证
                 cellFormat: true // 设置单元格格式
             },
             showstatisticBarConfig: {
@@ -111,7 +115,15 @@ export default {
                 view: true, // 打印视图
                 zoom: true // 缩放
             },
-            title: ''
+            title: '',
+            height: ''
+        }
+    },
+    created () {
+        if (this.dialogShow) {
+            this.height = window.innerHeight - 110
+        } else {
+            this.height = window.innerHeight - 150
         }
     },
     mounted () {
@@ -122,6 +134,10 @@ export default {
             this.init()
         }
     },
+    destroyed () {
+        luckysheet.destroy()
+        this.$refs.luckysheet.remove()
+    },
     methods: {
         init () {
             let options = ''
@@ -196,8 +212,6 @@ export default {
                 alert('无法读取excel文件的内容，当前不支持xls文件!')
                 return
             }
-            // console.log('exportJson', exportJson)
-            // console.log('luckysheetfile', luckysheetfile)
 
             luckysheet.destroy()
 
@@ -303,12 +317,14 @@ export default {
     margin-right: 10px;
 }
 .test2 {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
+    // width: 100%;
+    // height: 100%;
+    // display: flex;
+    // flex-direction: column;
     .excel {
         flex: 1;
+        height: 500px;
     }
 }
+
 </style>

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

@@ -126,13 +126,13 @@ export default {
                 this.handleCallback(true)
             })
         },
-        getId (arr) {
-            if (!arr.length) {
-                return ''
-            }
-            const idArrs = arr.map(item => item.id)
-            return idArrs.join(',')
-        },
+        // getId (arr) {
+        //     if (!arr.length) {
+        //         return ''
+        //     }
+        //     const idArrs = arr.map(item => item.id)
+        //     return idArrs.join(',')
+        // },
         // 消息确认，受控文件用
         confirmMsg () {
             // TODO
@@ -148,15 +148,19 @@ export default {
                 const perInfosId = this.$store.getters.userInfo.user.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 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
+                    if (ryjbqkDatas.length == 0) {
+                        alert('该人并没有签字图文在系统，请先上传系统再进行确认！')
+                        return
+                    }
                     const tempObj = {
                         id_: generateUUID(),
                         parent_id_: this.tableId,
-                        tong_zhi_bu_men_: this.getId(perInfosPositions),
+                        // tong_zhi_bu_men_: this.getId(perInfosPositions),
                         que_ren_qian_ming: JSON.stringify([{
                             id: ryjbqkDatas[0].qian_zi_tu_wen_,
                             fileName: '确认签名'
@@ -173,25 +177,27 @@ export default {
                     const addwjcysqbs = []
                     const { userId = '' } = this.$store.getters
                     files.split(',').forEach(i => {
-                        const obj = {
+                        const addwjcysqb = {
                             yong_hu_id_: userId,
                             wen_jian_id_: i,
                             shou_quan_: '1',
                             fa_bu_ri_qi_: this.tableName.slice(this.tableName.indexOf('（') + 1, this.tableName.lastIndexOf('）'))
                         }
-                        addwjcysqbs.push(obj)
+                        addwjcysqbs.push(addwjcysqb)
                     })
-                    const addParams = {
-                        tableName: 't_wjcysqb',
-                        paramWhere: addwjcysqbs
-                    }
-                    curdPost('add', returnParams).then(() => {
-                        console.log('确认接收到发放文件')
+                     curdPost('add', JSON.stringify(returnParams)).then(() => { console.log('确认接收到发放文件') }).then(
+                        () => {
                         this.type = ''
                         this.getFormData()
-                    })
+                        }
+                    )
 
-                    curdPost('add', addParams)
+                    curdPost('add',
+                        '{"tableName": "t_wjcysqb","paramWhere":' + JSON.stringify(addwjcysqbs) + '}'
+                    ).then(response => {
+                        console.log(response)
+                    }).catch(error => {
+                    })
                 })
                 this.closeDialog()
             }).catch(() => { })

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

@@ -257,10 +257,35 @@ export default {
                     this.search()
                     break
                 case 'markRead': // 标记为已读
-                    ActionUtils.selectedMultiRecord(selection).then(id => {
-                        this.handleAlreadyRead(id)
-                        // this.isEnvelope = false
-                    }).catch(() => { })
+                    // ActionUtils.selectedMultiRecord(selection).then(id => {
+                    //     this.handleAlreadyRead(id)
+                    //     // this.isEnvelope = false
+                    // }).catch(() => { })
+                    try {
+                        if(data == undefined){
+                            throw new Error('请选择数据再标记已读。')
+                        }
+                        let fitDatas=[]
+                        data.forEach(el => {
+                            if(el.subject !=='文件发放通知'){
+                                fitDatas.push(el.id)
+                            }
+                        });
+                        if(fitDatas.length !== data.length){
+                            const comfirm = confirm('文件发放通知并不会被标记为已读')
+                            if(comfirm){
+                                ActionUtils.selectedMultiRecord(fitDatas).then(id => {
+                                this.handleAlreadyRead(id)
+                                }).catch(() => { })
+                            }
+                        }else{
+                            ActionUtils.selectedMultiRecord(fitDatas).then(id => {
+                            this.handleAlreadyRead(id)
+                            }).catch(() => { })
+                        }
+                    } catch (error) {
+                        ActionUtils.warning(error.message) 
+                    }
                     break
                 case 'reply': // 回复
                     ActionUtils.selectedRecord(selection).then(id => {