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

src/views/onlineHome/done.vue

@@ -11,7 +11,7 @@
       <van-tab title="已办" name="2">
       </van-tab>
     </van-tabs>
-    <van-cell-group v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell>
         <template #title>
           <van-row style="">
@@ -120,6 +120,17 @@
             })
           }
         },
+        goDetail(item){
+          console.log(item)
+          var type = item.formData.processKey;
+          switch (type) {
+            case 'baseApply':
+            case 'landscope':
+            case 'accepting':
+              this.$router.push({name:'approvalForm',query: {id:item.formData.id}})
+              break;
+          }
+        }
       },
     }
 </script>

src/views/onlineHome/homestead/homeApproval/approvalForm.vue

@@ -284,11 +284,7 @@
           <van-row type="flex" justify="space-between" align="center">
             <van-col span="5">自然<br/>资源<br/>部门<br/>意见</van-col>
             <van-col span="19">
-              <van-field v-model="value" label="用地面积" placeholder="请输入" input-align="right">
-                <template #right-icon>
-                  ㎡
-                </template>
-              </van-field>
+              <van-field v-model="value" label="用地面积" placeholder="请输入" input-align="right"><template #right-icon>㎡</template></van-field>
               <van-field v-model="value" label="土地权属" placeholder="请选择" readonly input-align="right" is-link arrow-direction="down"/>
               <van-field v-model="value" label="东至" placeholder="请输入" input-align="right"/>
               <van-field v-model="value" label="南至" placeholder="请输入" input-align="right"/>
@@ -305,30 +301,10 @@
             <van-col span="19">
               <van-field v-model="value" label="建筑类型" placeholder="请选择" readonly input-align="right" is-link arrow-direction="down"/>
               <van-field v-model="value" label="图纸类型" placeholder="请选择" readonly input-align="right" is-link arrow-direction="down"/>
-
-              <van-field v-model="value" label="建筑占地面积" placeholder="请输入" input-align="right">
-                <template #right-icon>
-                  ㎡
-                </template>
-              </van-field>
-
-              <van-field v-model="value" label="建筑面积" placeholder="请输入" input-align="right">
-                <template #right-icon>
-                  ㎡
-                </template>
-              </van-field>
-
-              <van-field v-model="value" label="建筑层数" placeholder="请输入" input-align="right">
-                <template #right-icon>
-                  层
-                </template>
-              </van-field>
-
-              <van-field v-model="value" label="建筑高度" placeholder="请输入" input-align="right">
-                <template #right-icon>
-                  m
-                </template>
-              </van-field>
+              <van-field v-model="value" label="建筑占地面积" placeholder="请输入" input-align="right"><template #right-icon>㎡</template></van-field>
+              <van-field v-model="value" label="建筑面积" placeholder="请输入" input-align="right"><template #right-icon>㎡</template></van-field>
+              <van-field v-model="value" label="建筑层数" placeholder="请输入" input-align="right"><template #right-icon>层</template></van-field>
+              <van-field v-model="value" label="建筑高度" placeholder="请输入" input-align="right"><template #right-icon>m</template></van-field>
               <van-field v-model="value" label="东至" placeholder="请输入" input-align="right"/>
               <van-field v-model="value" label="南至" placeholder="请输入" input-align="right"/>
               <van-field v-model="value" label="西至" placeholder="请输入" input-align="right"/>