Commit 4bad32ab authored by 田翔's avatar 田翔

feat: 完善区域任务控件以及配置

parent c5ca9198
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "6.8.10", "version": "6.8.11",
"description": "6.8.10 文本唯一值校验", "description": "6.8.11 完善区域任务控件以及配置",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
...@@ -44,13 +44,14 @@ const AreaTaskShine = (props) => { ...@@ -44,13 +44,14 @@ const AreaTaskShine = (props) => {
form form
.validateFields() .validateFields()
.then((values) => { .then((values) => {
const { field, accountName, service, layerName } = form.getFieldsValue() const { field, schemeName, accountName, service, layerName } = form.getFieldsValue()
// if (!toField.some(v => v.name === '工单编号')) { // if (!toField.some(v => v.name === '工单编号')) {
// return message.error(`【${accountName}】台账不存在工单编号字段`) // return message.error(`【${accountName}】台账不存在工单编号字段`)
// } // }
// if (!toField.some(v => v.name === '反馈状态')) { // if (!toField.some(v => v.name === '反馈状态')) {
// return message.error(`【${accountName}】台账不存在反馈状态字段`) // return message.error(`【${accountName}】台账不存在反馈状态字段`)
// } // }
addons.setValue('schemeName', schemeName)
addons.setValue('tableName', tableName) addons.setValue('tableName', tableName)
addons.setValue('accountName', accountName) addons.setValue('accountName', accountName)
addons.setValue('service', service) addons.setValue('service', service)
...@@ -162,6 +163,7 @@ const AreaTaskShine = (props) => { ...@@ -162,6 +163,7 @@ const AreaTaskShine = (props) => {
// if (tableName) { // if (tableName) {
// getToField() // getToField()
// } // }
form.setFieldsValue({ schemeName: formData.schemeName || '' })
getProgramme() getProgramme()
} }
}, [visible, service, layerName, tableName]) }, [visible, service, layerName, tableName])
...@@ -193,8 +195,9 @@ const AreaTaskShine = (props) => { ...@@ -193,8 +195,9 @@ const AreaTaskShine = (props) => {
autoComplete="off" autoComplete="off"
labelCol={{ span: 5 }} labelCol={{ span: 5 }}
> >
<Form.Item label='巡检对象' name='taskName' rules={[{ required: true, message: 'gis反馈台账必填', }]}> <Form.Item label='巡检对象' name='schemeName' rules={[{ required: true, message: '巡检对象必填', }]}>
<Select <Select
allowClear
showSearch showSearch
options={taskList.map(v => ({ label: v.Name, value: v.Name }))} options={taskList.map(v => ({ label: v.Name, value: v.Name }))}
onChange={taskNameChange} onChange={taskNameChange}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment