在线文档-市场-新的需求

src/pages/main/onlineExcelMarket/index.vue

@@ -1,24 +1,25 @@
 <template>
     <fullscreen :fullscreen.sync="fullscreen" class="container">
-    <div class="container">
-        <div class="main-box container-box">
-            <input type="hidden" id="excelId"/>
-            <div class="inner-left" style="overflow: hidden">
-                <!--                <div class="button-list">-->
-                <!--                    <el-button type="primary" @click="showExcel = true" plain>excel</el-button>-->
-                <!--                    <el-button type="primary" @click="showExcel = false" plain>不excel</el-button>-->
-                <!--                </div>-->
-                <div style="margin: 10px 0">
-                    <el-input placeholder="请输入内容" v-model="filterText" class="input-with-select" clearable
-                              @change="() => {if (!filterText) {searchMenu();}}">
-                        <el-button slot="append" @click="searchMenu" icon="el-icon-search"></el-button>
-                    </el-input>
-                </div>
-                <div v-loading="loading" style="height: calc(100% - 100px);overflow-y: scroll;overflow-x: scroll">
-                    <el-tree ref="tree" class="tree-line" :expand-on-click-node="false" :auto-expand-parent="true"
-                             :default-expand-all="true" :default-checked-keys="checkedMenu" :data="menuList"
-                             @check="checkChange"
-                             @node-click="nodeClick" :filter-node-method="filterNode" node-key="functionCode" style="width: 300px">
+        <div class="container">
+            <div class="main-box container-box">
+                <input type="hidden" id="excelId"/>
+                <div class="inner-left" style="overflow: hidden">
+                    <!--                <div class="button-list">-->
+                    <!--                    <el-button type="primary" @click="showExcel = true" plain>excel</el-button>-->
+                    <!--                    <el-button type="primary" @click="showExcel = false" plain>不excel</el-button>-->
+                    <!--                </div>-->
+                    <div style="margin: 10px 0">
+                        <el-input placeholder="请输入内容" v-model="filterText" class="input-with-select" clearable
+                                  @change="() => {if (!filterText) {searchMenu();}}">
+                            <el-button slot="append" @click="searchMenu" icon="el-icon-search"></el-button>
+                        </el-input>
+                    </div>
+                    <div v-loading="loading" style="height: calc(100% - 100px);overflow-y: scroll;overflow-x: scroll">
+                        <el-tree ref="tree" class="tree-line" :expand-on-click-node="false" :auto-expand-parent="true"
+                                 :default-expand-all="true" :default-checked-keys="checkedMenu" :data="menuList"
+                                 @check="checkChange"
+                                 @node-click="nodeClick" :filter-node-method="filterNode" node-key="functionCode"
+                                 style="width: 300px">
                         <span class="custom-tree-node" slot-scope="{ node }">
                             <span>
                                 <span v-if="node.data.type == 4"
@@ -30,144 +31,148 @@
                                     }}</span>
                             </span>
                         </span>
-                    </el-tree>
-                </div>
-                <div class="tree-action"></div>
-            </div>
-            <div class="inner-right">
-                <div style="overflow: hidden;" v-if="showExcel == false">
-                    <toolList @iconCli='iconCli' :tooltit='tooltit' style="margin: 10px"></toolList>
-                    <div style="margin-top: 20px;float: left;" class="bigbtns">
-                        <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
-                                   @click="addNewStatus = true">新建
-                        </el-button>
-                    </div>
-                    <div style="margin-top: 20px;float: right;margin-right: 20px" class="bigbtns"
-                         v-if="selectionSize != 0">
-                        <el-button style="margin-left: 5px;" class="btn-check" size="small" type="primary"
-                                   @click="delExcel()">删除
-                        </el-button>
-                        <el-button style="margin-left: 5px;" class="btn-check" size="small" type="primary"
-                                   @click="cancelSelection()">取消
-                        </el-button>
-                        <el-button style="margin-left: 5px;" class="btn-check" size="small" type="primary"
-                                   @click="moveStatus = true">移动到
-                        </el-button>
+                        </el-tree>
                     </div>
+                    <div class="tree-action"></div>
                 </div>
-                <div class="tabbox" v-if="showExcel == false">
-                    <div id="selectionList" style="height: 30px">
-                        <span v-if="selectionSize != 0">已选{{ selectionSize }}项</span>
+                <div class="inner-right">
+                    <div style="overflow: hidden;" v-if="showExcel == false">
+                        <toolList @iconCli='iconCli' :tooltit='tooltit' style="margin: 10px"></toolList>
+                        <div style="margin-top: 20px;float: left;" class="bigbtns">
+                            <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
+                                       @click="addNewStatus = true">新建
+                            </el-button>
+                        </div>
+                        <div style="margin-top: 20px;float: right;margin-right: 20px" class="bigbtns"
+                             v-if="selectionSize != 0">
+                            <el-button style="margin-left: 5px;" class="btn-check" size="small" type="primary"
+                                       @click="delExcel()">删除
+                            </el-button>
+                            <el-button style="margin-left: 5px;" class="btn-check" size="small" type="primary"
+                                       @click="cancelSelection()">取消
+                            </el-button>
+                            <el-button style="margin-left: 5px;" class="btn-check" size="small" type="primary"
+                                       @click="moveStatus = true">移动到
+                            </el-button>
+                        </div>
                     </div>
-                    <el-table height="calc(100% - 60px)" class="com-table" ref="multipleTable" :data="tableData"
-                              tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading"
-                              @selection-change="handleSelectionChange">
-                        <el-table-column type="selection" width="45"></el-table-column>
-                        <el-table-column prop="fileName" label="名称">
-                        </el-table-column>
-                        <el-table-column prop="opTime" label="创建时间">
-                        </el-table-column>
-                        <el-table-column prop="addUserDept" label="创建科室">
-                        </el-table-column>
-                        <el-table-column prop="addUserName" label="创建人">
-                        </el-table-column>
-                        <el-table-column prop="shareEditStatus" label="权限状态">
-                            <template slot-scope="scope">
-                                <span v-if="scope.row.editStatus == 0">开</span>
-                                <span v-if="scope.row.editStatus == 1">关</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="操作" width="180px" align="center" fixed="right">
-                            <template slot-scope="scope">
-                                <el-button size="mini" type="primary" @click="moveToEdit(scope.row)"
-                                           :disabled="scope.row.shareEditStatus==1">编辑
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                    <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
-                                   :total="total">
-                    </el-pagination>
-                </div>
-                <div class="container" id="container" v-else>
-                    <fullscreen :fullscreen.sync="excelFullScreen" class="container">
-                        <iframe id="excelIframe" height="100%" width="100%" src="/marketfront/static/views/onlineShareExcelMarket.html"
-                                frameborder="0"></iframe>
-                    </fullscreen>
-                </div>
-            </div>
-        </div>
-        <el-dialog :title="'新建'" :visible.sync="addNewStatus" width="300px" :destroy-on-close="true"
-                   :modal-append-to-body="false" :close-on-click-modal="false">
-            <div>
-<!--                <el-button type="primary" @click="addExcel()" plain class="iconfont icon-wenjian">在线文档</el-button>-->
-<!--                <el-button type="primary" @click="addFolderStatus = true" plain class="iconfont icon-wenjianjia">文件夹</el-button>-->
-                <div style="padding-bottom: 30px">
-                    <div style="width: 85px;display: inline-block;cursor: pointer" @click="addExcel()">
-                        <span class="iconfont icon-wenjian" style="font-size: 80px;color: dodgerblue"></span>
-                        <p style="margin-left: 20px;margin-top: 10px">在线文档</p>
+                    <div class="tabbox" v-if="showExcel == false">
+                        <div id="selectionList" style="height: 30px">
+                            <span v-if="selectionSize != 0">已选{{ selectionSize }}项</span>
+                        </div>
+                        <el-table height="calc(100% - 60px)" class="com-table" ref="multipleTable" :data="tableData"
+                                  tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading"
+                                  @selection-change="handleSelectionChange">
+                            <el-table-column type="selection" width="45"></el-table-column>
+                            <el-table-column prop="fileName" label="名称">
+                            </el-table-column>
+                            <el-table-column prop="opTime" label="创建时间">
+                            </el-table-column>
+                            <el-table-column prop="addUserDept" label="创建科室">
+                            </el-table-column>
+                            <el-table-column prop="addUserName" label="创建人">
+                            </el-table-column>
+                            <el-table-column prop="shareEditStatus" label="权限状态">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.editStatus == 0">开</span>
+                                    <span v-if="scope.row.editStatus == 1">关</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="操作" width="180px" align="center" fixed="right">
+                                <template slot-scope="scope">
+                                    <el-button size="mini" type="primary" @click="moveToEdit(scope.row)"
+                                               :disabled="scope.row.shareEditStatus==1">编辑
+                                    </el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next"
+                                       background
+                                       :total="total">
+                        </el-pagination>
                     </div>
-                    <div style="width: 85px;display: inline-block;margin-left: 70px;cursor: pointer" @click="addFolderStatus = true">
-                        <span class="iconfont icon-wenjianjia" style="font-size: 80px;color: dodgerblue"></span>
-                        <p style="margin-left: 20px;margin-top: 10px">文件夹</p>
+                    <div class="container" id="container" v-else>
+                        <fullscreen :fullscreen.sync="excelFullScreen" class="container">
+                            <iframe id="excelIframe" height="100%" width="100%"
+                                    src="/marketfront/static/views/onlineShareExcelMarket.html"
+                                    frameborder="0"></iframe>
+                        </fullscreen>
                     </div>
                 </div>
             </div>
-        </el-dialog>
-        <el-dialog :title="'新增文件夹'" :visible.sync="addFolderStatus" width="50%" :destroy-on-close="true"
-                   :modal-append-to-body="false" :close-on-click-modal="false">
-            <div v-loading="loading">
-                <el-form :model="infolist" ref="infolist">
-                    <div class="online">
-                        <el-form-item prop="name">
-                            <span>文件夹名称</span>
-                            <el-input v-model="infolist.name" placeholder="文件夹名称" :disabled="disableStatus"></el-input>
-                        </el-form-item>
+            <el-dialog :title="'新建'" :visible.sync="addNewStatus" width="300px" :destroy-on-close="true"
+                       :modal-append-to-body="false" :close-on-click-modal="false">
+                <div>
+                    <!--                <el-button type="primary" @click="addExcel()" plain class="iconfont icon-wenjian">在线文档</el-button>-->
+                    <!--                <el-button type="primary" @click="addFolderStatus = true" plain class="iconfont icon-wenjianjia">文件夹</el-button>-->
+                    <div style="padding-bottom: 30px">
+                        <div style="width: 85px;display: inline-block;cursor: pointer" @click="addExcel()">
+                            <span class="iconfont icon-wenjian" style="font-size: 80px;color: dodgerblue"></span>
+                            <p style="margin-left: 20px;margin-top: 10px">在线文档</p>
+                        </div>
+                        <div style="width: 85px;display: inline-block;margin-left: 70px;cursor: pointer"
+                             @click="addFolderStatus = true">
+                            <span class="iconfont icon-wenjianjia" style="font-size: 80px;color: dodgerblue"></span>
+                            <p style="margin-left: 20px;margin-top: 10px">文件夹</p>
+                        </div>
                     </div>
-                </el-form>
-                <div slot="footer" class="dialog-footer myfooter">
-                    <el-button type="primary" @click="addNewFolder()">确 定</el-button>
-                    <el-button @click="addFolderStatus = false">取 消</el-button>
                 </div>
-            </div>
-        </el-dialog>
-        <el-dialog :title="'分享选项'" :visible.sync="shareStatus" width="550px" :destroy-on-close="true"
-                   :modal-append-to-body="false" :close-on-click-modal="false">
-            <div style="margin-left: 30px;padding-bottom: 20px" v-loading = 'shareLoading'>
-                <el-button type="primary" @click="processExcelShare(1)" plain>仅我可编辑</el-button>
-                <el-button type="primary" @click="openOADialog(2)" plain>部门内所有人可编辑</el-button>
-                <el-button type="primary" @click="checkexa = true" plain>指定人可编辑</el-button>
-            </div>
-        </el-dialog>
-        <el-dialog title="选择填报人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
-                   :modal-append-to-body="false" :close-on-click-modal="false">
-            <div>
-                <el-form :model="exaList" ref="addInfoList">
-                    <el-form-item prop="processUserId" class="info-line online">
-                        <span style="width: 80px;margin-right: 20px">审批人员</span>
-                        <deptTreeUserNew class="tree" @treeCheck="treeCheckonly" :defaultList="defaultList"
-                                         :type="depttype" :closeList="closeList"></deptTreeUserNew>
-                        <div class="tree treeUser">
-                            <p v-for="(item,index) in treeList" :key="index">{{ item.receiveName }}
-                                <i @click="deletes(item,index)" class="el-icon-error"></i>
-                            </p>
+            </el-dialog>
+            <el-dialog :title="'新增文件夹'" :visible.sync="addFolderStatus" width="50%" :destroy-on-close="true"
+                       :modal-append-to-body="false" :close-on-click-modal="false">
+                <div v-loading="loading">
+                    <el-form :model="infolist" ref="infolist">
+                        <div class="online">
+                            <el-form-item prop="name">
+                                <span>文件夹名称</span>
+                                <el-input v-model="infolist.name" placeholder="文件夹名称"
+                                          :disabled="disableStatus"></el-input>
+                            </el-form-item>
                         </div>
-                    </el-form-item>
-                </el-form>
+                    </el-form>
+                    <div slot="footer" class="dialog-footer myfooter">
+                        <el-button type="primary" @click="addNewFolder()">确 定</el-button>
+                        <el-button @click="addFolderStatus = false">取 消</el-button>
+                    </div>
+                </div>
+            </el-dialog>
+            <el-dialog :title="'分享选项'" :visible.sync="shareStatus" width="550px" :destroy-on-close="true"
+                       :modal-append-to-body="false" :close-on-click-modal="false">
+                <div style="margin-left: 30px;padding-bottom: 20px" v-loading='shareLoading'>
+                    <el-button type="primary" @click="processExcelShare(1)" plain>仅我可编辑</el-button>
+                    <el-button type="primary" @click="openOADialog(2)" plain>部门内所有人可编辑</el-button>
+                    <el-button type="primary" @click="checkexa = true" plain>指定人可编辑</el-button>
+                </div>
+            </el-dialog>
+            <el-dialog title="选择填报人" :visible.sync="checkexa" width="50%" :destroy-on-close="true"
+                       :modal-append-to-body="false" :close-on-click-modal="false">
+                <div>
+                    <el-form :model="exaList" ref="addInfoList">
+                        <el-form-item prop="processUserId" class="info-line online">
+                            <span style="width: 80px;margin-right: 20px">审批人员</span>
+                            <deptTreeUserNew class="tree" @treeCheck="treeCheckonly" :defaultList="defaultList"
+                                             :type="depttype" :closeList="closeList"></deptTreeUserNew>
+                            <div class="tree treeUser">
+                                <p v-for="(item,index) in treeList" :key="index">{{ item.receiveName }}
+                                    <i @click="deletes(item,index)" class="el-icon-error"></i>
+                                </p>
+                            </div>
+                        </el-form-item>
+                    </el-form>
 
-                <div slot="footer" style="text-align: right;padding-bottom: 20px">
-                    <el-button type="primary" @click="checkProcessUser(3)">确 定</el-button>
-                    <el-button @click="checkexa = false">取 消</el-button>
+                    <div slot="footer" style="text-align: right;padding-bottom: 20px">
+                        <el-button type="primary" @click="checkProcessUser(3)">确 定</el-button>
+                        <el-button @click="checkexa = false">取 消</el-button>
+                    </div>
                 </div>
-            </div>
-        </el-dialog>
-        <el-dialog title="移动到" :visible.sync="moveStatus" width="500px" :destroy-on-close="true"
-                   :modal-append-to-body="false" :close-on-click-modal="false">
-            <div>
-                <el-tree ref="tree" class="tree-line" :expand-on-click-node="false" :auto-expand-parent="true"
-                         :default-expand-all="true" :default-checked-keys="checkedMenu" :data="moveMenuList"
-                         @check="checkChange"
-                         @node-click="folderNodeClick" node-key="functionCode" @expand-on-click-node="false">
+            </el-dialog>
+            <el-dialog title="移动到" :visible.sync="moveStatus" width="500px" :destroy-on-close="true"
+                       :modal-append-to-body="false" :close-on-click-modal="false">
+                <div>
+                    <el-tree ref="tree" class="tree-line" :expand-on-click-node="false" :auto-expand-parent="true"
+                             :default-expand-all="true" :default-checked-keys="checkedMenu" :data="moveMenuList"
+                             @check="checkChange"
+                             @node-click="folderNodeClick" node-key="functionCode" @expand-on-click-node="false">
                         <span class="custom-tree-node" slot-scope="{ node }">
                             <span>
                                 <span v-if="node.data.type == 4"
@@ -179,20 +184,20 @@
                                     }}</span>
                             </span>
                         </span>
-                </el-tree>
-                <div slot="footer" style="text-align: right;padding-bottom: 20px">
-                    <el-button type="primary" @click="addFolderStatus = true" style="margin-right: 150px">+新建文件夹
-                    </el-button>
-                    <el-button type="primary" @click="moveExcel()">确 定</el-button>
-                    <el-button @click="moveStatus = false">取 消</el-button>
+                    </el-tree>
+                    <div slot="footer" style="text-align: right;padding-bottom: 20px">
+                        <el-button type="primary" @click="addFolderStatus = true" style="margin-right: 150px">+新建文件夹
+                        </el-button>
+                        <el-button type="primary" @click="moveExcel()">确 定</el-button>
+                        <el-button @click="moveStatus = false">取 消</el-button>
+                    </div>
                 </div>
-            </div>
-        </el-dialog>
-        <myMessage :messTit='messTit' @closeMessage="processDel" :centerDialogVisible="delVisible"
-                   v-if="delVisible"></myMessage>
-        <myMessageNew :messTit='oaTitle' @closeMessage="processOa" :centerDialogVisible="oaVisible"
-                   v-if="oaVisible" yesBtnName="是" noBtnName="否"></myMessageNew>
-    </div>
+            </el-dialog>
+            <myMessage :messTit='messTit' @closeMessage="processDel" :centerDialogVisible="delVisible"
+                       v-if="delVisible"></myMessage>
+            <myMessageRadio :messTit='oaTitle' @closeMessage="processOa" :centerDialogVisible="oaVisible"
+                            v-if="oaVisible" yesBtnName="是" noBtnName="否" ok-btn-name="提交"></myMessageRadio>
+        </div>
     </fullscreen>
 </template>
 
@@ -201,6 +206,7 @@ import pForm from "../../../components/p-form";
 import toolList from "../../../components/toolList";
 import myMessage from "../../../components/myMessage.vue";
 import myMessageNew from "../../../components/myMessageNew.vue";
+import myMessageRadio from "../../../components/myMessageRadio.vue";
 import deptTreeUserNew from "../../../components/deptTreeUserNew.vue"
 
 export default {
@@ -209,6 +215,7 @@ export default {
         toolList,
         myMessage,
         myMessageNew,
+        myMessageRadio,
         deptTreeUserNew,
     },
     data() {
@@ -258,7 +265,7 @@ export default {
             moveStatus: false,
             //移动文件夹tree相关
             nowMoveFolder: {},
-            shareLoading : false,
+            shareLoading: false,
             woNo: '',
             moveMenuList: [],
             excelFullScreen: false,
@@ -352,13 +359,15 @@ export default {
         },
         //判断是否提交oa待办
         processOa(v) {
+            console.log(v);
             if (v == 1) {
                 this.oaType = 1;
-            } else {
+                this.processExcelShare(this.shareType);
+            } else if (v == 2) {
                 this.oaType = 0;
+                this.processExcelShare(this.shareType);
             }
             this.oaVisible = false;
-            this.processExcelShare(this.shareType);
         },
         //打开oa待办选项框
         openOADialog(shareType) {
@@ -383,8 +392,12 @@ export default {
             console.log('oa:' + this.oaType);
             console.log('share:' + shareType);
             //提交
+            var url = '/market/cOnlineExcelMarket/saveExcelShare';
+            if (this.addShareType == '2') {
+                url = '/market/cOnlineExcelMarket/reShare';
+            }
             this.$http({
-                url: '/market/cOnlineExcelMarket/saveExcelShare',
+                url: url,
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -719,7 +732,7 @@ export default {
             this.menuList = arr;
             //复制一份给移动文件夹用
             this.moveMenuList = [];
-            arr.map((o) =>{
+            arr.map((o) => {
                 if (o.type == '4') {
                     this.moveMenuList.push(o);
                 }