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

src/utils/export.js

@@ -1,10 +1,16 @@
 const Excel = require('exceljs')
+import { Loading } from 'element-ui';
 export  async function exportSheetExcel(luckysheet,name="file") { // 参数为luckysheet.getluckysheetfile()获取的对象
+    let loadingInstance =  Loading.service({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
     // 1.创建工作簿，可以为工作簿添加属性
     const workbook = new Excel.Workbook();
     // 2.创建表格，第二个参数可以配置创建什么样的工作表
     luckysheet.every(function (table) {
-        console.log(table,'seeee');
         if (table.data.length === 0) return true;
         const worksheet = workbook.addWorksheet(table.name);
         // 3.设置单元格合并,设置单元格边框,设置单元格样式,设置值
@@ -18,6 +24,7 @@ export  async function exportSheetExcel(luckysheet,name="file") { // 参数为lu
     const buffer = await workbook.xlsx.writeBuffer();
     // 5.保存为文件
     saveFile(buffer,name);
+    await  loadingInstance.close();
 }
 
 var saveFile = function(buf,name) {

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

@@ -115,7 +115,6 @@ export default {
   },
   methods: {
     handleClickExportExcel(){
-      console.log(luckysheet.getAllSheets(),'seee1');
       exportSheetExcel(luckysheet.getAllSheets(),this.infoObj.taskTitle)
     },
     async getTaskList() {

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

@@ -5,8 +5,8 @@
                 <el-form-item label="办理状态" label-width="118px" :class="{ 'form-item': source === 'visiual' }"
                     prop="operationType" v-if="pageType !== 'assign'&& pageType !== 'resetAssign'">
                     <el-select v-model="operationType" placeholder="请选择" :disabled="pageType === 'check'">
-                        <el-option label="联系当事人" value="9"></el-option>
-                        <el-option label="办理中" value="10"></el-option>
+                        <el-option label="已联系当事人" value="9"></el-option>
+                        <el-option v-if="eventState!=1"  label="办理中" value="10"></el-option>
                         <el-option label="已办结" value="11"></el-option>
                     </el-select>
                 </el-form-item>
@@ -48,6 +48,7 @@ let loading; // 加载动画
 export default {
     data() {
         return {
+            eventState:"",
             casOptions: [],
             iscascaderShow: 0,
             selCategoryArray: [],
@@ -131,8 +132,22 @@ export default {
             }
         })
         this.getOrgTreeList()
+        this.sysAdvancedPage()
     },
     methods: {
+        async sysAdvancedPage(row) {
+			const url = '/governance/icEventConfig/getStreetConfigDetail';
+			const param = {
+				orgId: this.agencyId,
+			};
+			const { data, code, msg } = await requestGet(url, param);
+			if (code === 0) {
+                this.eventState=data.eventState
+                
+			} else {
+				this.$message.error(msg);
+			}
+		},
         async getOrgTreeList() {
             const url = "/gov/org/customeragency/agencyGridDepttree"
             let params = {

src/views/modules/shequzhili/eventHandling/index.vue

@@ -532,7 +532,7 @@ export default {
                 this.$message.error('上传文件只能是xls/xlsx格式！');
             }
 
-            if (!isLt1M) {
+            if (!isLt1M) { 
                 this.$message.error('上传文件大小不能超过 10MB!');
             }
             return fileType && isLt1M;

src/views/modules/workSys/sysConfigure/index.vue

@@ -177,6 +177,25 @@
                                             inactive-color="#eaecf0" @change="handleChange()">
                                         </el-switch>
                                     </div>
+                                    <div
+                                        style=" margin-top: 20px;display: flex;border-bottom: 1px dotted rgba(0, 0, 0, 0.3); flex-direction: row; align-items: center; justify-content: space-between;">
+                                        <div>
+                                            <div style="display: flex; flex-direction: row; align-items: center;">
+                                                <div style="width: 10px; height: 10px; background-color: #4e89ec"></div>
+                                                <div style="font-weight:800;font-size: 14px; margin-left: 10px;">
+                                                    是否需要开启办理中选项
+                                                </div>
+                                            </div>
+                                            <div 
+                                                style=" margin: 20px;font-size: 14px; display: flex; align-items: center;">
+                                                若开启办理中选项，事件办理状态中需要加上办理中选项。
+                                            </div>
+                                        </div>
+                                        <el-switch v-model="sysAdvancedList.eventState"
+                                            active-color="#13ce66" :active-value=3 :inactive-value=1
+                                            inactive-color="#eaecf0" @change="handleChange()">
+                                        </el-switch>
+                                    </div>
                                     <div
                                         style=" margin-top: 20px;display: flex;border-bottom: 1px dotted rgba(0, 0, 0, 0.3); flex-direction: row; align-items: center; justify-content: space-between;">
                                         <div>