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

src/router/index.js

@@ -1135,7 +1135,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList11',
   //   name: 'approvalList11',
   //   meta: {
-  //     title: '备服金支出列表',
+  //     title: '备付金支出列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList11'], resolve)
@@ -1207,7 +1207,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail11',
   //   name: 'approvalDetail11',
   //   meta: {
-  //     title: '银农备服金支出申请',
+  //     title: '银农备付金支出申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11'], resolve)
@@ -1279,7 +1279,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd11',
   //   name: 'approvalAdd11',
   //   meta: {
-  //     title: '添加备服金支出申请',
+  //     title: '添加备付金支出申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11'], resolve)
@@ -1387,7 +1387,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify11',
   //   name: 'approvalModify11',
   //   meta: {
-  //     title: '修改备服金支出申请',
+  //     title: '修改备付金支出申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11'], resolve)
@@ -1703,7 +1703,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList11',
     name: 'approvalList11',
     meta: {
-      title: '备服金支出列表',
+      title: '备付金支出列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList11'], resolve)
@@ -1775,7 +1775,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail11',
     name: 'approvalDetail11',
     meta: {
-      title: '银农备服金支出申请',
+      title: '银农备付金支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11'], resolve)
@@ -1847,7 +1847,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd11',
     name: 'approvalAdd11',
     meta: {
-      title: '添加备服金支出申请',
+      title: '添加备付金支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11'], resolve)
@@ -1955,7 +1955,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify11',
     name: 'approvalModify11',
     meta: {
-      title: '修改备服金支出申请',
+      title: '修改备付金支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify11'], resolve)

src/views/homesteadSurvey/add.vue

@@ -1432,7 +1432,8 @@
             v-model="nmfwform.zl"
             name="坐落"
             label="坐落"
-            placeholder="坐落"required
+            placeholder="坐落"
+            required
             :rules="[{ required: true, message: '坐落不能为空' }]"
           />
           <van-collapse v-model="activeFw">
@@ -1548,6 +1549,9 @@
                 v-model="nmfwform.fwlx"
                 style="display:none"
               />
+
+            </van-collapse-item>
+            <van-collapse-item title="利用状况" name="3">
               <van-field
                 autocomplete="off"
                 input-align="right"
@@ -1556,14 +1560,14 @@
                 label="房屋状态"
                 placeholder="房屋状态"
                 @click="shownmfwfwzt = true"
+                required
+                :rules="[{ required: true, message: '房屋状态不能为空' }]"
               />
               <van-field
                 autocomplete="off"
                 v-model="nmfwform.fwzt"
                 style="display:none"
               />
-            </van-collapse-item>
-            <van-collapse-item title="利用状况" name="3">
               <van-field
                 input-align="right"
                 v-model="nmfwform.fwytName"
@@ -1571,6 +1575,8 @@
                 label="房屋用途"
                 placeholder="房屋用途"
                 @click="showfwyt=true"
+                required
+                :rules="[{ required: true, message: '房屋用途不能为空' }]"
                 readonly
               />
               <van-field
@@ -1585,6 +1591,8 @@
                 name="利用状况"
                 label="利用状况"
                 placeholder="利用状况"
+                required
+                :rules="[{ required: true, message: '利用状况不能为空' }]"
                 readonly
                 @click="shownmfwlyzk=true"
               />

src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加备服金支出申请</p>
+        <p style="font-weight: bold;">添加备付金支出申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>

src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">备服金支出审批</p>
+        <p style="font-weight: bold;">备付金支出审批</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>

src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看备服金支出申请</p>
+        <p style="font-weight: bold;">查看备付金支出申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>

src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue

@@ -8,7 +8,7 @@
         @click-right="goAdd()"
       >
         <template #title>
-          <p style="font-weight: bold;">备服金支出申请列表</p>
+          <p style="font-weight: bold;">备付金支出申请列表</p>
         </template>
         <template #right>
           <van-icon name="add" size="18"/>

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改备服金支出申请</p>
+        <p style="font-weight: bold;">修改备付金支出申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>

src/views/yinnong/workbench.vue

@@ -84,11 +84,11 @@
 <!--            </div>-->
 <!--            <p style="margin-top: 5px;color: #666666;">现金提现</p>-->
 <!--          </van-grid-item>-->
-          <van-grid-item text="备服金支出" :to="{name:'approvalList11'}" >
+          <van-grid-item text="备付金支出" :to="{name:'approvalList11'}" >
             <div class="icon" slot="default" style="background:#7790FE;" >
               <img src="../../../static/images/onlineHome/icon_Y7.png" alt />
             </div>
-            <p style="margin-top: 5px;color: #666666;">备服金支出</p>
+            <p style="margin-top: 5px;color: #666666;">备付金支出</p>
           </van-grid-item>
           <van-grid-item text="汇票支出" :to="{name:'approvalList12'}" >
             <div class="icon" slot="default" style="background:#539ffd;" >