Merge branch 'master' into 'dev_info'

# Conflicts:
#   src/pages/main/performance/components/table.vue

public/index.html

@@ -29,7 +29,9 @@
     // window.staticHost = 'http://10.149.85.90:8000/spfm'; // 测试
     // window.staticHost = 'http://192.168.0.103:9600/';
     // window.staticHost = 'http://192.168.2.142:9600/';
+    
+    // document.title = "hello";
   </script>
 </body>
 
-</html>
+</html>

public/static/js/util.js

@@ -774,6 +774,62 @@ util = {
 		});
 
 	},
+	ajaxJsonWithoutDisload: function (msg, url, param, callBack, beforeSend, async) {
+
+		if (!util.isNull(msg)) {
+
+			util.load(msg);
+
+		}
+
+		var urlParam = util.urlToArr(url);
+
+		$.extend(urlParam, param);
+
+
+		$.ajax({
+			type: "POST",
+			url: url,
+			global: true,
+			data: JSON.stringify(urlParam),
+			contentType: "application/json;charset=UTF-8",
+			beforeSend: function (req) {
+
+				req.setRequestHeader("agileauthtoken", util.getToken());
+
+				if ($.isFunction(beforeSend)) {
+
+					beforeSend.call(this, req);
+				}
+
+
+			},
+			xhrFields: {
+				withCredentials: false //跨域session保持
+			},
+			async: async == undefined ? true : async,
+			dataType: "json",
+			success: function (page) {
+				//防止取消掉下面ajax的遮罩层
+				// util.disLoad();
+
+				if ($.isFunction(callBack)) {
+
+					callBack.call(this, page);
+				}
+
+			},
+			error: function (xhr, textStatus, errorThrow) {
+
+				util.disLoad();
+
+				util.closeAll();
+
+				util.error("系统异常!");
+			}
+		});
+
+	},
 	ajaxFile: function (msg, url, form, succFunc, errorFunc, xhrFunc) {
 
 		util.load(msg);
@@ -931,13 +987,13 @@ util = {
 	},
 	/**
 	 * 判断ie版本
-	 * 
+	 *
 	 */
 	IEVersion: function () {
 
-		var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串  
-		var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器  
-		var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器  
+		var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+		var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
+		var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
 		var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
 		if (isIE) {
 			var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
@@ -957,7 +1013,7 @@ util = {
 		} else if (isEdge) {
 			return -1; //edge
 		} else if (isIE11) {
-			return 11; //IE11  
+			return 11; //IE11
 		} else {
 			return -1; //不是ie浏览器
 		}

public/static/views/publiAccount.html

@@ -88,16 +88,26 @@
     </script>
     <script>
 		var lockFlag = 'see'; // 模板状态--see查看add新增updates修改
-		let Menus = JSON.parse(window.sessionStorage.childrenMenus);
-		for (let i = 0; i < Menus.length; i++) {
-			if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/publicityAccount'){
-				lockFlag = 'add';//省级
-			}
-			if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/publicity'){
-				lockFlag = 'updata';//管理员
-				i = Menus.length;
-			}
-		}
+		// let Menus = JSON.parse(window.sessionStorage.childrenMenus);
+		// for (let i = 0; i < Menus.length; i++) {
+		// 	if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/publicityAccount'){
+		// 		lockFlag = 'add';//省级
+		// 	}
+		// 	if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/publicity'){
+		// 		lockFlag = 'updata';//管理员
+		// 		i = Menus.length;
+		// 	}
+		// }
+        // util.ajaxJsonWithoutDisload("", ctx + "/market/cadvLedger/getRoleByCode", {//生产环境加载不到
+        util.ajaxJson("", ctx + "/market/cadvLedger/getRoleByCode", {
+        }, function (res) {
+            console.log("html"+res.result);
+            if (res.result == 1) {
+                lockFlag = 'add';//省级
+            }else{
+                lockFlag = 'updata';//管理员
+            }
+        });
         var id = '' //  模板id 查看/修改load时候用
         var powerFlag = '0'; // 权限控制 0 开启 1关闭
         var excelId = '';

src/components/p-header.vue

@@ -15,10 +15,10 @@
     </div> -->
     <div class="bars">
       <div class="bars-item user-info">Hello，{{ username }}</div>
-<!--      <div class="bars-item" @click="handleGoToCalendar">-->
-<!--        <i class="el-icon-date"></i>-->
-<!--        日历-->
-<!--      </div>-->
+      <div class="bars-item" @click="handleGoToCalendar">
+        <i class="el-icon-date"></i>
+        日历
+      </div>
 
       <div class="bars-item" @click="handleHelp">
         <i class="el-icon-time"></i>
@@ -74,13 +74,43 @@ export default {
     //   this.$store.commit("setCollapse");
     // }
     //this.menuClose();
+    this.$http({
+      url: "/sysmgr/csysdept/queryGroupListByLoginNo",
+      method: "post",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      data: {},
+    }).then((res) => {
+      if (res.data[0].parentorgid === "00440063000000000000") {
+        document.title = "IT工作台";
+      }
+    });
   },
   methods: {
-      handleGoToCalendar(){
-        this.$router.push('calendar');
-      },
+    handleGoToCalendar() {
+      this.$http({
+        url: "/sysmgr/csysdept/queryGroupListByLoginNo",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: {},
+      }).then((res) => {
+        console.log("header" + res.data[0].parentorgid);
+        if (res.data[0].parentorgid === "00440063000000000000") {
+          this.$router.push("calendarnet");
+        } else {
+          this.$router.push("calendar");
+        }
+      });
+    },
     handleCall() {
-      this.$switchTab(this, { rountPath: "/knowledgetop", name: "知识库" },'knowledgetop');
+      this.$switchTab(
+        this,
+        { rountPath: "/knowledgetop", name: "知识库" },
+        "knowledgetop"
+      );
     },
     change(index, item) {
       this.currentIndex = index;
@@ -106,21 +136,21 @@ export default {
       })
         .then((res) => {
           if (res === "confirm") {
-              this.$store.commit("setUserInfo", undefined);
-              this.$store.commit("setToken", undefined);
-              this.$store.commit("setMenus", undefined);
-              this.$store.commit("setTabList", []);
-              this.$cookie.delete("userInfo");
-              this.$cookie.delete("menus");
-              this.$cookie.delete("token");
-              window.sessionStorage.agileauthtoken = undefined;
-              window.sessionStorage.menus = undefined;
-              window.sessionStorage.userInfo = undefined;
-              window.sessionStorage.childrenMenus = undefined;
-              window.opener=null;
-              window.open(' ','_self');
-              window.close();
-              // window.parent.close();
+            this.$store.commit("setUserInfo", undefined);
+            this.$store.commit("setToken", undefined);
+            this.$store.commit("setMenus", undefined);
+            this.$store.commit("setTabList", []);
+            this.$cookie.delete("userInfo");
+            this.$cookie.delete("menus");
+            this.$cookie.delete("token");
+            window.sessionStorage.agileauthtoken = undefined;
+            window.sessionStorage.menus = undefined;
+            window.sessionStorage.userInfo = undefined;
+            window.sessionStorage.childrenMenus = undefined;
+            window.opener = null;
+            window.open(" ", "_self");
+            window.close();
+            // window.parent.close();
             //返回到登录页面
             // this.$router.push("/login");
             //   this.$http({
@@ -145,8 +175,6 @@ export default {
             //
             //       window.location.href = " http://cas.hl.cmcc/cas/login?service=http%3A%2F%2F10.230.26.15%3A8000%2Fspfm%2Fsysmgr%2FssLogin%3FsysFlag%3D0";
             //   });
-
-
           }
         })
         .catch((err) => {

src/components/p-menu.vue

@@ -5,8 +5,9 @@
 		<el-menu class="el-menu-vertical-demo" :default-active="getDefaultActive" router :collapse="collapse"
 			@open="handleOpen" @close="handleClose" active-text-color="#71A6FD">
 			<div class="menu-logo" style="height: 60px; line-height: 60px">
-				<img width="95%" style="text-align: center; vertical-align: middle" src="../assets/newlogo.png"
-					alt="" />
+<!--                <img width="95%" style="text-align: center; vertical-align: middle" src="../assets/newlogo.png"-->
+<!--                     alt="" />-->
+                <img :src="parentorgid==='00440063000000000000' ? require('../assets/newlogo2.png') : require('../assets/newlogo.png')" width="95%" style="text-align: center; vertical-align: middle" alt=""/>
 			</div>
 			<!-- 引入组件 -->
 			<div class="menuScoll">
@@ -44,18 +45,20 @@
 		data() {
 			return {
 				defaultActiveMenuItem: {},
+                parentorgid: '',
 			};
 		},
 		mounted() {
 			if (this.data.length > 0) {
 				this.recursion(this.data);
 			}
+            this.getDept()
 		},
 		updated() {
 			if (this.data.length > 0) {
-			
+
 				this.recursion(this.data);
-				
+
 			}
 		},
 		methods: {
@@ -99,6 +102,19 @@
 				this.$store.commit("setDefaultActive", item.rountPath);
 				this.$store.commit("setTabList", Array.from(set));
 			},
+            getDept() {
+                this.$http({
+                    url: "/sysmgr/csysdept/queryGroupListByLoginNo",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: {},
+                }).then((res) => {
+                    console.log(res.data[0].parentorgid)
+                    this.parentorgid = res.data[0].parentorgid;
+                });
+            },
 		},
 	};
 </script>

src/pages/main/advReleaseAppro/index.vue

@@ -521,7 +521,7 @@
                 this.pageSize = v;
                 this.getList(this.params, this.pageSize);
             },
-            //申请
+            //申请  n是行
             dialogCheck(v, n) {
                 this.dialogStatus = true;
                 let infolist = Object.assign({}, n);

src/pages/main/advReleaseAppro/outdoors.vue

@@ -148,10 +148,11 @@
 					this.advDiscountSum += this.infodata[i].discountPrice;
 				}
 				if(!this.taxRate){
-					this.$message({
-						message: '请先选择供应商！',
-						type: 'error'
-					});
+					// console.log(this.taxRate)
+					// this.$message({
+					// 	message: '请先选择供应商！',
+					// 	type: 'error'
+					// });
 					return
 				}				
 				this.contractAdvCost = (this.advDiscountSum - this.otherDiscount) / (this.taxRate.split("%")[0]*1 + 100) * 100;

src/pages/main/advertising/indexs.vue

@@ -1,7 +1,7 @@
 <template>
     <fullscreen :fullscreen.sync="fullscreen" class="container">
         <div class="container-box">
-			
+
 			<h2>广告宣传费台账</h2>
 			<div class="adv-type">
 			    <div @click="jumpinfop('/publicityAccount',1,'宣传费台账')" v-if="lockFlag == 'updata'">
@@ -17,7 +17,7 @@
 			        <span>查看/下载</span>
 			    </div>
 			</div>
-			
+
       </div>
 
     </fullscreen>
@@ -37,7 +37,7 @@
 			myUpload
         },
         data() {
-          
+
             return {
                 fullscreen: false,
 				lockFlag:'see',
@@ -77,30 +77,47 @@
 			    this.$store.commit("setDefaultActive", params.rountPath);
 			    this.$store.commit("setTabList", Array.from(set));
 			},
+            getRole(){
+                this.$http({
+                    url:"/market/cadvLedger/getRoleByCode",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: {}
+                }).then(res => {
+                    console.log("vue"+res.data.result);
+                    if(res.data.result == "1"){
+                        this.lockFlag = 'add';//省级
+                    }else{
+                        this.lockFlag = 'updata';//管理员
+                    }
+                });
+            },
             getUser() {
                 this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-				let Menus = JSON.parse(window.sessionStorage.childrenMenus);
-				for (let i = 0; i < Menus.length; i++) {
-					if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/publicityAccount'){
-						this.lockFlag = 'add';//省级
-					}
-					if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/publicity'){
-						this.lockFlag = 'updata';//管理员
-						i = Menus.length;
-					}
-				}
-				for (let i = 0; i < Menus.length; i++) {
-					if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/province'){
-						this.province = true;//省公司
-					}
-				}
+				//let Menus = JSON.parse(window.sessionStorage.childrenMenus);
+				// for (let i = 0; i < Menus.length; i++) {
+				// 	if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/publicityAccount'){
+				// 		this.lockFlag = 'add';//省级
+				// 	}
+				// 	if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/publicity'){
+				// 		this.lockFlag = 'updata';//管理员
+				// 		i = Menus.length;
+				// 	}
+				// }
+				// for (let i = 0; i < Menus.length; i++) {
+				// 	if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/province'){
+				// 		this.province = true;//省公司
+				// 	}
+				// }
             }
         },
         mounted() {
             this.getUser();
         },
         created() {
-
+            this.getRole();
         }
     }
 </script>

src/pages/main/demandDevelop/ywStanding.vue

@@ -137,6 +137,7 @@ export default {
             body: { data, count },
           },
         }) => {
+          this.total = count;
           this.tableData = data;
           this.total = count;
         }

src/pages/main/fileList/fileList.vue

@@ -0,0 +1,735 @@
+<template>
+  <!-- <div style="height: 95%"> -->
+  <div class="container" style="margin: 15px 0 0 0">
+    <fullscreen
+      :fullscreen.sync="fullscreen"
+      class="container-box"
+      style="margin: 0 !important; padding: 0 !important"
+    >
+      <div class="titbox">
+        <!-- <h2>部门预算模板管理</h2> -->
+        <h2>在线文档编辑</h2>
+        <div>
+          <i class="el-icon-refresh" @click="iconCli(1)"></i>
+          <i class="el-icon-full-screen" @click="iconCli(2)"></i>
+          <!--                    <i class="el-icon-folder-opened"></i>-->
+          <!--                    <i class="el-icon-view"></i>-->
+          <!--                    <i class="el-icon-more"></i>-->
+        </div>
+      </div>
+      <div class="search">
+        <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
+        <el-button
+          size="small"
+          @click="addExcel"
+          type="primary"
+          v-show="quanxian"
+          >新增文件</el-button
+        >
+      </div>
+
+      <div class="tabbox">
+        <el-table
+          height="calc(100% - 40px)"
+          v-loading="loading"
+          class="com-table"
+          ref="multipleTable"
+          :data="tableData"
+          tooltip-effect="dark"
+          size="small"
+          border
+          style="width: 100%"
+        >
+          <el-table-column
+            align="center"
+            prop="tempName"
+            label="在线文档名称"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="opTime"
+            show-overflow-tooltip
+            label="创建文档时间"
+          >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="opNo"
+            show-overflow-tooltip
+            label="创建文档工号"
+          >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="opName"
+            show-overflow-tooltip
+            label="创建文档姓名"
+          >
+          </el-table-column>
+          <!-- <el-table-column
+            align="center"
+            prop="tempStsDesc"
+            show-overflow-tooltip
+            label="模板状态"
+          >
+          </el-table-column> -->
+          <!-- <el-table-column align="center" prop="tempTypeDesc" label="模板类型">
+          </el-table-column> -->
+          <el-table-column
+            align="center"
+            prop="tempStsDesc"
+            show-overflow-tooltip
+            label="权限状态"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.powerFlag == 0 ? "开" : "关" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="caozuo1"
+            align="center"
+            prop="hotline"
+            width="200"
+            label="無權操作"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="primary"
+                plain
+                @click="detailes(scope.row)"
+                >查看</el-button
+              >
+              <el-button
+                :disabled="scope.row.powerFlag != 0"
+                size="mini"
+                type="danger"
+                plain
+                @click="updates(scope.row)"
+                >修改</el-button
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="caozuo2"
+            align="center"
+            prop="hotline"
+            width="200"
+            label="有權操作"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="primary"
+                plain
+                @click="detailes(scope.row)"
+                >查看</el-button
+              >
+              <el-button
+                size="mini"
+                type="danger"
+                plain
+                @click="updates(scope.row)"
+                >修改</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>
+      <myMessage
+        :messTit="messTit"
+        @closeMessage="closeMessage"
+        :centerDialogVisible="centerDialogVisible"
+        v-if="centerDialogVisible"
+      ></myMessage>
+    </fullscreen>
+    <!-- 
+    <el-dialog
+      title="选择接收人"
+      :visible.sync="dialogStatus"
+      width="50%"
+      :close-on-press-escape="false"
+      :show-close="false"
+      :destroy-on-close="true"
+      :modal-append-to-body="false"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="ruleForm"
+        :rules="rules"
+        :model="formData"
+        label-width="80px"
+      >
+        
+        <el-form-item class="info-line online" prop="fileList">
+          <deptTree
+            v-if="!disableStatus"
+            :closeList="closeList"
+            class="tree"
+            @treeCheck="treeCheck"
+          >
+          </deptTree>
+          <div :class="!disableStatus ? 'tree treeUser' : 'tree treeUserb'">
+            <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-item label="接收人" prop="sendNoArr">
+          <el-select
+            placeholder="选择接收人"
+            v-model="formData.sendNoArr"
+            multiple
+            filterable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="items in options"
+              :key="items.value"
+              :label="items.label"
+              :value="items.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetUser('ruleForm')">取 消</el-button>
+        <el-button @click="subUser('ruleForm')">确 定</el-button>
+      </div>
+    </el-dialog> -->
+  </div>
+</template>
+<script>
+import mySearch from "../../../components/search";
+import myMessage from "../../../components/myMessage.vue";
+import deptTree from "../../../components/deptTreeUser.vue";
+export default {
+  components: {
+    mySearch,
+    myMessage,
+    deptTree,
+  },
+  data() {
+    return {
+      treeList: [],
+      quanxian: false,
+      caozuo1: false,
+      caozuo2: true,
+      closeList: [],
+      disableStatus: false,
+      centerDialogVisible: false,
+      messTit: "",
+      dataId: "",
+      typeFlag: "",
+      value1: "",
+      options: [],
+      dialogStatus: false,
+      formData: {
+        woTitle: "",
+        woDesc: "",
+        requiredTime: "",
+        sendNoArr: "",
+        sendYear: "",
+        sendMonth: "",
+        sendQuarter: "",
+        needReply: "是",
+      },
+      rules: {
+        // woTitle: [
+        //   { required: true, message: "请输入预算标题", trigger: "blur" },
+        // ],
+        // woDesc: [
+        //   { required: true, message: "请输入预算备注", trigger: "change" },
+        // ],
+        // requiredTime: [
+        //   {
+        //     required: true,
+        //     message: "请选择反馈时间",
+        //     trigger: "change",
+        //   },
+        // ],
+        // sendNoArr: [
+        //   {
+        //     required: true,
+        //     message: "请选择接收人",
+        //     trigger: "change",
+        //   },
+        // ],
+        // sendYear: [
+        //   {
+        //     required: true,
+        //     message: "请选择下发年份",
+        //     trigger: "change",
+        //   },
+        // ],
+        // sendMonth: [
+        //   {
+        //     required: true,
+        //     message: "请选择下发月份",
+        //     trigger: "change",
+        //   },
+        // ],
+        // sendQuarter: [
+        //   {
+        //     required: true,
+        //     message: "请选择下发季度",
+        //     trigger: "change",
+        //   },
+        // ],
+      },
+      headers: {
+        agileauthtoken: sessionStorage.agileauthtoken.replace(/"/g, ""),
+      },
+      fullscreen: false,
+      total: 0,
+      pageSize: 1,
+      tableData: [
+        {
+          name: "黑龙江公司移动成本预算简表",
+          cNo: "admin",
+          cUser: "admin",
+          ctime: "2021-03-10",
+          status: "已下发",
+        },
+        {
+          name: "黑龙江公司移动成本预算简表1",
+          cNo: "admin",
+          cUser: "admin",
+          ctime: "2021-03-10",
+          status: "草稿",
+        },
+      ],
+      searchList: [
+        {
+          type: "input",
+          tit: "文档模板名称",
+          value: "",
+          width: "100%",
+          options: [],
+        },
+        // {
+        //   type: "input",
+        //   tit: "创建时间",
+        //   value: "",
+        //   width: "100%",
+        //   options: [],
+        // },
+        // {
+        //   type: "input",
+        //   tit: "模板状态",
+        //   value: "",
+        //   width: "100%",
+        //   options: [],
+        // },
+      ],
+      params: {
+        tempName: "",
+      },
+      loading: false,
+      fileList: [],
+      fileName: "",
+    };
+  },
+  methods: {
+    treeCheck(v) {
+      this.treeList = v;
+    },
+    deletes(val, index) {
+      this.treeList.splice(index, 1);
+      this.closeList = this.treeList;
+    },
+    chenckType(val) {
+      if (val.tempStsDesc == "草稿") {
+        this.$http({
+          url: "/market/filepre/updateType",
+          method: "post",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          data: {
+            id: val.id,
+            tempType: val.tempType,
+            tempTypeDesc: val.tempTypeDesc,
+          },
+        }).then((res) => {
+          this.$message({
+            message: "操作成功",
+            type: "success",
+          });
+          this.getList(this.params, this.pageSize);
+        });
+      }
+    },
+    chenck(val) {
+      if (val.tempStsDesc == "草稿") {
+        this.$http({
+          url: "/market/filepre/updatePower",
+          method: "post",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          data: { id: val.id },
+        }).then((res) => {
+          this.$message({
+            message: "操作成功",
+            type: "success",
+          });
+          this.getList(this.params, this.pageSize);
+        });
+      }
+    },
+    detailes(val) {
+      this.$router.push("/initExcelsee1?status=see&id=" + val.id + "");
+    },
+    // 增加表单处理
+    subUser(formName) {
+      // console.log(this.treeList);
+      // console.log(formName)
+      // formData.SendNoArr=this.treeList
+      let sendNoArr = [];
+      // for (var i = 0; i <= this.treeList.length; i++) {}
+      // let sendNoArr = this.treeList;
+      this.$refs[formName].validate((valid) => {
+        // console.log(valid)
+        if (valid) {
+          this.formData.sendNoArr.map((item) => {
+            this.options.map((row) => {
+              if (item == row.value) {
+                sendNoArr.push({
+                  receiveNo: item,
+                  receiveName: row.label,
+                  deptCode: row.deptCode,
+                  deptName: row.deptName,
+                });
+              }
+            });
+          });
+          let data = {
+            // woTitle: this.formData.woTitle,
+            // woDesc: this.formData.woDesc,
+            // requiredTime: this.formData.requiredTime,
+            sendNoArr: JSON.stringify(sendNoArr),
+            // sendNoArr: this.treeList,
+            // needReply: this.formData.needReply,
+            preTempId: this.preTempId,
+            // sendYear: this.typeFlag == "1" ? "" : this.formData.sendYear,
+            // sendMonth: this.formData.sendMonth,
+            // sendQuarter:
+            //   this.typeFlag == "1"
+            //     ? this.formData.sendYear + "-" + this.formData.sendQuarter
+            //     : "",
+            // tempType: this.typeFlag,
+            funcCode:
+              this.typeFlag == "0"
+                ? "1000"
+                : this.typeFlag == "1"
+                ? "1004"
+                : this.typeFlag == "2"
+                ? "1001"
+                : this.typeFlag == "3"
+                ? "1003"
+                : "",
+          };
+          console.log(data);
+          this.$http({
+            url: "/market/filepre/pub",
+            method: "post",
+            headers: {
+              "Content-Type": "application/json",
+            },
+            data: data,
+          }).then((res) => {
+            if (res.data.result == 0) {
+              this.$message({
+                type: "success",
+                message: "下发成功",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: res.data.desc,
+              });
+            }
+            this.resetUser(formName);
+            this.dialogStatus = false;
+            this.getList(this.params, this.pageSize);
+          });
+        }
+      });
+    },
+    // 取消提交
+    resetUser(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogStatus = false;
+    },
+    closeDialog() {
+      this.dialogStatus = false;
+    },
+    issue(val) {
+      this.typeFlag = val.tempType;
+      console.log(this.typeFlag);
+      this.preTempId = val.id;
+      this.dialogStatus = true;
+    },
+    defaultMenu(path, name) {
+      let defaults = this.$store.state.tabList.filter((item) => {
+        if (item.rountPath == path) {
+          return item;
+        }
+      });
+      if (defaults.length == 1) {
+        return;
+      }
+      let params = {
+        children: "",
+        name: name,
+        rountPath: path,
+        target: "_self",
+      };
+      let set = new Set([...this.$store.state.tabList, params]);
+      this.$store.commit("setDefaultActive", path);
+      this.$store.commit("setTabList", Array.from(set));
+    },
+    closeMessage(v) {
+      this.centerDialogVisible = false;
+      if (v === 1) {
+        this.$http({
+          url: "/market/filepre/cancelPre",
+          method: "post",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          data: { id: this.dataId },
+        }).then((res) => {
+          if (res.data.result == "0") {
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+          }
+          this.getList(this.params, this.pageSize);
+        });
+      }
+    },
+    addExcel() {
+      this.$router.push("/initExceladd1?status=add");
+      // this.defaultMenu("/initExceladd?status=add", "新增预算模板");
+    },
+    updates(val) {
+      this.$router.push("/initExcelupdate1?status=update&id=" + val.id + "");
+      // this.defaultMenu("/initExcelupdate?status=update", "修改预算模板");
+    },
+    //搜索数据
+    searchInfo(v) {
+      this.params = {};
+      v[0] ? (this.params.tempName = v[0]) : "";
+      this.getList(this.params, this.pageSize);
+    },
+    //获取列表
+    getList(v, n) {
+      this.loading = true;
+      this.pageSize = n;
+      this.$http({
+        url: "/market/filepre/queryPage",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+          page: '{"pageNo":"' + n + '","pageSize":"10"}',
+        },
+        data: v,
+      }).then((res) => {
+        this.loading = false;
+        this.tableData = res.data.data;
+        this.total = res.data.totalRecord;
+        console.log(this.tableData);
+      });
+      this.$http({
+        url: "/market/filepre/queryRole",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: { isFile: "0" },
+      }).then((res) => {
+        console.log(res.data);
+        if (res.data) {
+          this.quanxian = true;
+        } else {
+          this.caozuo1 = true;
+          this.caozuo2 = false;
+        }
+      });
+    },
+    //功能栏
+    iconCli(v) {
+      if (v === 1) {
+        this.getList(this.params, this.pageSize);
+      }
+      if (v === 2) {
+        this.fullscreen = !this.fullscreen;
+      }
+    },
+    // 分页
+    currchange(v) {
+      this.pageSize = v;
+      this.getList(this.params, this.pageSize);
+    },
+    getOpations() {
+      this.$http({
+        url: "/sysmgr/sys/mk/offices/queryList",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: {},
+      }).then((res) => {
+        res.data.body.map((item) => {
+          this.options.push({
+            label: item.loginName,
+            value: item.loginNo,
+            deptCode: item.groupId,
+            deptName: item.groupName,
+          });
+        });
+      });
+    },
+  },
+  mounted() {
+    this.getOpations();
+    this.getList(this.params, this.pageSize);
+    // 获取权限
+  },
+  watch: {
+    $route() {
+      this.getList(this.params, this.pageSize);
+    },
+  },
+};
+</script>
+<style scoped>
+.el-upload-list {
+  float: right;
+}
+.el-input__suffix {
+  cursor: pointer;
+}
+.container .el-upload {
+  width: auto !important;
+}
+</style>
+<style scoped lang="scss">
+.btn-default {
+  display: inline;
+  margin-left: 10px;
+}
+.titbox {
+  div {
+    float: right;
+
+    i {
+      font-size: 22px;
+      margin-left: 20px;
+      cursor: pointer;
+    }
+  }
+}
+
+.tabbox {
+  margin-top: 15px;
+}
+
+.pageBox {
+  text-align: right;
+  margin-top: 10px;
+}
+.info-line {
+  width: 100%;
+  display: block;
+
+  span {
+    width: 80px;
+    display: inline-block;
+    text-align: left;
+
+    i {
+      color: red;
+      display: inline-block;
+      padding-right: 5px;
+    }
+  }
+
+  .el-select,
+  .el-input {
+    width: calc(100% - 100px);
+  }
+}
+.online {
+  width: 100%;
+
+  .el-select {
+    width: calc(100% - 100px);
+  }
+
+  span {
+    vertical-align: top;
+  }
+
+  .el-textarea {
+    width: calc(100% - 100px);
+  }
+
+  .tree {
+    width: calc(50% - 60px);
+    display: inline-block;
+    margin-right: 20px;
+    height: 300px;
+    overflow-y: scroll;
+
+    .el-icon-error {
+      float: right;
+      font-size: 20px;
+      margin-top: 9px;
+      cursor: pointer;
+    }
+  }
+
+  .treeUser {
+    margin: 0;
+    border: 1px solid #ddd;
+
+    p {
+      background: #f4f4f4;
+      padding: 0 20px;
+      margin-bottom: 5px;
+    }
+  }
+
+  .treeUserb {
+    width: calc(100% - 100px);
+    border: 1px solid #ddd;
+    background: #f4f4f4;
+    border-radius: 3px;
+    height: auto;
+    overflow: hidden;
+
+    p {
+      display: inline-block;
+      padding: 0 20px;
+      margin-bottom: 5px;
+    }
+  }
+}
+</style>

src/pages/main/fileList/fileListIndex.vue

@@ -0,0 +1,110 @@
+<template>
+	<div class="inner-container">
+		<el-col :span="24" style="padding:20px">
+			<div style="height: 100%">
+				<router-view />
+			</div>
+		</el-col>
+	</div>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				activeName: "",
+				showList: [],
+				routerList: [
+					{
+						label: "在线文档管理",
+						path: "/fileList",
+						name: "fileList",
+						sts:0,
+						num:0
+					},
+				],
+			};
+		},
+		computed: {
+			menuList: function() {
+				let arr = [];
+				this.routerList.map((item) => {
+					// arr.push(item);
+					this.showList.map((row) => {
+						if (item.path == row.jspUrl && row.systemflag == '1') {
+							arr.push(item);
+						}
+					});
+				});
+				return arr;
+			},
+		},
+		methods: {
+			handleClick(val) {
+				this.activeName = val.path;
+				for (let i = 0; i < this.routerList.length; i++) {
+					this.routerList[i].sts = 0;
+				}
+				val.sts = 1;
+				if (this.$route.path != this.activeName) {
+					this.$router.push(this.activeName);
+				}
+				this.getnunm();
+			},
+			getnunm(){
+				this.$http({
+					url: "/market/filepreTask/queryTaskToDoNumByFunc",
+					method: "post",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					data: {},
+				}).then((res) => {
+					for (let i = 0; i < res.data.length; i++) {
+						if(res.data[i].funcCode == '1000'){
+							this.routerList[2].num = res.data[i].taskNum;
+						}
+						if(res.data[i].funcCode == '1001'){
+							this.routerList[0].num = res.data[i].taskNum;
+						}
+						if(res.data[i].funcCode == '1003'){
+							this.routerList[3].num = res.data[i].taskNum;
+						}
+						if(res.data[i].funcCode == '1004'){
+							this.routerList[1].num = res.data[i].taskNum;
+						}
+					}
+				});
+			}
+		},
+		mounted() {
+			this.activeName = this.$route.path;
+		},
+		created() {
+			JSON.parse(sessionStorage.childrenMenus).map((item) => {
+				this.showList.push(item);
+			});
+			this.getnunm();
+		},
+		watch: {
+			$route(to, from) {
+				this.activeName = this.$route.path;
+			},
+		},
+	};
+</script>
+<style>
+	.el-tabs__content {
+		display: none;
+	}
+	.spanbox{
+		display: block;
+		text-align: center;
+		padding: 10px 0;
+		border-right: 3px solid #f1f1f1;
+		margin-right: 20px;
+	}
+	.bg{
+		border-right: 3px solid #0080FF;
+		color: #007AFF;
+	}
+</style>

src/pages/main/fileList/initExcel.vue

@@ -0,0 +1,10 @@
+<template>
+  <div class="container">
+    <iframe
+      height="100%"
+      width="100%"
+      src="/static/views/initExcel1.html"
+      frameborder="0"
+    ></iframe>
+  </div>
+</template>

src/pages/main/fileList/monthExcel.vue

@@ -0,0 +1,11 @@
+<template>
+  <div class="excel-box">
+    <iframe
+      height="100%"
+      width="100%"
+      allowfullscreen="true"
+      src="/static/views/monthExcel.html"
+      frameborder="0"
+    ></iframe>
+  </div>
+</template>

src/pages/main/fileList/projectExcel.vue

@@ -0,0 +1,11 @@
+<template>
+  <div class="excel-box">
+    <iframe
+      height="100%"
+      width="100%"
+      allowfullscreen="true"
+      src="/static/views/projectExcel.html"
+      frameborder="0"
+    ></iframe>
+  </div>
+</template>

src/pages/main/fileList/quarterExcel.vue

@@ -0,0 +1,11 @@
+<template>
+  <div class="excel-box">
+    <iframe
+      height="100%"
+      width="100%"
+      allowfullscreen="true"
+      src="/static/views/quarterExcel.html"
+      frameborder="0"
+    ></iframe>
+  </div>
+</template>

src/pages/main/fileList/recallExcel.vue

@@ -0,0 +1,10 @@
+<template>
+  <div class="container">
+    <iframe
+      height="100%"
+      width="100%"
+      src="/static/views/exportExcel.html"
+      frameborder="0"
+    ></iframe>
+  </div>
+</template>

src/pages/main/fileList/yearExcel.vue

@@ -0,0 +1,11 @@
+<template>
+  <div class="excel-box">
+    <iframe
+      height="100%"
+      width="100%"
+      allowfullscreen="true"
+      src="/static/views/yearExcel.html"
+      frameborder="0"
+    ></iframe>
+  </div>
+</template>

src/pages/main/logQuery/logQueryList.vue

@@ -0,0 +1,224 @@
+<template>
+  <!-- <div style="height: 95%"> -->
+
+  <div class="container" style="padding: 20px 15px 15px 15px">
+    <h2 style="margin: 15px">操作日志查询</h2>
+    <div class="search" style="margin: 15px">
+      <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
+    </div>
+    <el-table
+      height="calc(80% - 40px)"
+      v-loading="loading"
+      class="com-table"
+      ref="multipleTable"
+      :data="tableData"
+      tooltip-effect="dark"
+      size="small"
+      border
+      style="width: 100%"
+    >
+      <el-table-column
+        align="center"
+        prop="slaveNumber"
+        label="操作账号"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="sourceIp"
+        show-overflow-tooltip
+        label="访问IP"
+      >
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="moduleName"
+        show-overflow-tooltip
+        label="操作模块"
+      >
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="operationContent"
+        show-overflow-tooltip
+        label="操作明细"
+      >
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="operationTime"
+        show-overflow-tooltip
+        label="访问时间"
+      >
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      class="pageBox"
+      @current-change="currchange"
+      layout="prev, pager, next"
+      background
+      :total="total"
+    >
+    </el-pagination>
+  </div>
+</template>
+<script>
+import mySearch from "../../../components/search";
+export default {
+  components: {
+    mySearch,
+  },
+  data() {
+    return {
+      total: 0,
+      loading: false,
+      pageSize: 1,
+      params: {
+        slaveNumber: "",
+      },
+      searchList: [
+        {
+          type: "input",
+          tit: "日志操作账号",
+          value: "",
+          width: "100%",
+          options: [],
+        },
+      ],
+      tableData: [
+        {
+          slaveNumber: "admin",
+          sourceIp: "100.220.100.100",
+          moduleName: "全量业务明细报表",
+          operationContent: "全量业务明细报表1111",
+          operationTime: "2021-03-10",
+        },
+        {
+          slaveNumber: "admin",
+          sourceIp: "100.20.100.109",
+          moduleName: "全量业务",
+          operationContent: "全量业务明细报表22222",
+          operationTime: "2021-04-15",
+        },
+      ],
+    };
+  },
+  methods: {
+    //搜索数据
+    searchInfo(v) {
+      this.params = {};
+      v[0] ? (this.params.slaveNumber = v[0]) : "";
+      this.getList(this.params, this.pageSize);
+    },
+    //获取列表
+    getList(v, n) {
+      // this.loading = true;
+      this.pageSize = n;
+      this.$http({
+        url: "/market/selectLogs/queryPage",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+          page: '{"pageNo":"' + n + '","pageSize":"10"}',
+        },
+        data: v,
+      }).then((res) => {
+        this.loading = false;
+        this.tableData = res.data.data;
+        this.total = res.data.totalRecord;
+        // console.log(this.tableData);
+      });
+    },
+    // 分页
+    currchange(v) {
+      this.pageSize = v;
+      this.getList(this.params, this.pageSize);
+    },
+  },
+  mounted() {
+    // this.getOpations();
+    this.getList(this.params, this.pageSize);
+    // 获取权限
+  },
+  watch: {
+    $route() {
+      this.getList(this.params, this.pageSize);
+    },
+  },
+};
+</script>
+<style scoped>
+.el-upload-list {
+  float: right;
+}
+.el-input__suffix {
+  cursor: pointer;
+}
+.container .el-upload {
+  width: auto !important;
+}
+</style>
+<style scoped lang="scss">
+.btn-default {
+  display: inline;
+  margin-left: 10px;
+}
+.titbox {
+  div {
+    float: right;
+
+    i {
+      font-size: 22px;
+      margin-left: 20px;
+      cursor: pointer;
+    }
+  }
+}
+
+.tabbox {
+  margin-top: 15px;
+}
+
+.pageBox {
+  text-align: right;
+  float: right;
+  margin-top: 10px;
+}
+.info-line {
+  width: 100%;
+  display: block;
+
+  span {
+    width: 80px;
+    display: inline-block;
+    text-align: left;
+
+    i {
+      color: red;
+      display: inline-block;
+      padding-right: 5px;
+    }
+  }
+
+  .el-select,
+  .el-input {
+    width: calc(100% - 100px);
+  }
+}
+.online {
+  width: 100%;
+
+  .el-select {
+    width: calc(100% - 100px);
+  }
+
+  span {
+    vertical-align: top;
+  }
+
+  .el-textarea {
+    width: calc(100% - 100px);
+  }
+}
+</style>

src/pages/main/performance/common/export.js

@@ -29,7 +29,7 @@ export var exportExcel = function (luckysheet, value) {
         const blob = new Blob([data], {
             type: "application/vnd.ms-excel;charset=utf-8",
         });
-        console.log("导出成功！");
+        console.log("导出成功！2");
         FileSaver.saveAs(blob, `${value}.xlsx`);
     });
     return buffer;

src/pages/main/performance/components/table.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author       : yuanrunwei
  * @Date         : 2021-11-01 18:02:58
- * @LastEditors: daiqisheng
- * @LastEditTime: 2022-04-07 15:21:38
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-02-10 18:31:51
  * @FilePath     : /spfm-market-front/src/pages/main/performance/components/table.vue
 -->
 <template>

src/pages/main/redir/redir.vue

@@ -0,0 +1,41 @@
+<template>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                phoneNo: 0,
+            }
+        },
+        mounted() {
+            this.queryPhone();
+        },
+        methods: {
+            queryPhone() {
+                this.$http({
+                    url: "/sysmgr/sys/login/queryListLoginMsg",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: {
+                        loginNoStr: JSON.parse(window.sessionStorage.userInfo).loginNoStr,
+                    },
+                }).then((res) => {
+                    console.log('res====', typeof res.data[0])
+                    console.log(res.data[0].phoneNo)
+                    this.phoneNo = res.data[0].phoneNo;
+                    console.log("res.phoneNo", res.data[0].phoneNo)
+
+                    console.log("目标页面中获取",this.$route.query.pass)
+                    // 商户引入流程权限
+                    var url = 'http://10.149.15.69:8080/manageapi/admin/api/v3/loginFromWork?account='+res.data[0].phoneNo+'&pass='+this.$route.query.pass;
+                    window.open(url);
+                    self.location.href="#/leader"
+                    // window.location.href=url;
+                });
+
+            },
+        },
+    }
+</script>

src/router/index.js

@@ -764,6 +764,23 @@ const routes = [{
                 },
             ]
         },
+	    {
+	        meta: { name: '在线文档', keepAlive: false },
+	        path: '/fileList',
+	        name: 'fileList',
+	        redirect: 'monthExcel',
+	        component: (resolve) => require( /* webpackChunkName: "system" */
+	            ['../pages/main/fileList/fileListIndex.vue'], resolve),
+	        children: [
+	            {
+	                meta: { name: '在线文档', keepAlive: false },
+	                path: '/fileList',
+	                name: 'fileList',
+	                component: (resolve) => require( /* webpackChunkName: "system" */
+	                    ['../pages/main/fileList/fileList.vue'], resolve)
+	            },
+	        ]
+        },
         {
             meta: {
                 name: '科室绩效',
@@ -984,7 +1001,27 @@ const routes = [{
         //     component: (resolve) => require( /* webpackChunkName: "system" */
         //         ['../pages/main/budget/initBudget.vue')
         // },
-
+		{
+            meta: { name: '新增在线excel', keepAlive: false },
+            path: '/initExceladd1',
+            name: 'initExceladd1',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/fileList/initExcel.vue'], resolve)
+        },
+        {
+            meta: { name: '修改在线excel', keepAlive: false },
+            path: '/initExcelupdate1',
+            name: 'initExcelupdate1',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/fileList/initExcel.vue'], resolve)
+        },
+        {
+            meta: { name: '查看在线excel', keepAlive: false },
+            path: '/initExcelsee1',
+            name: 'initExcelsee1',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/fileList/initExcel.vue'], resolve)
+        },
         {
             meta: { name:  '新增excel', keepAlive: false },
             path: '/initExceladd',
@@ -1111,6 +1148,12 @@ const routes = [{
         component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/fullcalendar/calendar'], resolve)
         },
         {
+            meta: { name: '信息技术中心日历', keepAlive: true },
+            path: '/calendarnet',
+            name: 'calendarnet',
+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/fullcalendar/calendarnet'], resolve)
+        },
+        {
             meta: { name:  '公告', keepAlive: false },
             path: '/noticec',
             name: 'noticec',
@@ -1730,6 +1773,22 @@ const routes = [{
             name: 'marketDecisionMeeting',
             component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/meetingDeclaration/marketDecisionMeeting'], resolve)
         },
+        {
+            meta: {
+                name: '权益',
+                keepAlive: false
+            },
+            path: '/redir',
+            name: 'redir',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/redir/redir'], resolve)
+        },
+        {
+            meta: { name: '日志查询', keepAlive: false },
+            path: '/logQueryList',
+            name: 'logQueryList',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/logQuery/logQueryList.vue'], resolve)
+        },
 
     ]
 },

vue.config.js

@@ -93,7 +93,7 @@ module.exports = {
         proxy: {
             // 开发环境变化可注释 ⬇️⬇️
             "/market/CMK": {
-                target: "http://192.168.3.25:9114",
+                target: "http://124.223.66.248:9600",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -101,7 +101,7 @@ module.exports = {
                 },
             },
             "/market/mk": {
-                target: "http://192.168.3.25:9114",
+                target: "http://124.223.66.248:9600",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -109,7 +109,7 @@ module.exports = {
                 },
             },
             "/market/techcentergj": {
-                target: "http://192.168.3.25:9114",
+                target: "http://124.223.66.248:9600",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -117,7 +117,7 @@ module.exports = {
                 },
             },
             "/mkWangge": {
-                target: "http://192.168.3.25:9114",
+                target: "http://124.223.66.248:9600",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -135,7 +135,7 @@ module.exports = {
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
-                target: "http://192.168.3.228:9600/spfm",
+                target: "http://124.223.66.248:9600",
                 changeOrigin: true,
             },
         },