diff --git a/src/api/onlineHome/homestead/reporting.js b/src/api/onlineHome/homestead/reporting.js
index f46d04b9..69913cf5 100644
--- a/src/api/onlineHome/homestead/reporting.js
+++ b/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
+ })
+}
diff --git a/src/components/form/FieldCascader.vue b/src/components/form/FieldCascader.vue
index 61e00782..d65499d9 100644
--- a/src/components/form/FieldCascader.vue
+++ b/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;
diff --git a/src/components/form/FieldDatePicker.vue b/src/components/form/FieldDatePicker.vue
index d9f60342..db34c8a5 100644
--- a/src/components/form/FieldDatePicker.vue
+++ b/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);
diff --git a/src/components/form/FieldSelect.vue b/src/components/form/FieldSelect.vue
index 39a4edd6..ee2608c0 100644
--- a/src/components/form/FieldSelect.vue
+++ b/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;
diff --git a/src/views/yinnong/homestead/supervision/supervisionAdd.vue b/src/views/yinnong/homestead/supervision/supervisionAdd.vue
index b9ccc646..2ccbdc92 100644
--- a/src/views/yinnong/homestead/supervision/supervisionAdd.vue
+++ b/src/views/yinnong/homestead/supervision/supervisionAdd.vue
@@ -38,6 +38,16 @@
:on-remote-response="'data'"
/>
违法信息
违法信息
执法情况
违法信息