소스 검색

中审归档盒号去除必填选项

徐滕 1 개월 전
부모
커밋
c56be0696f
2개의 변경된 파일20개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/views/cw/projectRecords/ProjectRecordsList.vue
  2. 19 1
      src/views/zs/reportArchieve/ReportArchieveForm.vue

+ 1 - 1
src/views/cw/projectRecords/ProjectRecordsList.vue

@@ -102,7 +102,7 @@
           <el-button v-if="hasPermission('cwProjectRecords:add')" type="primary" icon="el-icon-plus"
             @click="add()">新建</el-button>
           <!--          <el-button v-if="hasPermission('klg:question:del')" type="danger" icon="el-icon-delete" @click="del()" :disabled="$refs.questionsTable && $refs.questionsTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
-          <el-button v-if="hasPermission('cwProjectRecords:add')" type="primary" @click="projectImport()">导入</el-button>
+          <el-button v-if="hasPermission('cwProjectRecords:import')" type="primary" @click="projectImport()" plain>导入</el-button>
         </template>
         <template #tools>
           <vxe-button text type="primary" :title="searchVisible ? '收起检索' : '展开检索'" icon="vxe-icon-search"

+ 19 - 1
src/views/zs/reportArchieve/ReportArchieveForm.vue

@@ -152,7 +152,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="盒号" prop="fileBoxNumber"
-								  :rules="[{required: true, message:'盒号不能为空', trigger:'blur'}]">
+								  :rules="[]">
 						<el-input @blur="checkFileBoxNumber()" v-model="inputForm.fileBoxNumber" class="m-2" placeholder="请输入盒号" clearable></el-input>
 						<span style="color: #E6A23C; font-weight: bold;">{{usedReportNo}}</span>
 					</el-form-item>
@@ -198,6 +198,7 @@
 							</el-option>
 
 						</el-select>
+						<span style="color: #E6A23C; font-weight: bold;">{{storagePlace}}</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -281,6 +282,7 @@
 				keyWatch: '',
 				dateList:[],
 				usedReportNo:'',
+				storagePlace:'',
 			}
 		},
 		ReportArchieveService:null,
@@ -395,6 +397,11 @@
 								}else {
 									this.usedReportNo = ''
 								}
+								if(this.commonJS.isNotEmpty(data1.storagePlace)) {
+									this.storagePlace = "上一文件存放地点:" + data1.storagePlace
+								}else{
+									this.storagePlace = ''
+								}
 							})
 						})
 						this.loading = false
@@ -486,6 +493,7 @@
 				}
 				this.visible = false
 				this.usedReportNo = ''
+				this.storagePlace = ''
 			},
 			getReportNo(){
 				console.log('id',this.inputForm.reportNoType)
@@ -507,6 +515,11 @@
 					}else {
 						this.usedReportNo = ''
 					}
+					if(this.commonJS.isNotEmpty(data.storagePlace)) {
+						this.storagePlace = "上一文件存放地点:" + data.storagePlace
+					}else{
+						this.storagePlace = ''
+					}
 				})
 			},
 			getFileBoxNumber(){
@@ -529,6 +542,11 @@
 					}else {
 						this.usedReportNo = ''
 					}
+					if(this.commonJS.isNotEmpty(data.storagePlace)) {
+						this.storagePlace = "上一文件存放地点:" + data.storagePlace
+					}else{
+						this.storagePlace = ''
+					}
 				})
 			},
 			checkFileBoxNumber(){