Merge branch 'hjw1' into 'master'

Hjw1

See merge request spfm/spfm-market-front!90

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>

src/components/p-header.vue

@@ -74,28 +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.$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');
-              }
-          });
-
-      },
+    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;
@@ -121,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({
@@ -160,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/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;

vue.config.js

@@ -93,7 +93,7 @@ module.exports = {
         proxy: {
             // 开发环境变化可注释 ⬇️⬇️
             "/market/CMK": {
-                target: "http://192.168.3.129:9113",
+                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.129:9113",
+                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.129:9113",
+                target: "http://124.223.66.248:9600",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -117,7 +117,7 @@ module.exports = {
                 },
             },
             "/mkWangge": {
-                target: "http://192.168.3.129:9113",
+                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.129:9600",
+                target: "http://124.223.66.248:9600",
                 changeOrigin: true,
             },
         },