zerp 2 years ago
parent
commit
aacc4f2e34

+ 3 - 3
config/index.js

@@ -10,8 +10,8 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/': {
-               // target: 'http://47.108.151.62:80/pre', //后端接口地址     中间人运营平台
-                 target: 'http://127.0.0.1:28080', //后端接口地址   
+                // target: 'http://47.108.151.62:80/pre', //后端接口地址     中间人运营平台
+                target: 'http://127.0.0.1:28080', //后端接口地址   
                 // target: 'http://192.168.3.8:7001', //后端接口地址   
                 changeOrigin: true, //是否跨域
                 pathRewrite: {
@@ -48,4 +48,4 @@ module.exports = {
         bundleAnalyzerReport: process.env.npm_config_report || false,
         generateAnalyzerReport: process.env.npm_config_generate_report || false
     }
-}
+}

+ 12 - 7
src/views/admin/user.vue

@@ -203,14 +203,18 @@ export default {
       }
     }
     const userBack = (rule,value,callback) =>{
-      vailUserName(value).then((res)=>{
-        console.log(res,"userName")
-        if(res.data.data){
+      if(this.operation){
+        vailUserName(value).then((res)=>{
+          console.log(res,"userName")
+          if(res.data.data){
+          callback()
+          }else{
+          callback(new Error('用户名重复'))
+          }
+        })
+      }else{
         callback()
-        }else{
-        callback(new Error('用户名重复'))
-        }
-      })
+      }
     }
     return {
       // 用户列表
@@ -352,6 +356,7 @@ export default {
         userRoles.push(row.roleList[i].roleId)
       }
       this.dataForm.roleList = userRoles
+      this.$refs['ruleForm'].resetFields()
     },
 
     // 密码重置 todo

+ 1 - 0
src/views/bid/index.vue

@@ -368,6 +368,7 @@ export default {
     // 点击文件列表中已上传的文件时的钩子
     handlePreview(file) {
       console.log(file, 'file1')
+      
       // window.location.href = file.url
     },
     handleExceed(files, fileList) {

+ 12 - 8
src/views/client/record.vue

@@ -329,15 +329,19 @@ export default {
         callback()
       }
     }
-        const userBack = (rule,value,callback) =>{
-      vailUserName(value).then((res)=>{
-        console.log(res,"userName")
-        if(res.data.data){
+    const userBack = (rule,value,callback) =>{
+      if(!this.isEditForm){
+        vailUserName(value).then((res)=>{
+          console.log(res,"userName")
+          if(res.data.data){
+          callback()
+          }else{
+          callback(new Error('用户名重复'))
+          }
+        })
+      }else{
         callback()
-        }else{
-        callback(new Error('用户名重复'))
-        }
-      })
+      }
     }
     return {
       size: 'small',

+ 2 - 1
src/views/tender/index.vue

@@ -147,7 +147,8 @@
         <el-table-column prop="appendix" label="附件" align="center" width="100">
           <template slot-scope="scope">
             <!-- <el-link type="primary" :href="scope.row.appendix">查看</el-link> -->
-            <el-button type="text" @click="onLoad(scope.row.appendix)">下载</el-button>
+            <el-button type="text" v-if="scope.row.appendix" @click="onLoad(scope.row.appendix)">下载</el-button>
+            <el-button type="text" v-else disabled>下载</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="投极时间" align="center" />

+ 2 - 1
src/views/user/index.vue

@@ -15,7 +15,8 @@
             <div class="box-center">
               <div class="user-name text-center">{{ user.username }}</div>
               <div class="user-role text-center text-muted">
-                <span>{{ user.deptName ? user.deptName : '没有' }}</span> · <span>{{ user.roleName ? user.roleName : '没有' }}</span>
+                <span>{{ user.deptName ? user.deptName : '没有' }}</span> 
+                <!-- · <span>{{ user.roleName ? user.roleName : '没有' }}</span> -->
               </div>
             </div>
           </div>