动态数据管理、企业信息查询字段对接、导出导入功能bug修改
This commit is contained in:
parent
cfb2092b37
commit
6a20c5ef0d
|
|
@ -93,14 +93,7 @@ const handleChange = (val) => {
|
||||||
// 找到选中的检查项完整信息
|
// 找到选中的检查项完整信息
|
||||||
let selectedCheckItems
|
let selectedCheckItems
|
||||||
|
|
||||||
if (Array.isArray(val)) {
|
信息
|
||||||
selectedCheckItems = checkItems.value.filter(checkItem => val.includes(checkItem.itemId))
|
|
||||||
} else {
|
|
||||||
const selectedCheckItem = checkItems.value.find(checkItem => checkItem.itemId === val)
|
|
||||||
selectedCheckItems = selectedCheckItem ? [selectedCheckItem] : []
|
|
||||||
}
|
|
||||||
|
|
||||||
// 触发change事件,传递完整的企业信息
|
|
||||||
emit('change', props.multiple ? selectedCheckItems : (selectedCheckItems[0] || null))
|
emit('change', props.multiple ? selectedCheckItems : (selectedCheckItems[0] || null))
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -49,12 +49,7 @@
|
||||||
<el-button class="but_hid" type="success" title="导入整合数据" @click="handleImport(3)"><template #icon><font-awesome-icon icon="file-import"/></template>导入整合数据</el-button>
|
<el-button class="but_hid" type="success" title="导入整合数据" @click="handleImport(3)"><template #icon><font-awesome-icon icon="file-import"/></template>导入整合数据</el-button>
|
||||||
<el-button class="but_hid" type="success" title="导入国标" @click="handleImport(4)"><template #icon><font-awesome-icon icon="file-import"/></template>导入国标</el-button>
|
<el-button class="but_hid" type="success" title="导入国标" @click="handleImport(4)"><template #icon><font-awesome-icon icon="file-import"/></template>导入国标</el-button>
|
||||||
<el-button type="primary" title="导出" @click="handleExport"><template #icon><font-awesome-icon icon="file-export"/></template>导出</el-button>
|
<el-button type="primary" title="导出" @click="handleExport"><template #icon><font-awesome-icon icon="file-export"/></template>导出</el-button>
|
||||||
<el-button type="warning" title="下载样表" @click="handleDownloadTemplate"><template #icon><font-awesome-icon icon="download"/></template>下载样表</el-button>
|
excel,application/x-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
|
||||||
<span style="color: darkred; font-weight: bold; padding-left: 10px;">注意:导入的表格只读取第一个工作表</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<input class="file" v-show="false" id="uploadExcelFileInput" name="file" type="file"
|
|
||||||
accept="application/vnd.ms-excel,application/x-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
|
|
||||||
@change="uploadFile"/>
|
@change="uploadFile"/>
|
||||||
<ElDialog :open="dialogConfig.show"
|
<ElDialog :open="dialogConfig.show"
|
||||||
:title="dialogConfig.title"
|
:title="dialogConfig.title"
|
||||||
|
|
|
||||||
|
|
@ -204,11 +204,7 @@ const state = reactive({
|
||||||
rules: {},
|
rules: {},
|
||||||
data: {},
|
data: {},
|
||||||
actions: {handleDialogOk: handleDialogOk}
|
actions: {handleDialogOk: handleDialogOk}
|
||||||
},
|
|
||||||
actions: {
|
|
||||||
add: handleAdd,
|
|
||||||
modify: handleModify,
|
|
||||||
detail: handleDetail,
|
|
||||||
exportData: handleExport,
|
exportData: handleExport,
|
||||||
downloadTemplate: downloadTemplate
|
downloadTemplate: downloadTemplate
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -145,11 +145,7 @@ public class EnterpriseAuditService {
|
||||||
String legalPhone = enterpriseAudit.getLegalPhone();
|
String legalPhone = enterpriseAudit.getLegalPhone();
|
||||||
if (enterpriseAuditRepo.existsByLegalPhoneAndDelFlag(legalPhone, (short) 0)
|
if (enterpriseAuditRepo.existsByLegalPhoneAndDelFlag(legalPhone, (short) 0)
|
||||||
|| enterpriseRepo.existsByLegalPhoneAndDelFlag(legalPhone, (short) 0))
|
|| enterpriseRepo.existsByLegalPhoneAndDelFlag(legalPhone, (short) 0))
|
||||||
throw new RuntimeException("联系电话【" + legalPhone + "】在企业上报审核/企业信息管理已存在");
|
priseAudit.getIndustryType()))
|
||||||
enterpriseAudit.setEntryTime(now);
|
|
||||||
enterpriseAudit.setAuditStatus("0");
|
|
||||||
if (!StringUtils.hasText(enterpriseAudit.getBusinessCategory())) {
|
|
||||||
if ("5".equals(enterpriseAudit.getIndustryType()))
|
|
||||||
enterpriseAudit.setBusinessCategory("2");
|
enterpriseAudit.setBusinessCategory("2");
|
||||||
else enterpriseAudit.setBusinessCategory("1");
|
else enterpriseAudit.setBusinessCategory("1");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue