|
@@ -706,6 +706,28 @@
|
|
</div>
|
|
</div>
|
|
</el-form>
|
|
</el-form>
|
|
</hc-new-dialog>
|
|
</hc-new-dialog>
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ <!-- 选择试验附件类型 -->
|
|
|
|
+ <hc-dialog v-model="fileTypeDialog" title="设置自动获取" :loading="fileTypeLoading" @save="fileTypeSaveClick">
|
|
|
|
+ <el-form
|
|
|
|
+ :model="fileTypeModal"
|
|
|
|
+ label-width="auto"
|
|
|
|
+ size="large"
|
|
|
|
+ label-position="left"
|
|
|
|
+ :rules="fileTypeRules"
|
|
|
|
+ >
|
|
|
|
+ <el-form-item label="选择附件类型" prop="type">
|
|
|
|
+ <el-select v-model="fileTypeModal.type" multiple block>
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="item in fileType"
|
|
|
|
+ :key="item.dictKey"
|
|
|
|
+ :label="item.label" :value="item.value"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-form>
|
|
|
|
+ </hc-dialog>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
<script setup>
|
|
@@ -750,6 +772,7 @@ import { toPdfPage } from '~uti/btn-auth'
|
|
import nodeBaseApi from '~api/data-fill/nodebaseinfo'
|
|
import nodeBaseApi from '~api/data-fill/nodebaseinfo'
|
|
import thirdApi from '~api/tentative/detect/third'
|
|
import thirdApi from '~api/tentative/detect/third'
|
|
import { formValidate } from 'js-fast-way'
|
|
import { formValidate } from 'js-fast-way'
|
|
|
|
+import { getDictionaryData } from '~uti/tools'
|
|
//参数
|
|
//参数
|
|
const props = defineProps({
|
|
const props = defineProps({
|
|
datas: {
|
|
datas: {
|
|
@@ -1073,8 +1096,13 @@ const handleMenuSelect = async ({ key }) => {
|
|
testModal.value = true
|
|
testModal.value = true
|
|
} else if (key === 'file') {
|
|
} else if (key === 'file') {
|
|
fileModalLoading.value = false
|
|
fileModalLoading.value = false
|
|
- fileModal.value = true
|
|
|
|
- getIsUseTestTreeCy()
|
|
|
|
|
|
+ console.log('关联试验文件')
|
|
|
|
+ fileTypeModal.value = []
|
|
|
|
+ fileTypeDialog.value = true
|
|
|
|
+
|
|
|
|
+ getFileType()
|
|
|
|
+ // fileModal.value = true
|
|
|
|
+ // getIsUseTestTreeCy()
|
|
} else if (key === 'formula') {
|
|
} else if (key === 'formula') {
|
|
formulaModalLoading.value = false
|
|
formulaModalLoading.value = false
|
|
formulaModal.value = true
|
|
formulaModal.value = true
|
|
@@ -2187,10 +2215,6 @@ const autoSaveClick = async ()=>{
|
|
const { KeyName, pkeyId } = tableFormItemNode.value
|
|
const { KeyName, pkeyId } = tableFormItemNode.value
|
|
const refs = await getFormRef(pkeyId)
|
|
const refs = await getFormRef(pkeyId)
|
|
const itemFormData = refs?.getFormData()
|
|
const itemFormData = refs?.getFormData()
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
let max
|
|
let max
|
|
let min
|
|
let min
|
|
|
|
|
|
@@ -2318,7 +2342,7 @@ const validateDeviation = (rule, value, callback) => {
|
|
}
|
|
}
|
|
|
|
|
|
// 正则匹配:-n,n 或 ±n 格式
|
|
// 正则匹配:-n,n 或 ±n 格式
|
|
- const isValid = /^(-?\d+,\d+|±\d+)$/.test(value)
|
|
|
|
|
|
+ const isValid = /^(-?\d+[,,]\d+|±\d+)$/.test(value)
|
|
if (!isValid) {
|
|
if (!isValid) {
|
|
callback(new Error('格式错误!请输入 -n,n 或 ±n'))
|
|
callback(new Error('格式错误!请输入 -n,n 或 ±n'))
|
|
} else {
|
|
} else {
|
|
@@ -2356,6 +2380,29 @@ const deviationSaveClick = async ()=>{
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+//选择附件类型
|
|
|
|
+const fileTypeDialog = ref(false)
|
|
|
|
+const fileTypeSaveClick = ()=>{
|
|
|
|
+
|
|
|
|
+}
|
|
|
|
+const fileTypeModal = ref({
|
|
|
|
+ type: '',
|
|
|
|
+
|
|
|
|
+})
|
|
|
|
+const fileTypeLoading = ref(false)
|
|
|
|
+const fileType = ref([])
|
|
|
|
+const getFileType = async ()=>{
|
|
|
|
+ fileType.value = await getDictionaryData('table_file_type', true )
|
|
|
|
+}
|
|
|
|
+const fileTypeRules = {
|
|
|
|
+ type: {
|
|
|
|
+ required: true,
|
|
|
|
+ trigger: 'blur',
|
|
|
|
+ message: '请选择附件类型',
|
|
|
|
+ },
|
|
|
|
+
|
|
|
|
+}
|
|
|
|
+
|
|
// 暴露出去
|
|
// 暴露出去
|
|
defineExpose({
|
|
defineExpose({
|
|
getFormData,
|
|
getFormData,
|