Browse Source

代码提交

user5 1 year atrás
parent
commit
26bb94ac5f

+ 9 - 4
src/views/common/InvoiceReimbursementUpLoadComponent.vue

@@ -55,7 +55,7 @@
           <template  #default="scope">
             <el-button text type="primary" key="01" icon="el-icon-download" size="small" @click="toHref(scope.row)" >下载</el-button>
             <el-button text type="primary" key="02" icon="el-icon-delete" size="small"  @click="deleteById(scope.row, scope.$index,fileList)" :disabled="auth==='view'&&delFlag === false&&createBy!==scope.row.createBy.name">删除</el-button>
-            <el-button v-if="createBy===scope.row.createBy.name" type="text"  icon="el-icon-delete" size="small"  @click="deleteById(scope.row, scope.$index)" :disabled="auth==='view'&&delFlag === false">删除2</el-button>
+<!--            <el-button v-if="createBy===scope.row.createBy.name" type="text"  icon="el-icon-delete" size="small"  @click="deleteById(scope.row, scope.$index)" :disabled="auth==='view'&&delFlag === false">删除2</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -357,15 +357,20 @@
 		async changes (file, fileList) {
 			this.uploadKey = Math.random()
 			console.log(fileList)
-			/*for (let i = 0; i < fileList.length; i++) {
-				if (fileList[i].lsUrl) {
+			for (let i = 0; i < fileList.length; i++) {
+				var fileItem = fileList[i];
+				if(fileList[i].raw !== undefined && fileList[i].raw !== null && fileList[i].raw !== {}){
+					fileItem = fileList[i].raw;
+				}
+				const isXml = fileItem.type === 'text/xml'; // 假设只接受 XML 文件
+				if (!isXml) {
 					console.log("删除该文件")
 					//fileList[i].remove()
 					fileList.splice(i, 1);
 					// Since the element is removed, decrease the index by 1 to adjust for the removed element
 					i--;
 				}
-			}*/
+			}
       	this.uploadDelFlag = false;
 			// if (file.status !== 'ready') {
 			//   return

+ 8 - 0
src/views/cw/invoice/InvoiceFormTask.vue

@@ -1101,6 +1101,14 @@
 					  }
 					  if (this.commonJS.isEmpty(this.inputForm.financeInvoiceBaseDTOList)) {
 						  this.inputForm.financeInvoiceBaseDTOList = []
+					  }else{
+					  	for(var i = 0; i<this.inputForm.financeInvoiceBaseDTOList.length;i ++){
+					  		var info = this.inputForm.financeInvoiceBaseDTOList[i];
+					  		if(info.programId) {
+								this.inputForm.programId = info.programId
+								this.inputForm.checkType =  '1'
+							}
+						}
 					  }
 					  if (this.commonJS.isEmpty(this.inputForm.workAttachmentDtoList) || this.inputForm.workAttachmentDtoList.length === 0) {
 						  this.inputForm.workAttachmentDtoList = []

+ 1 - 1
src/views/program/registered/ProjectList.vue

@@ -123,7 +123,7 @@
         <template #buttons>
 <!--          <el-button v-if="hasPermission('program:registered:add')" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>-->
 <!--			v-if="(hasPermission('program:registered:add') && overArchiveFlag === 0)" v-show="isOver"-->
-			<el-button  type="primary" icon="el-icon-plus" @click="start()">新建</el-button>
+			<el-button v-if="(hasPermission('program:registered:add') && overArchiveFlag === 0)" v-show="isOver" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>
 			<a style="color:red;" v-show="!isOver">已登记项目存在信息未填写完成情况,请补充完整(可通过筛选项筛选归档状态为:已归档、超期已归档。进行查看)</a>
         </template>
       </vxe-toolbar>