关联任务

src/api/onlineHome/homestead/reporting.js

@@ -100,3 +100,12 @@ export function getJg(id){
     method:'get'
   })
 }
+
+// 查询任务上报列表
+export function listHomeuseshangbao(query) {
+  return request({
+    url: '/home/homeuseshangbao/list',
+    method: 'get',
+    params: query
+  })
+}

src/components/form/FieldCascader.vue

@@ -54,6 +54,7 @@ export default {
     'parentName', // 父的值键名 String 如果不为空 则自动转数组为树树结构数组 String
     'showTextAndValue', // 是否显示值和键 Bool|String 字符串为分隔符, true为空字符串
     'showHasChildren', // 是否显示存在子级的标识 Bool|String 字符串为标识符, true为` >`
+    'clearable', // 点击取消时清空绑定值
   ],
   watch: {
     value: function (newVal, oldVal) {
@@ -121,6 +122,12 @@ export default {
     onCancel() {
       this.closePopup();
       this.$emit('cancel');
+      if(this.clearable)
+      {
+        this.visibleValue = '';
+        this.internalValue = null;
+        this.$emit('input', this.internalValue);
+      }
     },
     getValue(data) {
       return typeof(data) === 'object' && this.valueName ? data[this.valueName] : data;

src/components/form/FieldDatePicker.vue

@@ -44,6 +44,7 @@ export default {
     'name', 'readonly', 'value', 'label', 'placeholder', 'required', 'rules', 'labelWidth',
     'type', // 类型, 仅支持 datetime date time year-month month-day datehour
     'formatter', // value的格式化 String|Function|undefined 字符串为格式字符串, 函数则必须有返回 undefined则不转换
+    'clearable', // 点击取消时清空绑定值
   ],
   watch: {
     value: function (newVal, oldVal) {
@@ -108,6 +109,12 @@ export default {
     onCancel() {
       this.closePopup();
       this.$emit('cancel');
+      if(this.clearable)
+      {
+        this.visibleValue = '';
+        this.internalValue = null;
+        this.$emit('input', this.internalValue);
+      }
     },
     onChanged(data) {
       this.$emit('change', this.getValue(data), data);

src/components/form/FieldSelect.vue

@@ -45,6 +45,7 @@ export default {
     'dataKey', // 值键名 String
     'remoteUrl', // 远程列表加载地址 String
     'onRemoteResponse', // 远程获取到结果的处理回调 String|Function 如果是函数需返回数组, 如果是字符串支持.分割
+    'clearable', // 点击取消时清空绑定值
   ],
   watch: {
     value: function (newVal, oldVal) {
@@ -102,6 +103,12 @@ export default {
     onCancel() {
       this.closePopup();
       this.$emit('cancel');
+      if(this.clearable)
+      {
+        this.visibleValue = '';
+        this.internalValue = null;
+        this.$emit('input', this.internalValue);
+      }
     },
     getValue(data) {
       return typeof(data) === 'object' && this.dataKey ? data[this.dataKey] : data;

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

@@ -38,6 +38,16 @@
         :on-remote-response="'data'"
       />
       <van-field v-model="jgList.shyqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <field-select
+        v-model="jgList.shangbaoId"
+        label="关联任务"
+        value-key="surveyName"
+        data-key="id"
+        placeholder="选择关联任务"
+        :rules="[{ required: true }]"
+        :columns="shangbaoList"
+        :clearable="true"
+      />
     </div>
       <p class="main_title">违法信息</p>
       <div class="main_box">
@@ -98,7 +108,7 @@
 </template>
 
 <script>
-  import { jgAdd,getShyqrs } from "@/api/onlineHome/homestead/reporting";
+import {jgAdd, getShyqrs, listHomeuseshangbao} from "@/api/onlineHome/homestead/reporting";
   import FieldSelect from "@/components/form/FieldSelect";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
@@ -122,7 +132,9 @@
         maxDate: new Date(2025, 10, 1),
         currentDate: new Date(),
         deptId:this.$store.state.user.loginDeptId,
-        jgList:{},
+        jgList:{
+          shangbaoId: null,
+        },
         getObligeeOptions:[],
         sfzjjzw:'',
         jglx:'',
@@ -131,11 +143,12 @@
         wfydlxDictionaries:[],
         jglxDictionaries:[],
         sysDictionaries:[],
-
+        shangbaoList: [],
       };
     },
     created() {
       this.getDictionaries();
+      this.getShangbaoList();
     },
     methods: {
       getDictionaries(){
@@ -273,7 +286,12 @@
       },
       goBack(){
         window.history.go(-1)
-      }
+      },
+      getShangbaoList() {
+        listHomeuseshangbao({deptId: this.$store.state.user.loginDeptId, surveyStatus: '0'}).then((resp) => {
+          this.shangbaoList = resp.rows;
+        });
+      },
     },
   }
 </script>

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

@@ -25,6 +25,7 @@
         />
         <van-field readonly label="使用权人证件号码" v-model="jgList.shyqrzjhm" input-align="right"/>
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto"/>
+        <van-field readonly label="关联任务" :value="jgList.surveyName" input-align="right"/>
         <field-select
           v-model="jgList.jglx"
           label="监管类型"

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

@@ -25,6 +25,7 @@
         />
         <van-field readonly label="使用权人证件号码" v-model="jgList.shyqrzjhm" input-align="right"/>
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto"/>
+        <van-field readonly label="关联任务" :value="jgList.surveyName" input-align="right"/>
       </div>
       <p class="main_title">违法信息</p>
       <div class="main_box">

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

@@ -38,6 +38,16 @@
         :on-remote-response="'data'"
       />
       <van-field v-model="jgList.shyqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <field-select
+        v-model="jgList.shangbaoId"
+        label="关联任务"
+        value-key="surveyName"
+        data-key="id"
+        placeholder="选择关联任务"
+        :rules="[{ required: true }]"
+        :columns="shangbaoList"
+        :clearable="true"
+      />
     </div>
     <p class="main_title">执法情况</p>
     <field-select
@@ -138,7 +148,7 @@
 </template>
 
 <script>
-  import { jgAdd,getShyqrs,getJg,jgEdit} from "@/api/onlineHome/homestead/reporting";
+import {jgAdd, getShyqrs, getJg, jgEdit, listHomeuseshangbao} from "@/api/onlineHome/homestead/reporting";
   import FieldSelect from "@/components/form/FieldSelect";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
@@ -171,12 +181,13 @@
         wfydlxDictionaries:[],
         jglxDictionaries:[],
         sysDictionaries:[],
-
+        shangbaoList: [],
       };
     },
     created() {
       this.getDictionaries();
       this.getTaskGet();
+      this.getShangbaoList();
     },
     methods: {
       getTaskGet(){
@@ -316,7 +327,12 @@
       },
       goBack(){
         window.history.go(-1)
-      }
+      },
+      getShangbaoList() {
+        listHomeuseshangbao({deptId: this.$store.state.user.loginDeptId, surveyStatus: '0'}).then((resp) => {
+          this.shangbaoList = resp.rows;
+        });
+      },
     },
   }
 </script>

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

@@ -25,6 +25,7 @@
         />
         <van-field readonly label="使用权人证件号码" v-model="jgList.shyqrzjhm" input-align="right"/>
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto"/>
+        <van-field readonly label="关联任务" :value="jgList.surveyName" input-align="right"/>
         <p class="main_title">违法信息</p>
         <div class="main_box">
           <van-field