调整

src/views/common/InscriptionUpLoadComponent.vue

@@ -279,11 +279,11 @@
         //   return
         // }
 		  if (!exnameFix(file, '1', 'doc,docx,pdf,xls,xlsx')) {
-			  for (let i = 0; i <this.dataListNew.length ; i++) {
-				  this.deleteById(this.dataListNew[i],i,this.dataListNew)
-			  }
-			  this.fileList = []
-			  this.dataListNew = []
+			  // for (let i = 0; i <this.dataListNew.length ; i++) {
+				//   this.deleteById(this.dataListNew[i],i,this.dataListNew)
+			  // }
+			  // this.fileList = []
+			  // this.dataListNew = []
 			  // this.$message.error('文件仅支持 xml 格式!')
 			  return
 		  }

src/views/jy/inscription/InscriptionForm.vue

@@ -564,7 +564,12 @@
 						console.log('datqa',data)
 						page=data-this.inputForm.colorPage
 						console.log('page',page)
-						this.inputForm.normalPage=page
+						if (page <0){
+							this.$message.error('彩页数量不正确或上传文件不正确')
+						}else {
+							this.inputForm.normalPage=page
+						}
+
 					})
 					console.log('file1',this.inputForm.normalPage)
 				}

src/views/jy/inscription/InscriptionList.vue

@@ -112,7 +112,7 @@
 
 								<el-button v-if="hasPermission('inscription:edit')&&scope.row.status==='2' && checkIsAudit(scope.row)" text type="primary" size="small" @click="examine(scope.row)">审核</el-button>
 								<el-button v-if="hasPermission('inscription:edit')&&scope.row.status === '4'&&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="adjust(scope.row)">驳回调整</el-button>
-								<el-button v-if="hasPermission('inscription:edit')&&scope.row.status ==='5'" text type="primary" size="small" @click="outExport(scope.row)">导出</el-button>
+								<el-button v-if="hasPermission('inscription:edit')&&scope.row.status ==='5' &&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="outExport(scope.row)">导出</el-button>
 							</div>
 						</template>
 					</vxe-column>