Merge branch 'master' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc

config/dev.env.js

@@ -5,7 +5,7 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  // BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
+  BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
   // BASE_URL:'"http://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   BASE_URL: '"http:///192.168.0.253:8080/"',//田智

src/views/PeopleManage/Seo/BloodSeo.vue

@@ -9,14 +9,14 @@
                 clearable
                 size="small"
                 placeholder="工号"
-                v-model="queryFrom.userId"
+                v-model="queryFrom.affiliation"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="15"> &nbsp;</el-col>
           <el-col :span="4">
             <el-form-item label="">
-              <el-button type="primary" size="small" @click="queryBlood"
+              <el-button type="primary" size="small" @click="queryBlood(true)"
                 >查询</el-button
               >
             </el-form-item>
@@ -648,13 +648,12 @@ export default {
           this.dialogVisible = true;
         });
     },
-    queryBlood() {
+    queryBlood(isQuery) {
       // var that = this;
-      if(!JSON.parse(localStorage.getItem('user_data')).name=='admin'){
-        this.queryFrom.affiliation=JSON.parse(localStorage.getItem('user_data')).id
+      if(isQuery){
+        this.pagination.pageNum=1
       }
-      this.$api.user.referrerFindPage({...this.pagination,...this.queryFrom}).then((personRes) => {
-        console.log(personRes);
+      this.$api.user.referrerFindPage({dto:{...this.queryFrom},...this.pagination}).then((personRes) => {
         if(personRes.code==200){
           personRes.data.content.forEach(val=>{
             if(val.userSex&& val.userSex!==''&& val.userSex!==null){