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

config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  VUE_APP_BASE_API: '"/dev-api"'
+  VUE_APP_BASE_API: '"/api"'
 })

config/index.js

@@ -10,13 +10,13 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
-      "/dev-api": {
+      "/api": {
         // 请求的目标主机
         //target: 'http://116.255.135.38:8081/nsgk_test/',
         target: 'http://localhost:8080/',
         changeOrigin: true,
         pathRewrite: {
-          '^/dev-api': ''
+          '^/api': ''
         }
       }
     },

src/views/authenticRight/index.vue

@@ -100,18 +100,10 @@
         <van-field
           v-model="xcdcform.originalNameCheckedBy"
           name="originalNameCheckedBy"
-          label="被核查原户主姓名"
+          label="原抽查户主姓名"
           label-width="120px"
-          placeholder="被核查原户主姓名"
-          :rules="[{ required: true, message: '请填写被核查原户主姓名' }]"
-        />
-        <van-field
-          v-model="xcdcform.farmerName"
-          name="farmerName"
-          label="抽查户主名称"
-          label-width="120px"
-          placeholder="抽查户主名称"
-          :rules="[{ required: true, message: '请填写抽查户主名称' }]"
+          placeholder="原抽查户主姓名"
+          :rules="[{ required: true, message: '请填写原抽查户主姓名' }]"
         />
         <van-field
           v-model="xcdcform.nameCheckedBy"
@@ -295,15 +287,13 @@
           label="影像起始时间"
           label-width="120px"
           placeholder="影像起始时间"
+          @click="showPop"
           :rules="[{ required: true, message: '请填写影像起始时间' }]"
         >
-          <van-datetime-picker
-            v-model="xcdcform.fileTime"
-            type="datetime"
-            title="选择完整时间"
-          />
         </van-field>
-
+        <van-popup v-model="showDate" position="bottom" :style="{ height: '40%' }">
+          <van-datetime-picker v-model="currentValue" type="datetime" @change="changeFn()" @confirm="confirmFn()" @cancel="cancelFn()"/>
+        </van-popup>
         <div style="margin: 16px;">
           <van-button round block type="info" native-type="submit">提交</van-button>
         </div>
@@ -354,34 +344,26 @@
         <van-field
           v-model="dhdcform.originalNameCheckedBy"
           name="originalNameCheckedBy"
-          label="被核查原户主姓名"
+          label="原抽查户主姓名"
           label-width="120px"
-          placeholder="被核查原户主姓名"
-          :rules="[{ required: true, message: '请填写被核查原户主姓名' }]"
+          placeholder="原抽查户主姓名"
+          :rules="[{ required: true, message: '请填写原抽查户主姓名' }]"
         />
         <van-field
-          v-model="dhdcform.farmerName"
-          name="farmerName"
-          label="抽查户主名称"
+          v-model="dhdcform.callPhone"
+          name="callPhone"
+          label="主叫号码"
           label-width="120px"
-          placeholder="抽查户主名称"
-          :rules="[{ required: true, message: '请填写抽查户主名称' }]"
+          placeholder="主叫号码"
+          :rules="[{ required: true, message: '请填写主叫号码' }]"
         />
         <van-field
-          v-model="dhdcform.nameCheckedBy"
-          name="nameCheckedBy"
-          label="被核查人姓名"
+          v-model="dhdcform.calledPhone"
+          name="calledPhone"
+          label="被叫号码"
           label-width="120px"
-          placeholder="被核查人姓名"
-          :rules="[{ required: true, message: '请填写被核查人姓名' }]"
-        />
-        <van-field
-          v-model="dhdcform.idcardCheckedBy"
-          name="idcardCheckedBy"
-          label="被核查人身份证号"
-          label-width="120px"
-          placeholder="被核查人身份证号"
-          :rules="[{ required: true, message: '请填写被核查人身份证号' }]"
+          placeholder="被叫号码"
+          :rules="[{ required: true, message: '请填写被叫号码' }]"
         />
         <h2 class="van-doc-demo-block__title">农村土地承包经营权证</h2>
         <van-field name="item1" label="是否有证书">
@@ -422,15 +404,14 @@
           name="fileTime"
           label="影像起始时间"
           label-width="120px"
+          @click="showPop1"
           placeholder="影像起始时间"
           :rules="[{ required: true, message: '请填写影像起始时间' }]"
         >
-          <van-datetime-picker
-            v-model="dhdcform.fileTime"
-            type="datetime"
-            title="选择完整时间"
-          />
         </van-field>
+        <van-popup v-model="showDate1" position="bottom" :style="{ height: '40%' }">
+          <van-datetime-picker v-model="currentValue" type="datetime" @change="changeFn()" @confirm="confirmFn()" @cancel="cancelFn()"/>
+        </van-popup>
         <div style="margin: 16px;">
           <van-button round block type="info" native-type="submit">提交</van-button>
         </div>
@@ -439,7 +420,7 @@
     <van-action-sheet v-model="show" title="基础数据">
       <van-form @submit="onSubmit">
         <van-field
-          v-model="queryParams.countName"
+          v-model="queryform.countName"
           name="countName"
           label="县（区）"
           label-width="120px"
@@ -447,7 +428,7 @@
           :rules="[{ required: true, message: '请填写县（区）' }]"
         />
         <van-field
-          v-model="queryParams.townName"
+          v-model="queryform.townName"
           name="townName"
           label="乡（镇、街）"
           label-width="120px"
@@ -455,7 +436,7 @@
           :rules="[{ required: true, message: '请填写乡（镇、街）' }]"
         />
         <van-field
-          v-model="queryParams.villageName"
+          v-model="queryform.villageName"
           name="villageName"
           label="经联社"
           label-width="120px"
@@ -463,7 +444,7 @@
           :rules="[{ required: true, message: '请填写经联社' }]"
         />
         <van-field
-          v-model="queryParams.cooperativeName"
+          v-model="queryform.cooperativeName"
           name="cooperativeName"
           label="经济社（小组）"
           label-width="120px"
@@ -471,7 +452,7 @@
           :rules="[{ required: true, message: '请填写经济社（小组））' }]"
         />
         <van-field
-          v-model="queryParams.farmerName"
+          v-model="queryform.farmerName"
           name="farmerName"
           label="抽查户主名称"
           label-width="120px"
@@ -499,22 +480,23 @@
   } from "../../api/authenticRight";
 import {getDeptList} from "../../api/biddingHall";
   import {Dialog} from "vant";
-  import {Toast} from "vant";
-  import {getInfo} from "../../api/login";
-  import {getMember} from "../../api/project";
+  import {getInfo} from "@/api/login/index";
+  import {getNowFormatDate} from "../../utils/utils";
 
 export default {
   name: "authenticRightApply",
   data() {
     return {
+      showDate:false,
+      showDate1 : false,
       value1:0,
-      option1:[{ text: '区县', value: 0 }],
+      option1:[{ text: '请选择区县', value: 0 }],
       value11:0,
-      option11:[{ text: '乡镇', value: 0 }],
+      option11:[{ text: '请选择乡镇', value: 0 }],
       value2:0,
-      option2:[{ text: '村级', value: 0 }],
+      option2:[{ text: '请选择村级', value: 0 }],
       value22:0,
-      option22:[{ text: '合作社', value: 0 }],
+      option22:[{ text: '请选择合作社', value: 0 }],
       loading: false,
       finished: false,
       refreshing: false,
@@ -543,6 +525,21 @@ export default {
       samplingList:[
 
       ],
+      queryform:{
+        // 分页
+        pageNum: 1,
+        pageSize: 10,
+        // 查询排序
+        //orderByColumn: "id",
+        //isAsc: "desc",
+        countName: null,
+        townName: null,
+        villageName: null,
+        cooperativeName: null,
+        farmerName: null,
+        status: null,
+        id: null,
+      },
       xcdcform:{
         countName: null,
         townName: null,
@@ -616,12 +613,14 @@ export default {
 
       ],
       userId :null,
+      nickName:null,
+      currentValue:null,
     }
   },
   created(){
     listSamplingDept(this.queryParams).then(res => {
       if(res.data){
-        this.option1=[{ text: '区县', value: 0 }]
+        this.option1=[{ text: '请选择区县', value: 0 }]
         res.data.map(item => {
           this.option1.push({ "text":item.countName,"value": item.countName})
         })
@@ -630,12 +629,29 @@ export default {
     getInfo().then(response => {
       console.log(response)
       this.userId = response.user.userId
-     /* getMember(response.user.userId).then(response => {
-        console.log(response)
-      });*/
+      this.nickName = response.user.nickName
     });
   },
   methods:{
+    changeFn(val) {
+      },
+    confirmFn(){
+      this.xcdcform.fileTime = getNowFormatDate(this.currentValue)
+      this.dhdcform.fileTime = getNowFormatDate(this.currentValue)
+      this.showDate = false;
+      this.showDate1 = false;
+    },
+    cancelFn(){
+      this.showDate = false;
+      this.showDate1 = false;
+    }
+    ,
+    showPop(){
+      this.showDate = true;
+    },
+    showPop1(){
+      this.showDate1 = true;
+    },
     changeDept(val){
       if(val==1){
         this.queryParams.countName = this.value1
@@ -644,7 +660,7 @@ export default {
         this.queryParams.cooperativeName = null
         listSamplingDept(this.queryParams).then(res => {
           if(res.data){
-            this.option11=[{ text: '乡镇', value: 0 }]
+            this.option11=[{ text: '请选择乡镇', value: 0 }]
             res.data.map(item => {
               this.option11.push({ "text":item.townName,"value": item.townName})
             })
@@ -660,7 +676,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})
             })
@@ -675,7 +691,7 @@ export default {
         this.queryParams.cooperativeName = null
         listSamplingDept(this.queryParams).then(res => {
           if(res.data){
-            this.option22=[{ text: '合作社', value: 0 }]
+            this.option22=[{ text: '请选择合作社', value: 0 }]
             res.data.map(item => {
               this.option22.push({ "text":item.cooperativeName,"value": item.cooperativeName})
             })
@@ -692,21 +708,20 @@ export default {
       }
     },
     reset(){
-      this.queryParams = {
-        // 分页
+      this.queryform={
         pageNum: 1,
-          pageSize: 10,
-          // 查询排序
-          //orderByColumn: "id",
-          //isAsc: "desc",
-          countName: null,
-          townName: null,
-          villageName: null,
-          cooperativeName: null,
-          farmerName: null,
-          status: null,
-          id:null,
-      };
+        pageSize: 10,
+        // 查询排序
+        //orderByColumn: "id",
+        //isAsc: "desc",
+        countName: null,
+        townName: null,
+        villageName: null,
+        cooperativeName: null,
+        farmerName: null,
+        status: null,
+        id: null,
+      }
       this.xcdcform={
           countName: null,
           townName: null,
@@ -778,6 +793,20 @@ export default {
     },
     onClickRight() {
       this.show = true
+      this.queryform = {
+        pageNum: 1,
+        pageSize: 10,
+        // 查询排序
+        //orderByColumn: "id",
+        //isAsc: "desc",
+        countName: null,
+        townName: null,
+        villageName: null,
+        cooperativeName: null,
+        farmerName: null,
+        status: null,
+        id: null,
+      }
     },
     onSearch() {
 
@@ -824,7 +853,6 @@ export default {
     /** 判断是否有证书 */
     haveCertificate(id){
       if(id == "1"){
-        console.log(this.xcdcform.item1);
         if(this.xcdcform.item1=='N'){
           this.xcdcform.item2 = 'N'
           this.xcdcform.item3 = 'N'
@@ -841,7 +869,6 @@ export default {
           this.xcdcform.item9 = null
         }
       }if(id == "2") {
-        console.log(this.xcdcform.item10);
         if(this.xcdcform.item10=='N'){
           this.xcdcform.item11 = 'N'
           this.xcdcform.item12 = 'N'
@@ -898,6 +925,8 @@ export default {
             this.xcdcform["farmerName"] = data.farmerName
             this.xcdcform["samplingId"] = data.id
             this.xcdcform["fileName"] = data.townName+data.villageName
+            this.xcdcform["checkedBy"] = this.nickName
+            this.xcdcform["fileTime"] = getNowFormatDate()
           }
         })
 
@@ -922,15 +951,16 @@ export default {
             this.dhdcform["farmerName"] = data.farmerName
             this.dhdcform["samplingId"] = data.id
             this.dhdcform["fileName"] = data.townName+data.villageName
+            this.dhdcform["checkedBy"] = this.nickName
+            this.dhdcform["fileTime"] = getNowFormatDate()
           }
         })
       }
     },
     onSubmit(values) {
-      this.queryParams = values
-      this.queryParams["createBy"] = this.userId
-      this.queryParams["createTime"] = "2020-01-01 00:00:00"
-      addSampling(values).then(res => {
+      this.queryform["createBy"] = this.userId
+      this.queryform["createTime"] = getNowFormatDate()
+      addSampling(this.queryform).then(res => {
         console.log(res)
         this.show = false
         this.getList();
@@ -938,9 +968,9 @@ export default {
     },
     onSubmitXCDC(values) {
       this.xcdcform["createBy"] = this.userId
-      this.xcdcform["createTime"] = "2020-01-01 00:00:00"
+      this.xcdcform["createTime"] = getNowFormatDate()
       this.xcdcform["updateBy"] = this.userId
-      this.xcdcform["updateTime"] = "2020-01-01 00:00:00"
+      this.xcdcform["updateTime"] = getNowFormatDate()
       let i = 0
       if(this.xcdcform.item1=='N'){
         i++
@@ -978,7 +1008,6 @@ export default {
       this.xcdcform["lackCount"] = i
       if(this.xcdcform.id){
         updateInvestigate(this.xcdcform).then(res => {
-          console.log(res)
           this.showXCDC = false
           let _this = this
           this.xcdcform.status = "2"
@@ -1017,9 +1046,9 @@ export default {
       }},
     onSubmitDHDC(values) {
       this.dhdcform["createBy"] = this.userId
-      this.dhdcform["createTime"] = "2020-01-01 00:00:00"
+      this.dhdcform["createTime"] = getNowFormatDate()
       this.dhdcform["updateBy"] = this.userId
-      this.dhdcform["updateTime"] = "2020-01-01 00:00:00"
+      this.dhdcform["updateTime"] = getNowFormatDate()
       console.log(this.dhdcform)
       if(this.dhdcform.id){
         updateInvestigate(this.dhdcform).then(res => {

启动.bat

@@ -0,0 +1,18 @@
+@echo off
+
+D:
+cd D:\workspace\code\nsgk_mobile
+
+
+::安装依赖
+:: npm install
+
+::强烈建议不要用直接使用 cnpm 安装，会有各种诡异的 bug，可以通过重新指定 registry 来解决 npm 安装速度慢的问题。
+:: npm install --registry=https://registry.npm.taobao.org
+
+::本地开发 启动项目
+npm run dev
+
+
+@echo SUCCESS
+pause

安装.bat

@@ -0,0 +1,18 @@
+@echo off
+
+D:
+cd D:\workspace\code\nsgk_mobile
+
+
+::安装依赖
+npm install
+
+::强烈建议不要用直接使用 cnpm 安装，会有各种诡异的 bug，可以通过重新指定 registry 来解决 npm 安装速度慢的问题。
+npm install --registry=https://registry.npm.taobao.org
+
+::本地开发 启动项目
+:: npm run dev
+
+
+@echo SUCCESS
+pause

打包.bat

@@ -0,0 +1,14 @@
+@echo off
+
+D:
+cd D:\workspace\code\nsgk_mobile
+
+
+
+
+:: 打包预发布环境
+npm run build
+
+
+@echo SUCCESS
+pause