浏览代码

中审报告归档调整

sangwenwei 2 月之前
父节点
当前提交
2ef6b14f87

+ 1 - 5
src/views/zs/reportArchieve/ArchieveList.vue

@@ -182,11 +182,7 @@
 					<vxe-column width="120" title="档案盒号" field="fileBoxNumber"  align="center"></vxe-column>
 					<vxe-column width="120" title="合同原件" field="originalContract"  align="center"></vxe-column>
 					<vxe-column width="120" title="归档接收人" field="archieveReseverName"  align="center"></vxe-column>
-					<vxe-column width="120" title="存放地区(区位码)" field="storagePlace"  align="center">
-						<template #default="scope">
-							{{$dictUtils.getDictLabel('storage_place', scope.row.storagePlace, '')}}
-						</template>
-					</vxe-column>
+					<vxe-column width="120" title="存放地区(区位码)" field="storagePlace"  align="center"></vxe-column>
 					<vxe-column width="100" title="状态" fixed="right" align="center" field="status">
 						<template #default="scope">
 							<el-button v-if="scope.row.status === '0'">{{$dictUtils.getDictLabel("report_archieve_status", scope.row.status, '未处理')}} </el-button>

+ 7 - 6
src/views/zs/reportArchieve/ReportArchieveForm.vue

@@ -182,13 +182,14 @@
                       .replace(/^\./g, '')
                       .replace(/\.{2,}/g, '.')
                       .replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
-                      .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^0+/, '0')" class="m-2" placeholder="请输入资产总额" clearable></el-input>
+                      .replace(/(?<=\.\d{6})\d+/g, '')
+                      .replace(/^(\-)*(\d+)\.(\d{6}).*$/, '$1$2.$3').replace(/^0+/, '0')" class="m-2" placeholder="请输入资产总额" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="存放地点(区位码)" prop="storagePlace"
+					<el-form-item label="存放地点(区位码)" prop="storagePlaces"
 								  :rules="[{required: true, message:'存放地点不能为空', trigger:'blur'}]">
-						<el-select style="width:100%;" v-model="inputForm.storagePlace" class="m-2" placeholder="请选择" clearable>
+						<el-select multiple style="width:100%;" v-model="inputForm.storagePlaces" class="m-2" placeholder="请选择" clearable>
 							<el-option
 								v-for="item in $dictUtils.getDictList('storage_place')"
 								:key="item.value"
@@ -266,7 +267,7 @@
 					bookNumbers:'',
 					originalContract:'',
 					totalAssets:'',
-					storagePlace:'',
+					storagePlaces:'',
 					remarks:'',
 				},
 				baseKey: '',
@@ -346,7 +347,7 @@
 					bookNumbers:'',
 					originalContract:'',
 					totalAssets:'',
-					storagePlace:'',
+					storagePlaces:'',
 					remarks:'',
 				}
 				if (method === 'add') {
@@ -408,7 +409,7 @@
 								this.$message.error('报告文号不能为空')
 								throw new Error('报告文号不能为空')
 							}
-							if (this.commonJS.isEmpty(this.inputForm.storagePlace)){
+							if (this.commonJS.isEmpty(this.inputForm.storagePlaces)){
 								this.loading = false
 								this.$message.error('存放地区不能为空')
 								throw new Error('存放地区不能为空')

+ 1 - 0
src/views/zs/reportArchieve/ReportArchieveImport.vue

@@ -20,6 +20,7 @@
 							<el-upload
 								ref="upload"
 								action=""
+								:limit="1"
 								:auto-upload="false"
 								:on-change="beforeUploadDetail"
 								:show-file-list="true">