|
|
@@ -111,7 +111,7 @@
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="hc-form-item">
|
|
|
- <el-form-item label="委托编号">
|
|
|
+ <el-form-item label="委托编号" prop="entrustNo">
|
|
|
<el-input v-model="addEditFormModel.entrustNo"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="样品名称">
|
|
|
@@ -188,7 +188,7 @@
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="hc-form-item">
|
|
|
- <el-form-item label="报告编号">
|
|
|
+ <el-form-item label="报告编号" prop="reportNo">
|
|
|
<el-input v-model="addEditFormModel.reportNo"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="工程部位">
|
|
|
@@ -213,7 +213,7 @@
|
|
|
<FormItemUpload v-model="addEditFormModel.reportAttachmentUrl" :action="'upload-file2'"/>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
- <el-form v-if="tabTypeKey === 'tab2'" :model="addEditFormModel" label-position="top" label-width="auto"
|
|
|
+ <el-form v-if="tabTypeKey === 'tab2'" :model="addEditFormModel" label-position="top" label-width="auto" ref="addEditFormRef"
|
|
|
size="large">
|
|
|
<el-form-item label="检测依据">
|
|
|
<el-input v-model="addEditFormModel.testBasisText" :autosize="{ minRows: 3}" maxlength="1000"
|
|
|
@@ -508,19 +508,20 @@ const addEditFormRules = {
|
|
|
const addEditFormLoading = ref(false)
|
|
|
const addEditFormClick = async () => {
|
|
|
let validate
|
|
|
+ console.log(addEditFormRef.value,'addEditFormRef.value');
|
|
|
if (addEditFormRef.value !== null) {
|
|
|
validate = await formValidate(addEditFormRef.value)
|
|
|
}
|
|
|
|
|
|
+ console.log(validate,'validate');
|
|
|
if (validate) {
|
|
|
if (formModalTitle.value === '复制') {
|
|
|
await copyFormApi()
|
|
|
} else {
|
|
|
await submitFormApi()
|
|
|
}
|
|
|
- } else if (validate === undefined) {
|
|
|
- window?.$message?.warning('请输入表单所需必填项')
|
|
|
- }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//新增、编辑 提交保存
|
