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

src/api/onlineHome/homestead/paidExit.js

@@ -44,9 +44,15 @@ export function zyyctcEdit(data){
 }
 
 //宅基地流转提交
-export function zyyctcApply(id){
+/*export function zyyctcApply(id){
   return request({
     url:'/house/zyyctc/submitApply/'+id,
     method:'post',
   })
+}*/
+export function zyyctcApply(id){
+  return request({
+    url:'/house/zyyctc/paidExitSubmitApply/'+id,
+    method:'post',
+  })
 }

src/views/onlineHome/done.vue

@@ -43,8 +43,9 @@
             <van-col span="6" :offset="1">
               <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p>
             </van-col>
-            <van-col span="10" :offset="1">
-              <p style="color: #878787">{{item.formData.activityBusinessType}}</p>
+            <van-col span="8" :offset="2">
+<!--              <p style="color: #878787">{{item.formData.activityBusinessType}}</p>-->
+              <p style="color: #878787">{{item.taskName}}</p>
             </van-col>
             <van-col span="5" :offset="1">
               <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
@@ -206,6 +207,9 @@
             case 'house_utilize_signout':
               this.$router.push({name:'paidExitDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
               break;
+            case 'houseStandardZyyctcsq':
+              this.$router.push({name:'paidExitDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+              break;
             case 'house_circulation':
               this.$router.push({name:'circulationDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
               break;

src/views/onlineHome/homestead/paidExit/paidExitAdd.vue

@@ -75,7 +75,7 @@
           />
         </van-popup>
 
-        <van-field
+        <!--<van-field
           readonly
           clickable
           v-model="tclx"
@@ -93,7 +93,16 @@
             @confirm="onConfirmTclx"
             @cancel="showtclx = false"
           />
-        </van-popup>
+        </van-popup>-->
+
+        <van-field
+          readonly
+          v-model="tclx"
+          label="退出类型"
+          input-align="right"
+          label-width="auto"
+          required
+        />
 
         <van-field
           readonly
@@ -114,7 +123,7 @@
             @cancel="showtcfs = false"
           />
         </van-popup>
-        <van-field v-model="circulation.tcmj" label="退出面积" placeholder="请输入退出面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+        <van-field v-model="circulation.tcmj" label="退出面积(㎡)" placeholder="请输入退出面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
         <van-field v-model="circulation.tcnx" label="退出年限" placeholder="请输入退出年限" input-align="right" label-width="auto" type="number"/>
       </div>
 
@@ -139,8 +148,8 @@
             @cancel="showbcfs = false"
           />
         </van-popup>
-        <van-field v-model="circulation.bcje" label="补偿金额" placeholder="请输入补偿金额 元" input-align="right" label-width="auto" type="number"/>
-        <van-field v-model="circulation.zhfwmj" label="置换房屋面积" placeholder="请输入房屋面积㎡" input-align="right" label-width="auto" type="number"/>
+        <van-field v-model="circulation.bcje" label="补偿金额(元)" placeholder="请输入补偿金额 元" input-align="right" label-width="auto" type="number"/>
+        <van-field v-model="circulation.zhfwmj" label="置换房屋面积(㎡)" placeholder="请输入房屋面积㎡" input-align="right" label-width="auto" type="number"/>
         <van-field v-model="circulation.zhfwzl" label="置换房屋坐落" placeholder="请输入房屋坐落" input-align="right" label-width="auto"/>
         <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
 
@@ -177,7 +186,7 @@ export default {
       zjdDictionaries:[],//宅基地代码
 
       tcqllx:'',
-      tclx:'',
+      tclx:'有偿退出',
       tcfs:'',
       zjlx:'',
       bcfs:'',
@@ -190,7 +199,12 @@ export default {
       showbcfs: false,
       showzjddm: false,
 
-      circulation:{}
+      circulation:{
+        // 申请类型  1-宅基地退出
+        sqlx: '1',
+        // 退出类型  01-有偿退出   02-无偿退出
+        tclx: '01',
+      }
     };
   },
   created() {
@@ -205,11 +219,11 @@ export default {
         }
       });
       //退出类型
-      this.houseGetDicts("tclx").then((res) => {
+      /*this.houseGetDicts("tclx").then((res) => {
         for(var i = 0 ; i < res.data.length ; i++){
           this.tclxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
         }
-      });
+      });*/
       //退出方式
       this.houseGetDicts("tcfs").then((res) => {
         for(var i = 0 ; i < res.data.length ; i++){
@@ -266,11 +280,11 @@ export default {
       this.circulation.tcqllx = data.value;
       this.showtcqllx = false;
     },
-    onConfirmTclx(data){
+    /*onConfirmTclx(data){
       this.tclx = data.text;
       this.circulation.tclx = data.value;
       this.showtclx = false;
-    },
+    },*/
     onConfirmTcfs(data){
       this.tcfs = data.text;
       this.circulation.tcfs = data.value;
@@ -284,6 +298,8 @@ export default {
     goSubmit(submit){
       console.log(this.circulation);
       this.$refs._Form.validate().then(() => {
+        // 设置初始状态为草稿，0 代表草稿
+        this.$set(this.circulation, "auditStatus", '0');
       dyAdd(this.circulation).then(response => {
         if(response.code = 200){
           if(submit)

src/views/onlineHome/homestead/paidExit/paidExitDetail.vue

@@ -50,7 +50,7 @@
           input-align="right"
           label-width="auto"
         />
-        <van-field readonly v-model="circulation.tcmj+'㎡'" label="退出面积" input-align="right" label-width="auto"/>
+        <van-field readonly v-model="circulation.tcmj" label="退出面积(㎡)" input-align="right" label-width="auto"/>
         <van-field readonly v-model="circulation.tcnx" label="退出年限" input-align="right" label-width="auto"/>
       </div>
 
@@ -63,8 +63,8 @@
           label-width="auto"
           input-align="right"
         />
-        <van-field readonly v-model="circulation.bcje+'元'" label="补偿金额" input-align="right" label-width="auto"/>
-        <van-field readonly v-model="circulation.zhfwmj+'㎡'" label="置换房屋面积" input-align="right" label-width="auto"/>
+        <van-field readonly v-model="circulation.bcje" label="补偿金额(元)" input-align="right" label-width="auto"/>
+        <van-field readonly v-model="circulation.zhfwmj" label="置换房屋面积(㎡)" input-align="right" label-width="auto"/>
         <van-field readonly v-model="circulation.zhfwzl" label="置换房屋坐落" input-align="right" label-width="auto"/>
         <van-field readonly v-model="circulation.bz" label="备注" input-align="right" label-width="auto"/>
       </div>

src/views/onlineHome/homestead/paidExit/paidExitList.vue

@@ -35,7 +35,7 @@
                 <van-button square text="修改" v-if="item.auditStatus=='草稿'" :to="{name:'paidExitModify', query: {id:item.id}}" type="info" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button square text="提交" type="primary" v-if="item.auditStatus=='草稿' || item.auditStatus=='2'" class="delete-button" @click="goSubmit(item)" />
+                <van-button square text="提交" type="primary" v-if="item.auditStatus=='草稿'" class="delete-button" @click="goSubmit(item)" />
               </van-col>
               <van-col>
                 <van-button square text="删除" v-if="item.auditStatus=='草稿'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
@@ -65,7 +65,11 @@ export default {
         pageNum:1,
         pageSize:10,
         orderByColumn:'createTime',
-        isAsc:'desc'
+        isAsc:'desc',
+        // 申请类型  1-宅基地退出
+        sqlx: '1',
+        // 退出类型  01-有偿退出   02-无偿退出
+        tclx: '01',
       }
     };
   },
@@ -79,8 +83,17 @@ export default {
     this.houseGetDicts("tcfs").then((res) => {
       this.tcfsStatus = res.data;
     });
-    this.houseGetDicts("audit_status").then((res) => {
-      this.auditStatus = res.data;
+    this.houseGetDicts("yctcsp_status").then((res) => {
+      // this.auditStatus = res.data;
+      let _this = this;
+      res.data.forEach((item) => {
+        if (item.dictValue < 5) {
+          _this.auditStatus.push(item);
+        } else if (item.dictValue == 5) {
+          item.dictLabel = "审核通过";
+          _this.auditStatus.push(item);
+        }
+      });
     });
   },
   methods: {
@@ -110,7 +123,7 @@ export default {
     },
     deleteList(id,index){
       this.$dialog.confirm({
-        message: '您确认删除申请草稿？',
+        message: '您确认删除此申请草稿？',
       })
       .then(() => {
         // on confirm
@@ -155,6 +168,9 @@ export default {
     flex: 0.3;
     color: #1D6FE9;
     font-weight: bold;
+    text-align: center;
+    position: relative;
+    left: 20px;
   }
   /deep/.van-swipe-cell{
     margin-bottom: 0.2rem;

src/views/onlineHome/homestead/paidExit/paidExitModify.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 ref="_Form">
@@ -75,7 +75,7 @@
         />
       </van-popup>
 
-      <van-field
+      <!--<van-field
         readonly
         clickable
         v-model="tclx"
@@ -93,7 +93,16 @@
           @confirm="onConfirmTclx"
           @cancel="showtclx = false"
         />
-      </van-popup>
+      </van-popup>-->
+      <van-field
+        readonly
+        v-model="tclx"
+        label="退出类型"
+        input-align="right"
+        label-width="auto"
+        required
+      />
+
 
       <van-field
         readonly
@@ -114,7 +123,7 @@
           @cancel="showtcfs = false"
         />
       </van-popup>
-      <van-field v-model="circulation.tcmj" label="退出面积" placeholder="请输入退出面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <van-field v-model="circulation.tcmj" label="退出面积(㎡)" placeholder="请输入退出面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
       <van-field v-model="circulation.tcnx" label="退出年限" placeholder="请输入退出年限" input-align="right" label-width="auto" type="number"/>
     </div>
 
@@ -139,8 +148,8 @@
           @cancel="showbcfs = false"
         />
       </van-popup>
-      <van-field v-model="circulation.bcje" label="补偿金额" placeholder="请输入补偿金额 元" input-align="right" label-width="auto" type="number"/>
-      <van-field v-model="circulation.zhfwmj" label="置换房屋面积" placeholder="请输入房屋面积㎡" input-align="right" label-width="auto" type="number"/>
+      <van-field v-model="circulation.bcje" label="补偿金额(元)" placeholder="请输入补偿金额 元" input-align="right" label-width="auto" type="number"/>
+      <van-field v-model="circulation.zhfwmj" label="置换房屋面积(㎡)" placeholder="请输入房屋面积㎡" input-align="right" label-width="auto" type="number"/>
       <van-field v-model="circulation.zhfwzl" label="置换房屋坐落" placeholder="请输入房屋坐落" input-align="right" label-width="auto"/>
       <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
 
@@ -208,9 +217,9 @@
           });
           //退出类型
           this.houseGetDicts("tclx").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
+            /*for (var i = 0; i < res.data.length; i++) {
               this.tclxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
+            }*/
             this.tclx = this.selectDictLabel(res.data, response.data.tclx);
           });
           //退出方式
@@ -272,11 +281,11 @@
         this.circulation.tcqllx = data.value;
         this.showtcqllx = false;
       },
-      onConfirmTclx(data){
+      /*onConfirmTclx(data){
         this.tclx = data.text;
         this.circulation.tclx = data.value;
         this.showtclx = false;
-      },
+      },*/
       onConfirmTcfs(data){
         this.tcfs = data.text;
         this.circulation.tcfs = data.value;
@@ -302,14 +311,16 @@
       },
       goSubmit(){
         this.$refs._Form.validate().then(() => {
-        zyyctcApply(this.$route.query.id).then(response => {
-          if(response.code = 200){
-            this.$toast.success('提交成功');
-            setTimeout(function(){
-              window.location.replace("paidExit")
-            },1000)
-          }
-        })
+          zyyctcEdit(this.circulation).then(response => {
+            zyyctcApply(this.$route.query.id).then(response => {
+              if(response.code = 200){
+                this.$toast.success('提交成功');
+                setTimeout(function(){
+                  window.location.replace("paidExit")
+                },1000)
+              }
+            });
+          });
         }).catch((e) => {
           Notify({ type: 'danger', message: '请填写完整的表单项' });
         });