新文件收集与审批

public/static/views/performance.html

@@ -231,7 +231,8 @@
                                 }
                             }
 
-                            //toolBar += '<button id="saves" class="btn btn-primary btn-danger" style=" padding:4px 12px;border-radius:8px; font-size: 12px; margin-right: 10px;">保存</button>';
+                            toolBar += '<button id="getOutUrl" class="btn btn-primary btn-primary" style="padding:4px 12px;border-radius:8px;font-size: 16px;margin-right: 10px;">返回</button>';
+                            // toolBar += '<button id="getOutUrl" class="btn btn-primary btn-danger" style=" padding:4px 12px;border-radius:8px; font-size: 12px; margin-right: 10px;">返回</button>';
                             var eJson = res.body.excelJson;
                             var cellData = luckysheet.transToCellData(eJson[0].data);
                             eJson[0].celldata = cellData;
@@ -305,8 +306,8 @@
                             findAndReplace: showToolBar, // '查找替换'
                             protection: showToolBar, // '工作表保护'
                             print: showToolBar, // '打印'
-                            border: false, // '边框'
-                            function: false, // '公式'
+                            border: true, // '边框'
+                            function: true, // '公式'
                         },
                         showinfobar: true, // 顶部信息 文件名称 按钮
                         allowUpdate: false, // 是否允许操作表格后的后台更新 在线文档websocket时为true
@@ -424,6 +425,11 @@
                     //调用vue页面方法执行新增/修改
                     window.parent['addNewTemplate'](excelName, excelData, templateType);
                 });
+                //退出
+                $('#getOutUrl').off("click").click(function () {
+                    //调用vue页面方法执行新增/修改
+                    window.parent['getOutUrl']('true');
+                });
                 //转派
                 $('#toZhuanpai').off("click").click(function () {
                     var excelId = $(window.parent.document).find("#excelId").attr("value");

src/pages/main/documentCollection/documentCollectionApprovalExcel.vue

@@ -45,21 +45,26 @@
             <el-form :model="testModel" ref="addInfoList">
                 <div>
                     <div class="info-line">
-                        <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="1" style="margin: 10px">无特殊权限</el-radio>
+                        <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="1"
+                            style="margin: 10px">无特殊权限</el-radio>
                         <div id="noLimit" class="info-line">
                             <span style="margin-right:10px;margin-left: 10px">负责人：</span>
-                            <el-button v-if="type == '1' || type == '2'" type="primary" @click="noLimitUserAdd()">组织机构</el-button>
+                            <el-button v-if="type == '1' || type == '2'" type="primary"
+                                @click="noLimitUserAdd()">组织机构</el-button>
                             <span style="margin-right: 10px;margin-left: 10px;display: inline-block;color: blue;">{{
                                 noLimitUserName }}</span>
                         </div>
                     </div>
                     <div class="info-line">
-                        <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="2" style="margin: 10px">特殊权限</el-radio>
+                        <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="2"
+                            style="margin: 10px">特殊权限</el-radio>
                         <div id="limit">
                             <div v-for="(item, index) in limitList">
                                 <div style="margin-right: 10px;margin-left: 10px;display: inline-block;">负责人：</div>
-                                <el-button v-if="type == '1' || type == '2'" type="primary" @click="limitUserAdd(index)">组织机构</el-button>
-                                <div style="margin-right: 10px;margin-left: 10px;display: inline-block;color: blue;">{{ item.userName }}
+                                <el-button v-if="type == '1' || type == '2'" type="primary"
+                                    @click="limitUserAdd(index)">组织机构</el-button>
+                                <div style="margin-right: 10px;margin-left: 10px;display: inline-block;color: blue;">{{
+                                    item.userName }}
                                 </div>
                                 <div style="margin-right: 5px;margin-left: 5px;display: inline-block;">可编辑行：从</div>
 
@@ -93,6 +98,9 @@
                             <el-button style="width: 80px;margin-right: 20px;margin-left: 40px"
                                 v-if="type == '1' || type == '2'" @click="addNewLimitAuth()">添加
                             </el-button>
+                            <el-button style="width: 80px;margin-right: 20px;margin-left: 40px" type="danger"
+                                v-if="(type == '1' || type == '2') && limitList.length > 1" @click="delNewLimitAuth()">删除
+                            </el-button>
                         </div>
                     </div>
                     <div slot="footer" style="text-align: right;padding-bottom: 20px;padding-top: 20px">
@@ -260,11 +268,12 @@ export default {
     methods: {
         // 填报日期
         handleWrite(value) {
-            if (value) {
+            if (value) {//
+                let time = value.getTime() + 86400000
                 let range =
-                    new Date().getTime() > value.getTime()
+                    new Date().getTime() > time
                         ? new Date().getTime()
-                        : value.getTime();
+                        : time;
                 this.pickOptions = {
                     disabledDate(time) {
                         return time.getTime() < range;
@@ -688,6 +697,9 @@ export default {
         showdubanDialog() {
             this.dubanStatus = true;
         },
+        getOutUrl() {
+            this.$router.go(-1);
+        },
         closeauthSettingStatus() {
             this.success = true;
             if (this.authType == '1') {
@@ -907,6 +919,9 @@ export default {
             }
 
         },
+        delNewLimitAuth() {
+            this.limitList.pop()
+        },
         processNoLimitUsers() {
             // console.log(this.treeList);
             // console.log(this.treeListonly);
@@ -1063,6 +1078,9 @@ export default {
         window['dubanBtnDialog'] = (rp) => {
             this.showdubanDialog(rp);
         }
+        window['getOutUrl'] = (rp) => {
+            this.getOutUrl(rp);
+        }
         window['addNewTemplate'] = (sheetName, excelData, templateType) => {
             this.addNewTemplate(sheetName, excelData, templateType);
         };

src/pages/main/documentCollection/newTree.vue

@@ -239,6 +239,9 @@ export default {
 ::v-deep .el-transfer-panel__body {
   height: 100%;
 }
+::v-deep .el-transfer-panel__list{
+  height: 100%;
+}
 
 .tree-text {
   font-size: 20px;