Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

src/views/authenticRight/index.vue

@@ -500,6 +500,8 @@
 import {getDeptList} from "../../api/biddingHall";
   import {Dialog} from "vant";
   import {Toast} from "vant";
+  import {getInfo} from "../../api/login";
+  import {getMember} from "../../api/project";
 
 export default {
   name: "authenticRightApply",
@@ -613,6 +615,7 @@ export default {
       options: [
 
       ],
+      userId :null,
     }
   },
   created(){
@@ -624,6 +627,13 @@ export default {
         })
       }
     })
+    getInfo().then(response => {
+      console.log(response)
+      this.userId = response.user.userId
+     /* getMember(response.user.userId).then(response => {
+        console.log(response)
+      });*/
+    });
   },
   methods:{
     changeDept(val){
@@ -650,7 +660,7 @@ export default {
         this.queryParams.cooperativeName = null
         listSamplingDept(this.queryParams).then(res => {
           if(res.data){
-            this.option2=[{ text: '乡镇', value: 0 }]
+            this.option2=[{ text: '村级', value: 0 }]
             res.data.map(item => {
               this.option2.push({ "text":item.villageName,"value": item.villageName})
             })
@@ -918,7 +928,7 @@ export default {
     },
     onSubmit(values) {
       this.queryParams = values
-      this.queryParams["createBy"] = "admin"
+      this.queryParams["createBy"] = this.userId
       this.queryParams["createTime"] = "2020-01-01 00:00:00"
       addSampling(values).then(res => {
         console.log(res)
@@ -927,9 +937,9 @@ export default {
       })
     },
     onSubmitXCDC(values) {
-      this.xcdcform["createBy"] = "admin"
+      this.xcdcform["createBy"] = this.userId
       this.xcdcform["createTime"] = "2020-01-01 00:00:00"
-      this.xcdcform["updateBy"] = "admin"
+      this.xcdcform["updateBy"] = this.userId
       this.xcdcform["updateTime"] = "2020-01-01 00:00:00"
       let i = 0
       if(this.xcdcform.item1=='N'){
@@ -1006,9 +1016,9 @@ export default {
         })
       }},
     onSubmitDHDC(values) {
-      this.dhdcform["createBy"] = "admin"
+      this.dhdcform["createBy"] = this.userId
       this.dhdcform["createTime"] = "2020-01-01 00:00:00"
-      this.dhdcform["updateBy"] = "admin"
+      this.dhdcform["updateBy"] = this.userId
       this.dhdcform["updateTime"] = "2020-01-01 00:00:00"
       console.log(this.dhdcform)
       if(this.dhdcform.id){
@@ -1073,7 +1083,6 @@ export default {
     onL() {
       this.refreshing = true;
       this.loading = false;
-      this.getList()
       this.refreshing = false;
     },
     onRefresh() {