From 353842bb8ff5723be05bdfac29bbc047fb5cd7f6 Mon Sep 17 00:00:00 2001
From: zhaochengke <beyondk2000@163.com>
Date: Thu, 9 Jun 2022 10:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=A7=E6=B3=95?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/onlineHome/homestead/supervision.js   |   7 ++
 .../homestead/reporting/taskCloseCaseAdd.vue  |  56 +++++++--
 .../homestead/reporting/taskDetailedList.vue  |   3 +-
 .../homestead/reporting/taskReportingList.vue | 107 +++++++++++++-----
 .../homestead/supervision/supervisionAdd.vue  |  22 ++--
 .../onlineHome/homestead/task/taskRelease.vue |   6 +
 6 files changed, 150 insertions(+), 51 deletions(-)

diff --git a/src/api/onlineHome/homestead/supervision.js b/src/api/onlineHome/homestead/supervision.js
index 7361f358..ffa4af7a 100644
--- a/src/api/onlineHome/homestead/supervision.js
+++ b/src/api/onlineHome/homestead/supervision.js
@@ -52,4 +52,11 @@ export function removeList(id){
   })
 }
 
+export function getTaskListByDeptId(data){
+  return request({
+    url:'/house/mobile/zjdjg/taskListByDeptId',
+    method:'get',
+    params:data
+  })
+}
 
diff --git a/src/views/onlineHome/homestead/reporting/taskCloseCaseAdd.vue b/src/views/onlineHome/homestead/reporting/taskCloseCaseAdd.vue
index 2039c7b5..8f20c18e 100644
--- a/src/views/onlineHome/homestead/reporting/taskCloseCaseAdd.vue
+++ b/src/views/onlineHome/homestead/reporting/taskCloseCaseAdd.vue
@@ -21,7 +21,7 @@
           @click="showSys = true"
           input-align="right"
           right-icon="arrow-down"
-          label-width="auto"
+          label-width="auto" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showSys" position="bottom">
           <van-picker
@@ -31,7 +31,20 @@
             @cancel="showSys = false"
           />
         </van-popup>
-        <van-field label="宅基地代码" v-model="jgList.zjddm" placeholder="请输入宅基地代码" input-align="right" />
+        <field-select
+          v-model="jgList.zjddm"
+          label="宅基地代码"
+          value-key="zjddm"
+          data-key="zjddm"
+          placeholder="请选择宅基地代码"
+          :rules="[{ required: true }]"
+          required
+          :readonly="!allowCUD"
+          :columns="zjdDictionaries"
+          @change="onZjddmChanged"
+        />
+        <van-field label="户主姓名" v-model="jgList.syrxm" placeholder="请填写户主姓名" input-align="right" label-width="auto" readonly :rules="[{ required: true }]" required/>
+<!--        <van-field label="宅基地代码" v-model="jgList.zjddm" placeholder="请输入宅基地代码" input-align="right"  :rules="[{ required: true }]" required/>-->
 <!--        <van-popup v-model="showZjd" position="bottom">-->
 <!--          <van-picker-->
 <!--            show-toolbar-->
@@ -46,7 +59,7 @@
           v-model="jglx"
           @click="showjglx = true"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showjglx" position="bottom">
           <van-picker
@@ -109,7 +122,7 @@
           v-model="wfydlx"
           @click="showwfydlx = true"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showwfydlx" position="bottom">
           <van-picker
@@ -119,10 +132,10 @@
             @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 v-model="jgList.wfydmj" label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]" required/>
+        <van-field v-model="jgList.fmkje" label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]" required/>
+        <van-field v-model="jgList.msmj" label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]" required/>
+        <van-field v-model="jgList.ccmj" label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]" required/>
       </div>
       </van-form>
       <div style="padding: 16px 0;" v-if="allowCUD">
@@ -141,8 +154,13 @@
 
 <script>
 import { jgAdd } from "@/api/onlineHome/homestead/reporting";
+import {Notify} from "vant";
+import { zjdzd , getByZjddm } from "@/api/onlineHome/homestead/circulation";
+import FieldSelect from "@/components/form/FieldSelect";
 export default {
   name: "taskCloseCaseAdd",
+  components: {
+    FieldSelect},
   data() {
     return {
       showSys:false,
@@ -163,7 +181,7 @@ export default {
       wfydlxDictionaries:[],
       jglxDictionaries:[],
       sysDictionaries:[],
-
+      zjdDictionaries: [],
     };
   },
   created() {
@@ -195,7 +213,12 @@ export default {
           this.sysDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
         }
       });
-
+      //宅基地代码
+      zjdzd().then(zjdRes => {
+        this.zjdDictionaries = zjdRes.rows;
+        if(this.zjdDictionaries.length > 0)
+          this.jgList.zjddm = this.zjdDictionaries[0].zjddm;
+      });
     },
     onConfirmSys(data){
       this.sfzjjzw = data.text;
@@ -222,6 +245,7 @@ export default {
     },
     goAdd(){
       console.log(this.jgList)
+      this.$refs._Form.validate().then(() => {
       jgAdd(this.jgList).then(response => {
         console.log(response);
         this.$toast.success('保存成功');
@@ -229,9 +253,21 @@ export default {
           history.go(-1)
         },2000)
       });
+      }).catch((e) => {
+        Notify({ type: 'danger', message: '请填写完整的表单项' });
+      });
     },
     goBack(){
       window.history.go(-1)
+    },
+    onZjddmChanged(data) {
+      let zjddm = data.zjddm;
+      getByZjddm({zjddm: zjddm,}).then(qlrRes => {
+        let data = qlrRes.data;
+        console.log(data)
+        this.jgList.syrxm = data.shyqrdbxm;
+        this.$forceUpdate();
+      });
     }
   },
 }
diff --git a/src/views/onlineHome/homestead/reporting/taskDetailedList.vue b/src/views/onlineHome/homestead/reporting/taskDetailedList.vue
index d504004e..3e31127c 100644
--- a/src/views/onlineHome/homestead/reporting/taskDetailedList.vue
+++ b/src/views/onlineHome/homestead/reporting/taskDetailedList.vue
@@ -36,6 +36,7 @@
 
 <script>
 import { getTaskList } from "@/api/onlineHome/homestead/reporting";
+import { listByTaskId } from "@/api/onlineHome/homestead/task";
 export default {
   name: "taskDetailedList",
   data() {
@@ -69,7 +70,7 @@ export default {
   methods: {
     getList(){
       setTimeout(() => {
-        getTaskList(this.queryParams).then(response => {
+        listByTaskId(this.queryParams).then(response => {
           for (var i = 0; i < response.rows.length; i++) {
             response.rows[i].jglx = this.selectDictLabel(this.jglxStatus, response.rows[i].jglx)
             response.rows[i].wfydlx = this.selectDictLabel(this.wfydlxStatus, response.rows[i].wfydlx)
diff --git a/src/views/onlineHome/homestead/reporting/taskReportingList.vue b/src/views/onlineHome/homestead/reporting/taskReportingList.vue
index 054639a4..096aa6aa 100644
--- a/src/views/onlineHome/homestead/reporting/taskReportingList.vue
+++ b/src/views/onlineHome/homestead/reporting/taskReportingList.vue
@@ -10,14 +10,20 @@
           <p style="font-weight: bold;">任务上报</p>
         </template>
       </van-nav-bar>
+      <van-tabs v-model="active" @change="onStatusChanged">
+        <van-tab title="全部" name=""></van-tab>
+        <van-tab title="已上报" name="1"></van-tab>
+        <van-tab title="未上报" name="2"></van-tab>
+      </van-tabs>
+      <van-pull-refresh v-model="refreshing" @refresh="getList()">
       <van-list
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
         @load="getList"
       >
-        <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :value="item.taskSubjectStatus" center>
+        <van-swipe-cell v-for="(item,index) in list" :key="index">
+          <van-cell :value="formatDict(options.task_status, item.taskStatus)" center>
             <template #title>
               <p class="van-ellipsis">{{item.title}}</p>
             </template>
@@ -42,33 +48,40 @@
           </template>
         </van-swipe-cell>
       </van-list>
+      </van-pull-refresh>
     </div>
 </template>
 
 <script>
 import { getList } from "@/api/onlineHome/homestead/reporting";
+import { getTaskListByDeptId } from "@/api/onlineHome/homestead/supervision";
 export default {
   name: "paidExit",
   data() {
     return {
-      applicationList:[],
-      houseApplyStatus:[],
-      taskSubjectStatusStatus:[],
+      list:[],
+      refreshing: false,
       loading: false,
       finished: false,
+      total: 0,
       queryParams:{
         pageNum:1,
         pageSize:10,
-        orderByColumn:'createTime',
+        orderByColumn:'create_time',
         isAsc:'desc',
-        taskSubjectStatus:'2'
-      }
+        taskStatus: null,
+        taskSubjectStatus: '2'
+      },
+      active: '',
+      options: {
+        task_subject_status: [],
+        task_status: [],
+      },
     };
   },
   created() {
-    this.houseGetDicts("task_subject_status").then((res) => {
-      this.taskSubjectStatusStatus = res.data;
-    });
+    this.initOptions();
+    this.getList();
   },
   computed: {
     allowCUD: function () {
@@ -76,25 +89,61 @@ export default {
     },
   },
   methods: {
-    getList(){
-      setTimeout(() => {
-        getList(this.queryParams).then(response => {
-          for (var i = 0; i < response.rows.length; i++) {
-            response.rows[i].taskSubjectStatus = this.selectDictLabel(this.taskSubjectStatusStatus, response.rows[i].taskSubjectStatus)
-
-            response.rows[i].title=response.rows[i].title.replace(/<[^>]+>/g,"").replace(/&nbsp;/ig,"");//截取html标签
-
-            this.applicationList.push(response.rows[i]);
-          }
-          if(this.applicationList.length >= response.total){
-            this.finished = true;
-            return;
-          }else{
-            this.loading = false;
-            this.queryParams.pageNum += 1 ;
-          }
+    initOptions() {
+      for(let k in this.options)
+      {
+        this.houseGetDicts(k).then((res) => {
+          this.options[k] = res.data;
         });
-      }, 1000);
+      }
+    },
+    getList(target) {
+      let type = typeof (target);
+      console.log(type, target);
+      if (target === 0) {
+        this.refreshing = true;
+        this.finished = true;
+        this.total = 0;
+        this.queryParams.pageNum = 1;
+        this.list = [];
+        this.filterVisible = false;
+      }
+      else if (type === 'number')
+        this.queryParams.pageNum = target;
+      else if (type === 'string') {
+        this.queryParams.pageNum = eval(this.queryParams.pageNum + target)
+      }
+      else
+      {
+        this.refreshing = true;
+        this.finished = true;
+        this.total = 0;
+        this.queryParams.pageNum = 1;
+        this.list = []
+      }
+      getTaskListByDeptId(this.queryParams).then((response) => {
+        console.log(response)
+        if (response.rows.length === 0) {
+          this.finished = true;
+          return;
+        }
+        response.rows.forEach((e) => {
+          e.title = e.title.replace(/<[^>]+>/g,"").replace(/&nbsp;/ig,"");//截取html标签
+          this.list.push(e);
+        });
+        this.total += response.rows.length;
+        this.finished = this.total >= response.total;
+      }).finally(() => {
+        this.loading = false;
+        this.refreshing = false;
+      });
+    },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
+    onStatusChanged(name, title) {
+      this.queryParams.taskStatus = name;
+      this.getList();
     },
   },
 }
diff --git a/src/views/onlineHome/homestead/supervision/supervisionAdd.vue b/src/views/onlineHome/homestead/supervision/supervisionAdd.vue
index 900e2261..529dc3b5 100644
--- a/src/views/onlineHome/homestead/supervision/supervisionAdd.vue
+++ b/src/views/onlineHome/homestead/supervision/supervisionAdd.vue
@@ -13,6 +13,17 @@
     <van-form ref="_Form">
     <p class="main_title">基本信息</p>
     <div class="main_box">
+      <van-field
+        readonly
+        clickable
+        label="是否在建建筑物"
+        placeholder="请选择"
+        v-model="sfzjjzw"
+        @click="showSys = true"
+        input-align="right"
+        right-icon="arrow-down"
+        label-width="auto" :rules="[{ required: true }]" required
+      />
       <field-select
         v-model="jgList.zjddm"
         label="宅基地代码"
@@ -26,17 +37,6 @@
         @change="onZjddmChanged"
       />
       <van-field label="户主姓名" v-model="jgList.syrxm" placeholder="请填写户主姓名" input-align="right" label-width="auto" readonly :rules="[{ required: true }]" required/>
-      <van-field
-        readonly
-        clickable
-        label="是否在建建筑物"
-        placeholder="请选择"
-        v-model="sfzjjzw"
-        @click="showSys = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto" :rules="[{ required: true }]" required
-      />
       <van-popup v-model="showSys" position="bottom">
         <van-picker
           show-toolbar
diff --git a/src/views/onlineHome/homestead/task/taskRelease.vue b/src/views/onlineHome/homestead/task/taskRelease.vue
index 70d67afd..1020a089 100644
--- a/src/views/onlineHome/homestead/task/taskRelease.vue
+++ b/src/views/onlineHome/homestead/task/taskRelease.vue
@@ -35,6 +35,7 @@
 
 <script>
 import { getTree , distribute } from "@/api/onlineHome/homestead/task";
+import {Notify} from "vant";
 export default {
   name: "taskRelease",
   data() {
@@ -85,6 +86,11 @@ export default {
     },
     goAdd(){
       this.queryParams.list = this.$refs.tree.getCheckedKeys().join(',');
+      if(!this.queryParams.list)
+      {
+        Notify({ type: 'danger', message: '请选择发布目标' });
+        return;
+      }
       distribute(this.queryParams).then(response => {
         console.log(response);
         this.$toast.success('保存成功');