Merge branch 'luckysheet' of http://120.46.222.128:10021/elink-star/epmet-work-pc into Luckysheet-mk

src/views/modules/base/smartExcel/cpts/data-sharing.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="">
-        <el-table :data="tableData" border class="m-table-item" :height="tableHeight" v-if="pageType=='list'">
+    <div class="" :style="{height: tableHeight}">
+        <el-table :data="tableData" border class="m-table-item" :height="tableHeight"  v-if="pageType=='list'">
             <el-table-column prop="taskTitle" label="文件名称" min-width="140" align="center"
                 :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
@@ -34,7 +34,7 @@
             </el-dialog>
         </div>
         <div v-if="pageType == 'info'">
-      <share-excel @handleShowPage="handleShowPage" :workbookId=task></share-excel>
+      <share-excel :infoObj="infoObj" @handleShowPage="handleShowPage" :workbookId=task></share-excel>
     </div>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
             :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)" layout="sizes, prev, pager, next, total"
@@ -50,6 +50,7 @@ import shareExcel from "./share-excel";
 export default {
 data() {
     return {
+        infoObj:{},
         pageType:"list",
         formData:{},
         showdownloadRecord:false,
@@ -66,6 +67,8 @@ mounted() {
 },
 methods: {
     handleInfo(item) {
+        const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId,taskStateName} = item;
+        this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction};
         this.task = item.workBookId
         this.pageType = 'info'
       },
@@ -109,9 +112,7 @@ components:{exportShared,shareExcel
 },
 computed:{
     tableHeight() {
-        const h = this.clientHeight - this.searchH - 100+ this.iframeHeight;
-              const _h = this.clientHeight - 100- this.searchH;
-              return this.$store.state.inIframe ? h : _h;
+        return (this.clientHeight - 300) + 'px'
     },
     ...mapGetters(['clientHeight', 'resolution']),
 },

src/views/modules/base/smartExcel/cpts/share-excel.vue

@@ -28,7 +28,7 @@
   import { mapGetters } from 'vuex'
   import { requestPost, requestGet } from "@/js/dai/request";
   import nextTick from "dai-js/tools/nextTick";
-  
+  import {exportSheetExcel} from "@/utils/export";
   
   export default {
     data() {
@@ -95,8 +95,11 @@
     },
     methods: {
       handleClickCurrencyEvent(){
-        var objsheet = luckysheet.getAllSheets()[0] // 得到表的数据
-        console.log(objsheet,"打算离开房间四点零分");
+        console.log(this.infoObj,"this.infoObj.taskTitle");
+        
+        exportSheetExcel(luckysheet.getAllSheets(),this.infoObj.taskTitle)
+        // var objsheet = luckysheet.getAllSheets()[0] // 得到表的数据
+        // console.log(objsheet,"打算离开房间四点零分");
         // this.options = objsheet // 将表的数据保存本地
         // this.postsheet()
       },

src/views/modules/base/smartExcel/sharedSpace.vue

@@ -96,7 +96,7 @@
       </el-dialog>
     </div>
     <div v-if="pageType == 'info'">
-      <share-excel @handleShowPage="handleShowPage" :workbookId=task></share-excel>
+      <share-excel @handleShowPage="handleShowPage"  :infoObj="infoObj" :workbookId=task></share-excel>
     </div>
   </div>
 </template>
@@ -136,6 +136,7 @@
         return time.getTime() > nowData;
       };
       return {
+        infoObj:{},
         searchBox:"按文件名称关键字搜素",
         showTitle:true,
         name:"",
@@ -390,6 +391,8 @@
         console.log(this.pageType);
       },
       handleInfo(item) {
+        const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId,taskStateName} = item;
+        this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction};
         console.log(item, "dkljsfdlk");
         this.task = item.workBookId
         this.pageType = 'info'

src/views/modules/shequzhili/event/cpts/process-form-assign.vue

@@ -38,15 +38,15 @@
             <el-form-item label="是否敏感渠道来源件" prop="sensitive" label-width="190px"
                 :class="{ 'form-item': source === 'visiual' }" style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-switch v-model="formData.sensitive" active-color="#409eff" :active-value=1 :inactive-value=0
+                    <el-switch v-model="formData.sensitiveEventFlag" active-color="#409eff" :active-value=1 :inactive-value=0
                         inactive-color="#dcdfe6">
                     </el-switch>
                 </div>
             </el-form-item>
-            <el-form-item label="来源渠道" prop="messageSource" label-width="190px"
+            <el-form-item label="来源渠道" prop="sensitiveSource" label-width="190px"
                 :class="{ 'form-item': source === 'visiual' }" style="display: block">
                 <div :class="{ 'visiual-form': source === 'visiual' }">
-                    <el-select v-model.trim="formData.messageSource" clearable class="u-item-width-normal">
+                    <el-select v-model.trim="formData.sensitiveSource" clearable class="u-item-width-normal">
                         <el-option v-for="item in sourceList" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
@@ -188,6 +188,8 @@ export default {
             confirmSolved: [{ label: '问题未解决', value: 0 }, { label: '问题已解决', value: 1 }],
             satisfactionResult: [{ label: '非常满意', value: 'verygood' }, { label: '满意', value: 'good' }, { label: '不满意', value: 'bad' }, { label: '非常不满意', value: 'verybad' }],
             formData: {
+                sensitiveSource:"",//敏感件来源
+                sensitiveEventFlag:"",//敏感件
                 satisfactionResult:"",//满意度
                 confirmSolved:"",//问题是否已解决
                 messageSource:"",