|
|
@@ -91,8 +91,8 @@
|
|
|
</view>
|
|
|
<!-- 上传附件 -->
|
|
|
<view class="file_picker_container">
|
|
|
- <uni-card title="上传附件" :extra="`${fileList.length}/9`" spacing="0">
|
|
|
- <uni-file-picker ref="filePicker" v-model="fileList" :auto-upload="true" mode="list" limit="10"
|
|
|
+ <uni-card title="上传附件" :extra="`${fileList.length}/50`" spacing="0">
|
|
|
+ <uni-file-picker ref="filePicker" v-model="fileList" :auto-upload="true" mode="list" :limit="50" :limitLength="50"
|
|
|
file-mediatype="all" @select="handleFileSelect" @progress="handleFileProgress"
|
|
|
@success="handleFileSuccess" @fail="handleFileFail" @delete="handleFileDelete" />
|
|
|
</uni-card>
|
|
|
@@ -409,7 +409,7 @@ function addRepeatingFormItem(index) {
|
|
|
}
|
|
|
// 删除重复表表单
|
|
|
function delRepeatingFormItem(index) {
|
|
|
- $modal.confirm('', '确认删除该重复表数据')
|
|
|
+ $modal.confirm('', '确认删除该详情表数据')
|
|
|
.then(() => {
|
|
|
repeatingForm.value.elements.splice(index, 1)
|
|
|
$repeatingForms.value.splice(index, 1)
|
|
|
@@ -446,8 +446,10 @@ function calculateRepeatingFormExpression(item, form) {
|
|
|
|
|
|
const fileList = ref([]) // 文件列表
|
|
|
const fileSeqs = ref([])
|
|
|
+const filePicker = ref(null)
|
|
|
async function handleFileSelect(files) { // 新增文件
|
|
|
// console.log('handleFileSelect', files.tempFiles)
|
|
|
+ console.log('filePicker: ',filePicker.value);
|
|
|
files.tempFiles.forEach(file => {
|
|
|
const data = {
|
|
|
name: file.name,
|
|
|
@@ -537,12 +539,15 @@ function validateRepeatingForm2() {
|
|
|
})
|
|
|
let flag = false
|
|
|
repeatingFormsValue.value.forEach((item, index) => {
|
|
|
+ let ItemIndex = 0
|
|
|
for (const elem in item) {
|
|
|
if (item[elem] == '') {
|
|
|
- $modal.msgError(`重复表 ${index + 1} 数据填写错误`)
|
|
|
+ const name = repeatingForm.value.elementItem[ItemIndex].elementName.slice(3)
|
|
|
+ $modal.msgError(`详情表 ${name} 数据填写错误`)
|
|
|
flag = false
|
|
|
return
|
|
|
- }
|
|
|
+ }
|
|
|
+ ItemIndex++
|
|
|
}
|
|
|
flag = true
|
|
|
})
|
|
|
@@ -607,9 +612,9 @@ function submitProcess() { // 提交表单
|
|
|
button_state.value = false
|
|
|
// validateMainForm()
|
|
|
computedMainFormValue()
|
|
|
- console.log('mainFormValue: ',mainFormValue.value);$mainForm
|
|
|
- console.log('$mainFormRules: ',$mainFormRules.value);
|
|
|
- console.log('$mainForm: ',$mainForm.value);
|
|
|
+ // console.log('mainFormValue: ',mainFormValue.value);
|
|
|
+ // console.log('$mainFormRules: ',$mainFormRules.value);
|
|
|
+ // console.log('$mainForm: ',$mainForm.value);
|
|
|
// 主表数据校验
|
|
|
$mainForm.value.validate().then(res => {
|
|
|
|