merge

.gitignore

@@ -1,17 +1,9 @@
 .DS_Store
 node_modules
 /dist
-<<<<<<< HEAD
-<<<<<<< HEAD
-/dist-test
-=======
 dist.zip
->>>>>>> b1d2e0323329f3f9e21c34540cf9e3eb31cf89a8
-
-=======
 /dist-test
 dist.zip
->>>>>>> 2e174cfb914257ff0e2bab0e76423d7d1fe78aba
 # local env files
 .env.local
 .env.*.local

public/index.html

@@ -32,9 +32,9 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
   <script type="text/javascript">
-    // window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
-    window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
-    // window.staticHost = 'http://192.168.0.103:9600/';
+    window.staticHost = 'http://10.230.26.15:8000/mkt/'; // 正式
+    // window.staticHost = 'http://10.149.85.91:8000/spfm/'; // 测试
+    // window.staticHost = 'http://192.168.2.92:9600';
     // window.staticHost = 'http://43.138.50.94:9600/';
 
     // document.title = "hello";

src/assets/js/util.js

@@ -1,6 +1,7 @@
 //
 // import accounting from 'accounting-js'
 // import idcard from 'idcard' //https://www.npmjs.com/package/idcard
+
 let moment = require("moment");
 let Decimal = require('decimal');
 let util = {

src/components/newTree.vue

@@ -218,7 +218,7 @@ export default {
   display: flex;
   width: 100%;
   justify-content: center;
-  height: 80%;
+  height: 100%;
 }
 
 ::v-deep .el-icon-caret-right {
@@ -242,7 +242,7 @@ export default {
 }
 
 .flex-transfer {
-  width: 50%;
+  width: 80%;
   height: 100%;
   margin-left: 30px;
 }

src/main.js

@@ -14,6 +14,7 @@ import VueContextMenu from 'vue-contextmenu'
 import Urls from './assets/js/url.js' //路径共用
 import excelUrl from '../config/excel.env.js'
 import util from './assets/js/util.js'
+
 import common from './assets/js/common.js' //公共注册
 import http from './assets/js/http.js'
 
@@ -25,6 +26,7 @@ Vue.use(FormMaking)
 Vue.prototype.$url = Urls
 Vue.prototype.$excelUrl = excelUrl
 Vue.prototype.$util = util
+// Vue.prototype.$getConfig = getConfig
 Vue.prototype.common = common
 Vue.prototype.$axios = http //axios 设置
 Vue.use(fullscreen)

src/pages/main/advertising/contractCap.vue

@@ -27,7 +27,11 @@
                     </el-table-column>
                     <el-table-column prop="secbuySchedule" label="使用进度">
                     </el-table-column>
-                    <!-- <el-table-column :label="item.supplierName" v-for="(item, index) in supplierArr" :key="index">
+                    <!-- <el-table-column
+                        :label="item.supplierName"
+                        v-for="(item, index) in supplierArr"
+                        :key="index"
+                    >
                         <template slot-scope="scope">
                             <div v-if="
                                 scope.row.cMkSupplierCumulativeAmounts.filter(

src/pages/main/documentCollection/documentCollectionApprovalExcel.vue

@@ -5,7 +5,7 @@
                 name="excelIframe" id="excelIframe"></iframe>
         </fullscreen>
         <el-dialog :title="'督办'" :visible.sync="dubanStatus" width="50%" :destroy-on-close="true"
-            :modal-append-to-body="false" :close-on-click-modal="false">
+            :modal-append-to-body="false" :close-on-click-modal="false" :before-close="closeduban">
             <el-form ref="form" :model="testModel" :rules="rules">
                 <div>
                     <div style="padding: 10px 20%;">
@@ -34,14 +34,14 @@
                         </el-form-item>
                     </div>
                     <div slot="footer" style="text-align: right;padding-bottom: 20px;padding-top: 20px">
-                        <el-button @click="dubanStatus = false">取 消</el-button>
+                        <el-button @click="closeduban">取 消</el-button>
                         <el-button type="primary" @click="processAuthduban()">确 定</el-button>
                     </div>
                 </div>
             </el-form>
         </el-dialog>
         <el-dialog :title="'权限设置'" :visible.sync="authSettingStatus" width="100%" :show-close="true"
-            :modal-append-to-body="false">
+            :modal-append-to-body="false" :before-close="closequanxian">
             <el-form :model="testModel" ref="addInfoList">
                 <div>
                     <div class="info-line">
@@ -59,6 +59,7 @@
                         <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="2"
                             style="margin: 10px">特殊权限</el-radio>
                         <div id="limit">
+                            <div style="margin: 10px;display: inline-block;color: red;">注：分配的行的权限不能重复</div>
                             <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"
@@ -113,10 +114,10 @@
         <el-dialog title="选择填报人" :visible.sync="noLimitDialog" width="100%" :destroy-on-close="true"
             :modal-append-to-body="false" :close-on-click-modal="false">
             <div style="max-height:500px ;">
-                <deptTreeUserNew v-if="authType == '1'" @treeCheck="treeCheckonly" :defaultList="defaultList"
-                    :type="depttype" :closeList="closeList" :oneORmore="authType" treeListType="1"></deptTreeUserNew>
-                <deptTreeUserNew v-if="authType == '2'" @treeCheck="treeCheckonly" :defaultList="defaultList"
-                    :type="depttype" :closeList="closeList" :oneORmore="authType" treeListType="1"></deptTreeUserNew>
+                <!-- <deptTreeUserNew v-if="authType == '1'" @treeCheck="treeCheckonly" :defaultList="defaultList"
+                    :type="depttype" :closeList="closeList" :oneORmore="authType" treeListType="1"></deptTreeUserNew> -->
+                <deptTreeUserNew @treeCheck="treeCheckonly" :defaultList="defaultList" :type="depttype"
+                    :closeList="closeList" oneORmore="2" treeListType="1"></deptTreeUserNew>
 
                 <div slot="footer" style="text-align: right;padding-bottom: 20px">
                     <el-button @click="noLimitDialog = false">取 消</el-button>
@@ -125,7 +126,7 @@
             </div>
         </el-dialog>
         <el-dialog :title="'提交'" :visible.sync="authDialog" width="50%" :destroy-on-close="true"
-            :modal-append-to-body="false" :close-on-click-modal="false">
+            :modal-append-to-body="false" :close-on-click-modal="false" :before-close="closetijiao">
             <el-form :model="testModel" ref="addInfoList">
                 <div>
                     <div class="info-line">
@@ -150,7 +151,7 @@
                     </div>
                     <br />
                     <div slot="footer" style="text-align: right;padding-bottom: 20px;padding-top: 20px">
-                        <el-button @click="authDialog = false">取 消</el-button>
+                        <el-button @click="closetijiao()">取 消</el-button>
                         <el-button type="primary" @click="processAudit()" :disabled="BtnDisabled">确 定</el-button>
                     </div>
                 </div>
@@ -266,6 +267,16 @@ export default {
         }
     },
     methods: {
+        closequanxian() {
+            this.authSettingStatus = false
+            this.limitList = [{}]
+            this.noLimitUserName = ''
+            this.authType = '2'
+        },
+        closeduban() {
+            this.dubanStatus = false
+            this.testModel = {}
+        },
         // 填报日期
         handleWrite(value) {
             if (value) {//
@@ -307,6 +318,12 @@ export default {
             //     };
             // }
         },
+        closetijiao() {
+            this.authDialog = false;
+            this.treeListType = '';
+            this.auditForm.receiverName = '';
+            this.auditForm.authType = ''
+        },
         auditUserAdd() {
             this.checkexapeople = true;
         },
@@ -479,7 +496,7 @@ export default {
                         message: '处理成功',
                         type: 'success'
                     });
-                    
+
                     //没找到关闭标签页之前的临时处理措施
                     // const newUrl = '#' + this.$route.path + '?type=5&id=' + this.getUrlKey("id");
                     // console.log(newUrl);
@@ -787,9 +804,9 @@ export default {
                 }
             } else if (this.authType == '2') {
                 this.limitList.map((o) => {
-                    console.log(o.userIds);
+                    // console.log(o.userIds);
                     console.log(o.editStart);
-                    console.log(o.editStartCol);
+                    console.log(o.editEnd);
                     let str = o.editStartCol + o.editEndCol
                     if (o.userIds == null || o.userIds[0].key == null) {
                         this.$message({
@@ -863,6 +880,34 @@ export default {
                         return;
                     }
                 })
+                // let arr = []
+                // this.limitList.map((o) => {
+                //     for (var i = o.editStart; i <= o.editEnd; i++) {
+                //         arr.push(i);
+                //     }
+                // })
+                // console.log(arr);
+
+                // let arr2 = arr.sort();
+                // for (let i = 0; i < arr2.length; i++) {
+
+                //     if (typeof (arr2[i]) === 'number') {
+                //         arr2[i] = arr2[i].toString()
+                //     }
+                //     if (typeof (arr2[i + 1]) === 'number') {
+                //         arr2[i + 1] = arr2[i + 1].toString()
+                //     }
+                //     console.log(typeof (arr2[i]));
+                //     console.log((arr2[i]));
+                //     if (arr2[i] === arr2[i + 1]) {
+                //         this.$message({
+                //             message: '分配的行的权限不能重复',
+                //             type: 'error'
+                //         });
+                //         this.success = false;
+                //         return;
+                //     }
+                // }
                 console.log(this.limitList);
             }
             if (this.success) {
@@ -1180,6 +1225,7 @@ export default {
 span {
     width: 80px;
 }
+
 ::v-deep .el-button--text {
     display: none !important;
 }

src/pages/main/documentCollection/newTree.vue

@@ -97,7 +97,7 @@ export default {
       }
       if (v.o !== this.treeId) {
         this.$http({
-          url: "/sysmgr/sysuserinfo/queryListByName",
+          url: "/sysmgr/sysuserinfo/querySysUserListByNameOrderByDuty",
           method: "post",
           headers: {
             "Content-Type": "application/json",

src/pages/main/onlineExcel/index.vue

@@ -41,9 +41,10 @@
                             <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
                                 @click="addNewStatus = true">新建
                             </el-button>
-                            <input style="margin-left:30px" id="upload-file" name="file" type="file" @change="handleUpload">
+                            <!-- <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
+                                @click="shareStatus = true">新建2222
+                            </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"
@@ -87,33 +88,29 @@
                                 </template>
                             </el-table-column>
                         </el-table>
-                        <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next"
-                            background :total="total">
+                        <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="/static/views/onlineShareExcel.html" frameborder="0"></iframe>
+                                src="/marketfront/static/views/onlineShareExcel.html" frameborder="0"></iframe>
                         </fullscreen>
                     </div>
                 </div>
             </div>
-            <el-dialog :title="'新建'" :visible.sync="addNewStatus" width="450px" :destroy-on-close="true"
+            <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;display:flex">
+                    <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">
-                            <span class="iconfont icon-excel" style="font-size: 80px;color: dodgerblue"></span>
-                            <input id="upload-file" name="file" type="file" @change="handleUpload">
-                        </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>
@@ -129,8 +126,7 @@
                         <div class="online">
                             <el-form-item prop="name">
                                 <span>文件夹名称</span>
-                                <el-input v-model="infolist.name" placeholder="文件夹名称"
-                                    :disabled="disableStatus"></el-input>
+                                <el-input v-model="infolist.name" placeholder="文件夹名称" :disabled="disableStatus"></el-input>
                             </el-form-item>
                         </div>
                     </el-form>
@@ -148,28 +144,38 @@
                     <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" v-loading="shareLoading">
-                <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>
+            <div class="flex-dialog">
+                <el-dialog title="选择填报人" :visible.sync="checkexa" width="86%" style="height:100%  ;"
+                    :destroy-on-close="true" :modal-append-to-body="false" :close-on-click-modal="false"
+                    v-loading="shareLoading">
+                    <div class="flex-dialog">
+                        <el-row style="height:80%  ;">
+                            <el-col :span="24" style="height:100%  ;">
+                                <deptTreeUserNew class="tree" @treeCheck="treeCheckonly" :defaultList="defaultList"
+                                    :type="depttype" :closeList="closeList"></deptTreeUserNew>
+                            </el-col>
+
+                        </el-row>
+                        <!-- <el-form :model="exaList" ref="addInfoList"> -->
+                        <!-- <el-form-item prop="processUserId" class="info-line online"> -->
+                        <!-- <span style="width: 80px;margin-right: 20px">审批人员</span> -->
+
+                        <!-- <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> -->
+                        <!-- </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>
+            </div>
+
             <el-dialog title="移动到" :visible.sync="moveStatus" width="500px" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false">
                 <div>
@@ -197,23 +203,21 @@
                     </div>
                 </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>
+            <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>
 
 <script>
-import LuckyExcel from "luckyexcel";
 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"
-import {ajaxJson} from '../../../../public/static/js/util'
+import deptTreeUserNew from "../../../components/newTree.vue"
 
 export default {
     components: {
@@ -279,71 +283,6 @@ export default {
         }
     },
     methods: {
-        //外部导入
-        addExport(e) {
-            this.$http({
-                url: '/market/cOnlineExcel/addExcel',
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: {
-                    folderId: '',
-                },
-            }).then((res) => {
-                console.log(res);
-                res.data.desc
-                this.startUpload(e, res.data.desc)
-            });
-        },
-        startUpload(e, res) {
-            let _this = this;
-            let files = e.target.files;
-            if (files == null || files.length == 0) {
-                window.top.$vm.$message({
-                    message: '没有文件导入',
-                    type: 'info'
-                })
-                return;
-            }
-            let name = files[0].name;
-            let suffixArr = name.split("."),
-                suffix = suffixArr[suffixArr.length - 1];
-            if (suffix != "xlsx") {
-                window.top.$vm.$message({
-                    message: '目前只支持xlsx文件的导入',
-                    type: 'info'
-                })
-                return;
-            }
-            // 解析文件
-            LuckyExcel.transformExcelToLucky(files[0], function (exportJson, luckysheetfile) {
-                if (exportJson.sheets == null || exportJson.sheets.length == 0) {
-                    window.top.$vm.$message({
-                        message: '无法读取excel文件的内容，当前不支持xls文件',
-                        type: 'info'
-                    })
-                    return;
-                }
-                let exceljson = JSON.stringify(exportJson)
-                _this.$util.ajaxJson("正在导入中", "http://192.168.2.124:7777/sheet/excel/importFile", { exceldata: exceljson, id: res }, function (res) {
-                    // console.log('[ res ] >', res)
-                    _this.addNewStatus = false;
-                    document.getElementById('excelId').setAttribute("value", res.id);
-                    _this.showExcel = true;
-  
-
-                });
-            }
-            );
-            console.log(e); //文件
-            console.log(res);//excel id
-
-        },
-        handleUpload(e) {
-            this.addExport(e)
-
-        },
         processWoNo() {
             console.log(this.woNo);
             var _this = this;
@@ -373,7 +312,6 @@ export default {
                     //放入id，切换到excel模式
                     document.getElementById('excelId').setAttribute("value", id);
                     _this.showExcel = true;
-                    console.log(_this.showExcel);
                 }
             });
         },
@@ -455,7 +393,7 @@ export default {
             _this.shareLoading = true;
             if (shareType == 3) {
                 this.treeList.map((o) => {
-                    deptList.push(o.receiveNo);
+                    deptList.push(o.key);
                 });
             }
             if (shareType == 1) {
@@ -533,7 +471,6 @@ export default {
         },
         //打开excel
         moveToEdit(row) {
-
             //放入id，切换到excel模式
             document.getElementById('excelId').setAttribute("value", row.id);
             this.showExcel = true;
@@ -555,7 +492,6 @@ export default {
                     folderId: folderId,
                 },
             }).then((res) => {
-                console.log(res);
                 if (res.data.result === 1) {
                     _this.$message({
                         message: res.data.desc,
@@ -861,6 +797,22 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .flex-dialog .el-dialog {
+    height: 600px !important;
+}
+
+.flex-dialog {
+    height: 100%;
+}
+
+.el-dialog {
+    height: 100% !important;
+}
+
+::v-deep .flex-dialog .el-dialog__body {
+    height: 100% !important;
+}
+
 .container {
     background-color: #f0f2f5;
 

src/pages/main/onlineExcelMarket/index.vue

@@ -42,6 +42,9 @@
                             <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
                                        @click="addNewStatus = true">新建
                             </el-button>
+                            <!-- <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
+                                @click="shareStatus = true">新建2222
+                            </el-button> -->
                         </div>
                         <div style="margin-top: 20px;float: right;margin-right: 20px" class="bigbtns"
                              v-if="selectionSize != 0">
@@ -144,21 +147,29 @@
                     <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"
+            <div class="flex-dialog">
+            <el-dialog title="选择填报人" :visible.sync="checkexa" width="86%" style="height:100%  ;" :destroy-on-close="true"
                        :modal-append-to-body="false" :close-on-click-modal="false" v-loading="shareLoading">
-                <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">
+                <div class="flex-dialog">
+                    <el-row style="height:80%  ;">
+                            <el-col :span="24" style="height:100%  ;">
+                                <deptTreeUserNew class="tree" @treeCheck="treeCheckonly" :defaultList="defaultList"
+                                    :type="depttype" :closeList="closeList"></deptTreeUserNew>
+                            </el-col>
+
+                        </el-row>
+                    <!-- <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> -->
+                        <!-- </el-form-item>
+                    </el-form> -->
 
                     <div slot="footer" style="text-align: right;padding-bottom: 20px">
                         <el-button type="primary" @click="checkProcessUser(3)">确 定</el-button>
@@ -166,6 +177,7 @@
                     </div>
                 </div>
             </el-dialog>
+        </div>
             <el-dialog title="移动到" :visible.sync="moveStatus" width="500px" :destroy-on-close="true"
                        :modal-append-to-body="false" :close-on-click-modal="false">
                 <div>
@@ -207,7 +219,7 @@ 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"
+import deptTreeUserNew from "../../../components/newTree.vue"
 
 export default {
     components: {
@@ -383,7 +395,7 @@ export default {
             _this.shareLoading = true;
             if (shareType == 3) {
                 this.treeList.map((o) => {
-                    deptList.push(o.receiveNo);
+                    deptList.push(o.key);
                 });
             }
             if (shareType == 1) {
@@ -786,6 +798,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .flex-dialog .el-dialog {
+    height: 600px !important;
+}
+
+.flex-dialog {
+    height: 100%;
+}
+
+.el-dialog {
+    height: 100% !important;
+}
+
+::v-deep .flex-dialog .el-dialog__body {
+    height: 100% !important;
+}
 .container {
     background-color: #f0f2f5;
 

src/pages/main/performance/mould.vue

@@ -3,7 +3,6 @@
     <div class="simple-container">
       <simple-form
         :form="table_form"
-        :handle="table_handle"
         @search="handleSearch"
         @add="handleVisible('add')"
         class="department-form"
@@ -169,12 +168,12 @@ export default {
         },
       ],
       table_list: [],
-      table_handle: [
-        {
-          label: "新增模板",
-          props: "add",
-        },
-      ],
+      // table_handle: [
+      //   // {
+      //   //   label: "新增模板",
+      //   //   props: "add",
+      //   // },
+      // ],
       table_handle_row: [
         {
           label: "下发",

src/router/index.js

@@ -2141,29 +2141,23 @@ const routes = [{
             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/onlineExcel/index'], resolve)
         },
         {
-            
             meta: {
-                name: '协同编辑',
+                name: '在线文档(市场)',
                 keepAlive: false
             },
-            path: '/editOnline',
-            name: 'editOnline',
-            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/onlineExcel/index'], resolve),
-            meta: {title: '运行流程'}
-        },
-        {
-            meta: {name: '', keepAlive: false},
-            path: '/productionDataExport/cityHome',
-            name: 'cityHome',
-            component: (resolve) => require( /* webpackChunkName: "system" */
-                ['../pages/main/productionDataExport/cityHome.vue'], resolve)
+            path: '/onlineShareExcelMarket',
+            name: 'onlineShareExcelMarket',
+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/onlineExcelMarket/index'], resolve)
         },
         {
-            meta: {name: '', keepAlive: false},
-            path: '/productionDataExport/provinceHome',
-            name: 'provinceHome',
-            component: (resolve) => require( /* webpackChunkName: "system" */
-                ['../pages/main/productionDataExport/provinceHome.vue'], resolve)
+
+            meta: {
+                name: '在线文档',
+                keepAlive: false
+            },
+            path: '/onlineShareExcel',
+            name: 'onlineShareExcel',
+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/onlineExcel/index'], resolve)
         },
         {
             meta: {
@@ -2173,6 +2167,24 @@ const routes = [{
             path: '/onlineShareExcelMarket',
             name: 'onlineShareExcelMarket',
             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/onlineExcelMarket/index'], resolve)
+        },{
+
+            meta: {
+                name: '在线文档协同',
+                keepAlive: false
+            },
+            path: '/onlineShareExcels',
+            name: 'onlineShareExcel',
+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/onlineExcels/index'], resolve)
+        },
+        {
+            meta: {
+                name: '在线文档(市场)协同',
+                keepAlive: false
+            },
+            path: '/onlineShareExcelMarkets',
+            name: 'onlineShareExcelMarket',
+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/onlineExcelMarkets/index'], resolve)
         },
         {
             meta: {

vue.config.js

@@ -147,8 +147,8 @@ module.exports = {
                 // target: 'http://192.168.2.124:9600/',
                 // target: "http://124.223.66.248:9600",
                 // target: "http://43.138.50.94:9600",
-                target: 'http://192.168.2.124:9600/',
-                // target: 'http://192.168.2.92:9600',
+                // target: 'http://192.168.2.44:9600/',
+                target: 'http://192.168.2.124:9600',
                 // target: "http://124.223.66.248:9600",
                 // target: "http://43.138.50.94:9600",
                 changeOrigin: true,

yarn.lock

@@ -1465,9 +1465,9 @@
   resolved "https://registry.npmmirror.com/@vue/cli-overlay/-/cli-overlay-4.5.19.tgz#d1206f7802bcba1d9c307695b54091df996db804"
   integrity sha512-GdxvNSmOw7NHIazCO8gTK+xZbaOmScTtxj6eHVeMbYpDYVPJ+th3VMLWNpw/b6uOjwzzcyKlA5dRQ1DAb+gF/g==
 
-"@vue/cli-plugin-babel@^4.1.2":
+"@vue/cli-plugin-babel@^4.5.0":
   version "4.5.19"
-  resolved "https://registry.npmmirror.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.19.tgz#288b32e69f0191a77369e88f071c0cd8036edfa7"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.19.tgz#288b32e69f0191a77369e88f071c0cd8036edfa7"
   integrity sha512-8ebXzaMW9KNTMAN6+DzkhFsjty1ieqT7hIW5Lbk4v30Qhfjkms7lBWyXPGkoq+wAikXFa1Gnam2xmWOBqDDvWg==
   dependencies:
     "@babel/core" "^7.11.0"
@@ -1478,9 +1478,9 @@
     thread-loader "^2.1.3"
     webpack "^4.0.0"
 
-"@vue/cli-plugin-eslint@^4.1.2":
+"@vue/cli-plugin-eslint@~4.5.0":
   version "4.5.19"
-  resolved "https://registry.npmmirror.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.19.tgz#d1f908b5d079f2902dc23301290e4dd8176f204c"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.19.tgz#d1f908b5d079f2902dc23301290e4dd8176f204c"
   integrity sha512-53sa4Pu9j5KajesFlj494CcO8vVo3e3nnZ1CCKjGGnrF90id1rUeepcFfz5XjwfEtbJZp2x/NoX/EZE6zCzSFQ==
   dependencies:
     "@vue/cli-shared-utils" "^4.5.19"
@@ -1502,9 +1502,9 @@
   resolved "https://registry.npmmirror.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.19.tgz#2452de58eb66ed873852bea45e6e06b57d842b47"
   integrity sha512-DUmfdkG3pCdkP7Iznd87RfE9Qm42mgp2hcrNcYQYSru1W1gX2dG/JcW8bxmeGSa06lsxi9LEIc/QD1yPajSCZw==
 
-"@vue/cli-service@^4.1.2":
+"@vue/cli-service@~4.5.0":
   version "4.5.19"
-  resolved "https://registry.npmmirror.com/@vue/cli-service/-/cli-service-4.5.19.tgz#5f6513128f426be0ee9a7d03155c23a6f23f8d42"
+  resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.5.19.tgz#5f6513128f426be0ee9a7d03155c23a6f23f8d42"
   integrity sha512-+Wpvj8fMTCt9ZPOLu5YaLkFCQmB4MrZ26aRmhhKiCQ/4PMoL6mLezfqdt6c+m2htM+1WV5RunRo+0WHl2DfwZA==
   dependencies:
     "@intervolga/optimize-cssnano-plugin" "^1.0.5"
@@ -6046,11 +6046,16 @@ jquery-ui@^1.12.1:
   dependencies:
     jquery ">=1.8.0 <4.0.0"
 
-"jquery@>=1.8.0 <4.0.0", jquery@^3.6.0:
+"jquery@>=1.8.0 <4.0.0":
   version "3.6.1"
   resolved "https://registry.npmmirror.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
   integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
 
+jquery@^3.6.4:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.4.tgz#ba065c188142100be4833699852bf7c24dc0252f"
+  integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==
+
 js-audio-recorder@^1.0.7:
   version "1.0.7"
   resolved "https://registry.npmmirror.com/js-audio-recorder/-/js-audio-recorder-1.0.7.tgz#01501cb9eb143d57994b42bd5ae97974fda18908"