宅基地手机端优化

src/components/home/HomeApplyUploadComp.vue

@@ -63,7 +63,7 @@ export default {
     },
   },
   created() {
-    if (this.businessType !== null) {
+    if (this.businessType !== null && this.proposerId == -1) {
       this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full)
     }
   },

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -680,22 +680,22 @@
                       <house-location-plan-comp ref="pictureUploadApplying" :uploadDisabled="!formEnabled.baseApplyForm.townFormEnabled" :jsonData="uploadImg.fileList" :proposer-id="uploadImg.proposerId" tableName="t_homeapply_ydjfsp"
                                                 @uploadFileChanged="(x) => {this.uploadImg.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImg.removeFileList = x;}"
                       />
-<!--                      <van-row>-->
-<!--                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zjdzlpmwztztr" label="踏勘" placeholder="现场踏勘人员" input-align="left" label-width="auto"/></van-col>-->
-<!--                        <van-col span="12">-->
-<!--                          <field-date-picker-->
-<!--                            v-model="applicationDetail.ydjfsp.zjdzlpmwzxctksj"-->
-<!--                            label=""-->
-<!--                            placeholder="选择日期"-->
-<!--                            :rules="[{ required: true }]"-->
-<!--                            formatter="yyyy-MM-dd"-->
-<!--                            required-->
-<!--                            :readonly="!formEnabled.baseApplyForm.townFormEnabled"-->
-<!--                          />-->
-<!--                        </van-col>-->
-<!--                      </van-row>-->
                       <van-row>
-                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zjdzlpmwztztr" label="制图" placeholder="制图人" input-align="left" label-width="auto"/></van-col>
+                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zckcryxm" label="踏勘人" placeholder="现场踏勘人员" input-align="left" label-width="auto"/></van-col>
+                        <van-col span="12">
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfsp.zckcsj"
+                            label=""
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.baseApplyForm.townFormEnabled"
+                          />
+                        </van-col>
+                      </van-row>
+                      <van-row>
+                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zjdzlpmwztztr" label="制图人" placeholder="制图人" input-align="left" label-width="auto"/></van-col>
                         <van-col span="12">
                           <field-date-picker
                             v-model="applicationDetail.ydjfsp.zjdzlpmwzxctksj"
@@ -1666,11 +1666,11 @@
           <van-tabs type="card" style="padding-top: 1.35rem;" color="#1D6FE9" :lazy-render="false" v-model="attachmentActive" ref="attachmentDialog">
             <van-tab title="申请" key="0">
               <home-apply-upload-comp
-                :business-type="houseApplyUploadComp.businessType"
-                :house-apply-status="houseApplyUploadComp.homeApplyStatus"
-                :process-key="houseApplyUploadComp.processKey"
-                :proposer-id="houseApplyUploadComp.proposerId"
-                :table-name="houseApplyUploadComp.tableName"
+                :businessType="houseApplyUploadComp.businessType"
+                :houseApplyStatus="houseApplyUploadComp.homeApplyStatus"
+                :processKey="houseApplyUploadComp.processKey"
+                :proposerId="houseApplyUploadComp.proposerId"
+                :tableName="houseApplyUploadComp.tableName"
                 :readonly="houseApplyUploadComp.readonly"
                 :userName="sysFarmer.memberName"
                 :full="houseApplyUploadComp.full"
@@ -2277,15 +2277,15 @@ export default {
 
           this.formVisible.acceptingVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74","77", "79", "7C", "7F"]);
           this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74","77", "79", "7C", "7F"]);
-          this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(homeApplyStatus, [this.isInRoles(role, 'town_leader') ? '7C' : -99, "26"]);
-          this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(homeApplyStatus, [this.isInRoles(role, ['town_leader', 'agriculture']) ? '79' : -99, this.isInRoles(role, ['town_leader', 'agriculture']) ? '25' : -99, "26"]);
-          this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(homeApplyStatus, [this.isInRoles(role, ['town_leader', 'nature_resource']) ? '79' : -99, this.isInRoles(role, ['town_leader', 'nature_resource']) ? '25' : -99, "26"]);
+          this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(homeApplyStatus, [ "7C", "7F"]);;
+          this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(homeApplyStatus, [ "79", "7C", "7F"]);
+          this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(homeApplyStatus, [ "79", "7C", "7F"]);
           if(this.type =='done') {
             this.formVisible.editVisible = false;
           }
           this.houseApplyUploadComp.full = true;
           this.houseApplyUploadComp.readonly = true;
-          this.houseApplyUploadComp.proposerId = proposerId;
+          this.$set(this.houseApplyUploadComp, "proposerId", proposerId);
           this.houseApplyUploadComp.homeApplyStatus = homeApplyStatus;
           this.houseApplyUploadCompStart.full = true;
           this.houseApplyUploadCompStart.readonly = true;
@@ -2295,7 +2295,7 @@ export default {
           this.houseApplyUploadCompEnd.readonly = true;
           this.houseApplyUploadCompEnd.proposerId = proposerId;
           this.houseApplyUploadCompEnd.houseApplyStatus = homeApplyStatus;
-
+          console.info( this.houseApplyUploadComp);
           // // 初始化自然资源审批现场图
           // this.uploadImgNature.fileList = value.tHouseApproveNatureOptions ? value.tHouseApproveNatureOptions.naturePlan : '';
           // this.uploadImgNature.proposerId = value.tHouseApplyProposer.id;
@@ -2321,8 +2321,8 @@ export default {
           // this.uploadImgEndZhenPlan.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.zhenPlan : '';
           // this.uploadImgEndZhenPlan.proposerId = value.tHouseApplyProposer.id;
           // 初始化申请平面图
-          // this.uploadImg.fileList = value.tHouseApproveLocationplanOptions ? value.tHouseApproveLocationplanOptions.locationPlan : '';
-          // this.uploadImg.proposerId = value.tHouseApplyProposer.id;
+          this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : '';
+          this.uploadImg.proposerId = this.applicationDetail.id;
           // // 初始化验收平面图
           // this.uploadImgAccepting.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.locationPlan : '';
           // this.uploadImgAccepting.proposerId = value.tHouseApplyProposer.id;
@@ -2711,6 +2711,8 @@ export default {
               // this.applicationDetail.tHouseApproveTownOptions.approveOption = null;
               // this.applicationDetail.tHouseApproveTownOptions.approveLeader = null;
               this.applicationDetail.ydjfsp.xzzfshpzsj = handlerTime;
+              this.applicationDetail.ydjfsp.zjdzlpmwzxctksj = handlerTime;
+              this.applicationDetail.ydjfsp.zckcsj = handlerTime;
             }
           }
 
@@ -2720,11 +2722,11 @@ export default {
           //this.formVisible.baseApplyForm.townFormVisible = this.landscopeVisible
           this.formVisible.acceptingVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74","77", "79", "7C", "7F"]);
           this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74", "77","79", "7C", "7F"]);
-          selectProposerNh({hzzjhm:this.applicationDetail.sqhhzsfzh,deptId:value.deptId}).then(res => {
-            if(res.rows.length > 0){
-              this.getMemberCurrentSituation(res.rows[0].id);
-            }
-        });
+        //   selectProposerNh({hzzjhm:this.applicationDetail.sqhhzsfzh,deptId:value.deptId}).then(res => {
+        //     if(res.rows.length > 0){
+        //       this.getMemberCurrentSituation(res.rows[0].id);
+        //     }
+        // });
 
           (this.isProposeStatus(homeApplyStatus, ["79", "7C","7F"]))
           {
@@ -2867,7 +2869,7 @@ export default {
           this.uploadImgEndZhenPlan.proposerId = value.id;
           // 初始化申请平面图
           this.applicationDetail.tHouseApproveLocationplanOptions = value.tHouseApproveLocationplanOptions;
-          this.uploadImg.fileList = value.tHouseApproveLocationplanOptions ? value.tHouseApproveLocationplanOptions.locationPlan : '';
+          this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : '';
           this.uploadImg.proposerId = this.applicationDetail.id;
 
           this.uploadImgAccepting.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.locationPlan : '';
@@ -3186,8 +3188,8 @@ export default {
           this.$set(this.applicationDetail, 'nsqzjddldm',  "10");
           this.$set(this.applicationDetail, 'sfzqxlqlryj',  "1");
           this.$set(this.applicationDetail, 'xzjdczqk',  "1");
-          this.$set(this.applicationDetail, 'suyqrdm',  this.sysFarmer.suyqrdm);
-          this.$set(this.applicationDetail, 'deptName',  this.sysFarmer.deptName);
+          this.$set(this.applicationDetail, 'suyqrdm',  val.suyqrdm);
+          this.$set(this.applicationDetail, 'deptName',  val.deptName);
           this.$set(this.applicationDetail, 'createBy',  this.sysFarmer.memberName);
           if(!this.applicationDetail.sfyyzjd)
             this.applicationDetail.sfyyzjd = 'N';
@@ -3919,7 +3921,7 @@ export default {
     },
     // 带平面图附件上传的镇级申请审批
     submitHouseApproveLocationplanOptions(pass, commentText) {
-      this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan = null;
+      this.applicationDetail.ydjfsp.zjdzlpmwzt = null;
      return this.$refs.pictureUploadApplying.updatePlanFiles().then((x) => {
           let list = [];
           x.data.forEach((f) => {
@@ -3933,7 +3935,7 @@ export default {
             };
             list.push(item);
           });
-          this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan = JSON.stringify(list);
+          this.applicationDetail.ydjfsp.zjdzlpmwzt = JSON.stringify(list);
         }).catch((x) => {
         this.notify("上传宅基地坐落平面位置图失败!", 'danger');
       });

src/views/yinnong/homestead/supervision/supervisionAdd.vue

@@ -39,54 +39,89 @@
       />
       <van-field v-model="jgList.shyqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
     </div>
-
-    <p class="main_title">违法信息</p>
-    <div class="main_box">
-      <van-field
-        readonly
-        clickable
-        label="违法用地类型"
-        placeholder="请选择"
-        v-model="wfydlx"
-        @click="showwfydlx = true"
-        input-align="right"
-        right-icon="arrow-down"
-      />
-      <van-popup v-model="showwfydlx" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="wfydlxDictionaries"
-          @confirm="onConfirmWfydlx"
-          @cancel="showwfydlx = false"
+    <p class="main_title">执法情况</p>
+    <field-select
+      v-model="jgList.jglx"
+      label="监管类型"
+      value-key="dictLabel"
+      data-key="dictValue"
+      placeholder="选择监管类型"
+      :rules="[{ required: true }]"
+      required
+      remote-url="/system/dict/data/type/jglx"
+      :on-remote-response="'data'"
+    />
+    <field-date-picker
+      v-model="jgList.lasj"
+      label="立案时间"
+      placeholder="选择立案时间"
+      :rules="[{ required: true }]"
+      formatter="yyyy-MM-dd"
+      required
+    />
+    <field-select
+      v-model="jgList.wfydlx"
+      label="违法用地类型"
+      value-key="dictLabel"
+      data-key="dictValue"
+      placeholder="选择违法用地类型"
+      :rules="[{ required: true }]"
+      required
+      remote-url="/system/dict/data/type/villations_type"
+      :on-remote-response="'data'"
+    />
+    <van-field required v-model="jgList.sjdz" label="事件地址" placeholder="事件地址" input-align="right" :rules="[{ required: true }]"/>
+    <van-dialog v-model="mapShow" show-cancel-button>
+      <MapGisObtainTc ref="zjdProductResh" :shqrxm="jgList.shyqrdbxm" :landStatus="landStatus" :deptId="deptId" @closeMoule="closeMoule"></MapGisObtainTc>
+    </van-dialog>
+    <van-field rows="3" :autosize="true" type="textarea" label="备注" label-width="auto"  placeholder="备注" v-model="jgList.bz" input-align="left"></van-field>
+    <div v-if="wfxxShow">
+      <p class="main_title">违法信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          label="违法用地类型"
+          placeholder="请选择"
+          v-model="wfydlx"
+          @click="showwfydlx = true"
+          input-align="right"
+          right-icon="arrow-down"
         />
-      </van-popup>
-      <van-field v-model="jgList.wfydmj" label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto"/>
-      <van-field v-model="jgList.fmkje" label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto"/>
-      <van-field v-model="jgList.msmj" label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto"/>
-      <van-field v-model="jgList.ccmj" label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto"/>
-      <van-field
-        readonly
-        clickable
-        label="整改截止时间"
-        placeholder="选择整改截止时间"
-        v-model="jgList.reformDeadline"
-        @click="showReformDeadline = true"
-        input-align="right"
-        right-icon="arrow-down"
-      />
-      <van-popup v-model="showReformDeadline" position="bottom">
-        <van-datetime-picker
-          v-model="currentDate"
-          type="date"
-          title="选择年月日"
-          :min-date="minDate"
-          :max-date="maxDate"
-          @confirm="onConfirmReformDeadline"
+        <van-popup v-model="showwfydlx" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="wfydlxDictionaries"
+            @confirm="onConfirmWfydlx"
+            @cancel="showwfydlx = false"
+          />
+        </van-popup>
+        <van-field v-model="jgList.wfydmj" label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto"/>
+        <van-field v-model="jgList.fmkje" label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto"/>
+        <van-field v-model="jgList.msmj" label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto"/>
+        <van-field v-model="jgList.ccmj" label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="整改截止时间"
+          placeholder="选择整改截止时间"
+          v-model="jgList.reformDeadline"
+          @click="showReformDeadline = true"
+          input-align="right"
+          right-icon="arrow-down"
         />
-      </van-popup>
-      <van-dialog v-model="mapShow" show-cancel-button>
-        <MapGisObtainTc ref="zjdProductResh" :shqrxm="jgList.shyqrdbxm" :landStatus="landStatus" :deptId="sysFarmer.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
-      </van-dialog>
+        <van-popup v-model="showReformDeadline" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmReformDeadline"
+          />
+        </van-popup>
+    </div>
+
     </div>
     <div style="padding: 16px 0;">
       <van-row>
@@ -106,10 +141,11 @@
   import { jgAdd,getShyqrs } from "@/api/onlineHome/homestead/reporting";
   import FieldSelect from "@/components/form/FieldSelect";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
-  import Cookies from "js-cookie";
+  import FieldDatePicker from "@/components/form/FieldDatePicker";
+  import {formatDate} from "element-ui/src/utils/date-util.js";
   export default {
     name: "supervisionAdd",
-    components: { MapGisObtainTc,FieldSelect },
+    components: { MapGisObtainTc,FieldSelect,FieldDatePicker },
     data() {
       return {
         showSys:false,
@@ -119,12 +155,13 @@
         showwfydlx:false,
         showReformDeadline:false,
         showDropList:false,
+        wfxxShow:false,
         mapShow:false,
         landStatus:"1",
         minDate: new Date(),
         maxDate: new Date(2025, 10, 1),
         currentDate: new Date(),
-        sysFarmer:JSON.parse(Cookies.get('user')),
+        deptId:this.$store.state.user.loginDeptId,
         jgList:{},
         getObligeeOptions:[],
         sfzjjzw:'',
@@ -172,7 +209,7 @@
                   sqrxm:item.shyqrdbxm,
                   sqrxb:item.xb,
                   sqrzjhm:item.shyqrdbzjhm,
-                  sqrnhdm:item.nhdm,
+                  shyqrdm:item.shyqrdm,
                   sqrzjlx:item.shyqrdbzjlx,
                   sqrdh:item.dh,
                   gyfs:item.gyfs,
@@ -206,17 +243,12 @@
         }
       },
       shyqrdmxmChange(val){
-        console.info(val);
-        this.$set(this.jgList, "sqrxm", val.sqrxm);
+        this.$set(this.jgList, "shyqrdbxm", val.sqrxm);
         this.$set(this.jgList, "deptId", val.deptId);
         this.$set(this.jgList, "deptName", val.deptId);
-        this.$set(this.jgList, "sqrzjhm", val.sqrzjhm);
-        this.$set(this.jgList, "sqrzjlx", val.sqrzjlx);
-        this.$set(this.jgList, "sqrnhdm", val.sqrnhdm);
-        this.$set(this.jgList, "gyqk", val.gyfs);
-        this.$set(this.jgList, "xb", val.sqrxb);
-        this.$set(this.jgList, "lxdh", val.sqrdh);
-        this.$set(this.jgList, "hkszd", val.dz);
+        this.$set(this.jgList, "shyqrzjhm", val.sqrzjhm);
+        this.$set(this.jgList, "shyqrzjlx", val.sqrzjlx);
+        this.$set(this.jgList, "shyqrdm", val.shyqrdm);
         this.getObligeeOptions=[];
         this.showDropList = false;
       },
@@ -229,6 +261,10 @@
         this.$set(this.jgList, "pzrq", handlerTime);
         this.$set(this.jgList, "barq", handlerTime);
       },
+      // 获取日期, yyyy-MM-dd
+      getDate(d) {
+        return formatDate(d ? d : new Date(), 'yyyy-MM-dd');
+      },
       mapLook(){
         this.mapShow = true;
         setTimeout(() => {

src/views/yinnong/homestead/supervision/supervisionList.vue

@@ -32,7 +32,7 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button v-if="item.status != '已结案' && item.status == '未立案'" color="#FFA63E" text="立案" square @click="onRegister(item.id)" type="info" class="delete-button" />
+                <van-button v-if="item.status != '已结案' && item.status == '未立案'" color="#FFA63E" text="立案" square @click="onRegister(item)" type="info" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button v-if="item.status != '已结案' && item.status == '已立案'" color="#7DDA4F" square text="结案" :to="{name:'supervisionCloseCase', query: {id:item.id}}" type="danger" class="delete-button" />
@@ -52,6 +52,7 @@
 
 <script>
 import { getList , removeList , registerOn } from "@/api/onlineHome/homestead/supervision";
+import { jgEdit } from "@/api/onlineHome/homestead/reporting";
 export default {
   name: "supervisionList",
   data() {
@@ -126,8 +127,9 @@ export default {
         // on cancel
       });
     },
-    onRegister(id){
-      registerOn(id).then(res => {
+    onRegister(data){
+      this.$set(data, "status", "1");
+      jgEdit(data).then(res => {
         if(res.code = 200){
           this.$toast.success('立案成功');
           setTimeout(function(){