فهرست منبع

Merge branch 'master' of https://git.agilestar.cn/spfm-group/spfm-market-front into test

wgp 3 سال پیش
والد
کامیت
8cda4f1da7
3فایلهای تغییر یافته به همراه10 افزوده شده و 6 حذف شده
  1. 8 4
      src/pages/main/terminal/advcheck.vue
  2. 1 1
      src/pages/main/terminal/advdetailed.vue
  3. 1 1
      vue.config.js

+ 8 - 4
src/pages/main/terminal/advcheck.vue

@@ -26,7 +26,7 @@
                     <el-table-column label="操作" width="120px" align="center">
                         <template slot-scope="scope">
                             <el-button size="mini" type="primary" @click="dialogCheck(scope.row,1)">查看</el-button>
-                            <el-button size="mini" type="danger" v-if="userInfo.loginName != scope.row.opName||scope.row.sts==3"
+                            <el-button size="mini" type="danger" v-if="scope.row.sts==3"
                                 @click="dialogCheck(scope.row,2)">审核</el-button>
                             <el-button v-if="userInfo.loginName == scope.row.opName&&scope.row.sts=='1'" size="mini"
                                 type="primary" @click="advSure(scope.row)">归档
@@ -136,9 +136,11 @@
                     this.tableData = res.data.data;
                     this.total = res.data.totalRecord;
                     this.loading = false;
-                    this.tableData.forEach(item => {
-                        this.getSts(item);
-                    });
+					if(this.advstatus!=0){
+						this.tableData.forEach(item => {
+						    this.getSts(item);
+						});
+					}
                 });
             },
 			getSts(v){
@@ -160,6 +162,7 @@
                     if(res.data.assigneeNo == this.userInfo.loginNo){
                         v.sts = '3'
                         return
+                        
                     }
 				});
 			},
@@ -194,6 +197,7 @@
             },
             dialogCli(v) {
                 let _this = this;
+
                 if (v == 1) {
                     let advTypeName = '';
                     for (let i = 0; i < this.typeList.length; i++) {

+ 1 - 1
src/pages/main/terminal/advdetailed.vue

@@ -146,7 +146,7 @@
             // =======================
             outlist() {
                 this.$http({
-                    url: "/market/DesignSupplier/download",
+                    url: "/market/cDesignSupplier/download",
                     method: "post",
                     headers: {
                         "Content-Type": "application/json",

+ 1 - 1
vue.config.js

@@ -96,7 +96,7 @@ module.exports = {
                 // target: 'http://114.215.71.182:29600',
                 // target: 'http://10.230.26.15:8000/spfm',
                 // target: 'http://127.0.0.1:9600/',
-                target: 'http://192.168.2.142:9600/',
+                target: 'http://192.168.2.142:9610/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
                 changeOrigin: true