报销管理员修改功能调整

src/views/ccpm/reimbursement/info/InfoList.vue

@@ -187,7 +187,7 @@
           <vxe-column title="操作" width="130px" fixed="right" align="center">
             <template  #default="scope">
 <!--				管理员修改-->
-				<el-button v-if=" (scope.row.type === '5' && isAdmin)" text type="primary" @click="editForm(scope.row)">修改</el-button>
+				<el-button v-if=" (isAdmin)" text type="primary" @click="editForm(scope.row)">修改</el-button>
 
 				<el-button v-if="hasPermission('ccpm:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3' )" text type="primary"   @click="edit(scope.row)">修改</el-button>
               <el-button v-if="hasPermission('ccpm:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '4')" text type="primary"   @click="todo(scope.row)">驳回调整</el-button>

src/views/common/InvoiceReimbursementUpLoadComponent.vue

@@ -166,6 +166,7 @@
        *    showDivider=false时 ‘附件‘Divider隐藏
        */
       async newUpload (auth, fileList, directory, maxValue, dividerName, uploadFlag, delFlag, showDivider) {
+		  this.uploadKey = Math.random()
         await this.fileLoadingFalse()
         if (this.commonJS.isEmpty(fileList)) {
 			fileList = []
@@ -208,6 +209,7 @@
             this.delFlag = delFlag
           }
         }
+		  this.oldDataList = []
         for await (let item of fileList) {
           await this.ossService.getFileSizeByUrl(item.url).then((data) => {
             item.lsUrl = data.url
@@ -262,7 +264,12 @@
 									this.deleteFileById(this.fileList[index], index, this.fileList);
 								}
 							}else{
-								var flag = this.$parent.invoiceReimbursementDispose(data);
+								let parent = this.$parent
+								while (!parent.invoiceReimbursementDispose) {
+									parent = parent['$parent']
+								}
+								var flag = parent.invoiceReimbursementDispose(data)
+								//var flag = this.$parent.invoiceReimbursementDispose(data);
 								if(!flag){
 									this.httpRequest(file);
 								}else{
@@ -286,15 +293,11 @@
 			}
 		},
       uploadVideoProcess (event, file, fileList) {
-      	var reimbursementType = ''
-      	var parentHierarchy = 0
-      	if(this.$parent.inputForm) {
-			reimbursementType = this.$parent.inputForm.reimbursementType
-			parentHierarchy = 1
-		}else if(this.$parent.$parent.inputForm) {
-			reimbursementType = this.$parent.$parent.inputForm.reimbursementType
-			parentHierarchy = 2
-		}
+	  let parent = this.$parent
+	  while (!parent.inputForm) {
+		  parent = parent['$parent']
+	  }
+		var reimbursementType = parent.inputForm.reimbursementType
         this.progressFlag = true // 显示进度条
         this.loadProgress = parseInt(event.percent) // 动态获取文件上传进度
         if (this.loadProgress >= 100) {
@@ -310,11 +313,7 @@
 					formBody.append('file', file.raw)
 					this.ossService.disposeXmlFile(formBody).then((data) => {
 						if(Object.keys(data).length > 0){
-							if(parentHierarchy === 1){
-								this.$parent.invoiceReimbursementDisposeData(data,file)
-							}else if (parentHierarchy ===2){
-								this.$parent.$parent.invoiceReimbursementDisposeData(data,file)
-							}
+							parent.invoiceReimbursementDisposeData(data,file)
 						}else{
 							this.$message.warning('上传的数电发票格式错误')
 							this.loading = false;
@@ -452,15 +451,12 @@
 		}
 		  this.fileList = newFileList;
 
-		var reimbursementType = ''
-		  var parentHierarchy = 0
-		  if(this.$parent.inputForm) {
-			  reimbursementType = this.$parent.inputForm.reimbursementType
-			  parentHierarchy = 1
-		  }else if(this.$parent.$parent.inputForm) {
-			  reimbursementType = this.$parent.$parent.inputForm.reimbursementType
-			  parentHierarchy = 2
+		  let parent = this.$parent
+		  while (!parent.inputForm) {
+			  parent = parent['$parent']
 		  }
+
+		  var  reimbursementType = parent.inputForm.reimbursementType
 		  if("1" === reimbursementType){
 			  var fileName = ''
 			  if(null === row.raw || undefined === row.raw){
@@ -476,21 +472,13 @@
 				  const formBody = new FormData()
 				  if(null === row.raw || undefined === row.raw){
 					  this.ossService.downLoadFileDisposeXmlFile(row.url).then((data) => {
-						  if(parentHierarchy === 1){
-							  this.$parent.deleteInvoiceReimbursementDisposeData(data)
-						  }else if (parentHierarchy ===2){
-							  this.$parent.$parent.deleteInvoiceReimbursementDisposeData(data)
-						  }
+						  parent.deleteInvoiceReimbursementDisposeData(data)
 					  })
 				  }else{
 					  formBody.append('file', row.raw)
 					  this.ossService.disposeXmlFile(formBody).then((data) => {
 						  if(data){
-							  if(parentHierarchy === 1){
-								  this.$parent.deleteInvoiceReimbursementDisposeData(data)
-							  }else if (parentHierarchy ===2){
-								  this.$parent.$parent.deleteInvoiceReimbursementDisposeData(data)
-							  }
+							  parent.deleteInvoiceReimbursementDisposeData(data)
 						  }else{
 							  this.$message.warning('上传的数电发票格式错误')
 							  this.loading = false;
@@ -521,15 +509,11 @@
 		}
 		  this.fileList = newFileList;
 
-		var reimbursementType = ''
-		  var parentHierarchy = 0
-		  if(this.$parent.inputForm) {
-			  reimbursementType = this.$parent.inputForm.reimbursementType
-			  parentHierarchy = 1
-		  }else if(this.$parent.$parent.inputForm) {
-			  reimbursementType = this.$parent.$parent.inputForm.reimbursementType
-			  parentHierarchy = 2
+		  let parent = this.$parent
+		  while (!parent.inputForm) {
+			  parent = parent['$parent']
 		  }
+		  var reimbursementType = parent.inputForm.reimbursementType
 		  if("1" === reimbursementType){
 			  var fileName = ''
 			  if(null === row.raw || undefined === row.raw){
@@ -545,21 +529,13 @@
 				  const formBody = new FormData()
 				  if(null === row.raw || undefined === row.raw){
 					  this.ossService.downLoadFileDisposeXmlFile(row.url).then((data) => {
-						  if(parentHierarchy === 1){
-							  //this.$parent.deleteInvoiceReimbursementDisposeData(data)
-						  }else if (parentHierarchy ===2){
-							  //this.$parent.$parent.deleteInvoiceReimbursementDisposeData(data)
-						  }
+						  //parent.deleteInvoiceReimbursementDisposeData(data)
 					  })
 				  }else{
 					  formBody.append('file', row.raw)
 					  this.ossService.disposeXmlFile(formBody).then((data) => {
 						  if(data){
-							  if(parentHierarchy === 1){
-								  //this.$parent.deleteInvoiceReimbursementDisposeData(data)
-							  }else if (parentHierarchy ===2){
-								  //this.$parent.$parent.deleteInvoiceReimbursementDisposeData(data)
-							  }
+							  //parent.deleteInvoiceReimbursementDisposeData(data)
 						  }else{
 							  this.$message.warning('上传的数电发票格式错误')
 							  this.loading = false;
@@ -596,15 +572,12 @@
 		}
 		  this.fileList = newFileList;
 
-		var reimbursementType = ''
-		  var parentHierarchy = 0
-		  if(this.$parent.inputForm) {
-			  reimbursementType = this.$parent.inputForm.reimbursementType
-			  parentHierarchy = 1
-		  }else if(this.$parent.$parent.inputForm) {
-			  reimbursementType = this.$parent.$parent.inputForm.reimbursementType
-			  parentHierarchy = 2
+		  let parent = this.$parent
+		  while (!parent.inputForm) {
+			  parent = parent['$parent']
 		  }
+		  var reimbursementType = parent.inputForm.reimbursementType
+
 		  if("1" === reimbursementType){
 			  var fileName = ''
 		  	if(null === row.raw || undefined === row.raw){
@@ -620,20 +593,12 @@
 				  const formBody = new FormData()
 				  if(null === row.raw || undefined === row.raw){
 					  this.ossService.downLoadFileDisposeXmlFile(row.url).then((data) => {
-						  if(parentHierarchy === 1){
-							  this.$parent.deleteInvoiceReimbursementDisposeData(data)
-						  }else if (parentHierarchy ===2){
-							  this.$parent.$parent.deleteInvoiceReimbursementDisposeData(data)
-						  }
+						  parent.deleteInvoiceReimbursementDisposeData(data)
 					  })
 				  }else{
 					  formBody.append('file', row.raw)
 					  this.ossService.disposeXmlFile(formBody).then((data) => {
-						  if(parentHierarchy === 1){
-							  this.$parent.deleteInvoiceReimbursementDisposeData(data)
-						  }else if (parentHierarchy ===2){
-							  this.$parent.$parent.deleteInvoiceReimbursementDisposeData(data)
-						  }
+						  parent.deleteInvoiceReimbursementDisposeData(data)
 					  })
 				  }
 			  }

src/views/consultancy/reimbursement/info/InfoList.vue

@@ -187,7 +187,7 @@
           <vxe-column title="操作" width="130px" fixed="right" align="center">
             <template  #default="scope">
 				<!--				管理员修改-->
-				<el-button v-if=" (scope.row.type === '5' && isAdmin)" text type="primary" @click="editForm(scope.row)">修改</el-button>
+				<el-button v-if=" (isAdmin)" text type="primary" @click="editForm(scope.row)">修改</el-button>
 
 				<el-button v-if="hasPermission('consultancy:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3' )" text type="primary"   @click="edit(scope.row)">修改</el-button>
               <el-button v-if="hasPermission('consultancy:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '4')" text type="primary"   @click="todo(scope.row)">驳回调整</el-button>

src/views/cw/reimbursementApproval/info/InfoList.vue

@@ -195,7 +195,7 @@
 					<vxe-column title="操作" min-width="130px" fixed="right" align="center">
 						<template  #default="scope">
 							<div v-if="isAdmin">
-								<el-button v-if=" (scope.row.type === '5' )" text type="primary" @click="editForm(scope.row)">修改</el-button>
+								<el-button text type="primary" @click="editForm(scope.row)">修改</el-button>
 								<el-button v-if=" (scope.row.type === '5')" text type="primary"  @click="del(scope.row.id)">删除</el-button>
 							</div>
 							<div v-else>

src/views/cw/signatureDaily/SignatureDailyDia.vue

@@ -27,7 +27,7 @@
 			  <el-form-item label="签章编号" prop="number"
 							:rules="[
                ]">
-				  <el-input :disabled="true" placeholder="请填写签章编号" v-model="inputForm.number" clearable></el-input>
+				  <el-input :disabled="true" placeholder="签章编号自动生成" v-model="inputForm.number" clearable></el-input>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">

src/views/cw/signatureDaily/SignatureDailyFormTask.vue

@@ -18,7 +18,7 @@
 			  <el-form-item label="签章编号" prop="number"
 							:rules="[
                ]">
-				  <el-input :disabled="true" placeholder="请填写签章编号" v-model="inputForm.number" clearable></el-input>
+				  <el-input :disabled="true" placeholder="签章编号自动生成" v-model="inputForm.number" clearable></el-input>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">

src/views/cw/signatureDaily/SignatureReportDia.vue

@@ -66,7 +66,7 @@
 			  <el-form-item label="签章编号" prop="number"
 							:rules="[
                ]">
-				  <el-input :disabled="true" placeholder="请填写签章编号" v-model="inputForm.number" clearable></el-input>
+				  <el-input :disabled="true" placeholder="签章编号自动生成" v-model="inputForm.number" clearable></el-input>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">

src/views/cw/signatureDaily/SignatureReportFormTask.vue

@@ -57,7 +57,7 @@
 			  <el-form-item label="签章编号" prop="number"
 							:rules="[
                ]">
-				  <el-input :disabled="true" placeholder="请填写签章编号" v-model="inputForm.number" clearable></el-input>
+				  <el-input :disabled="true" placeholder="签章编号自动生成" v-model="inputForm.number" clearable></el-input>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">

src/views/program/signatureDaily/SignatureDailyDia.vue

@@ -27,7 +27,7 @@
 			  <el-form-item label="签章编号" prop="number"
 							:rules="[
                ]">
-				  <el-input :disabled="true" placeholder="请填写签章编号" v-model="inputForm.number" clearable></el-input>
+				  <el-input :disabled="true" placeholder="签章编号自动生成" v-model="inputForm.number" clearable></el-input>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">

src/views/program/signatureDaily/SignatureDailyFormTask.vue

@@ -18,7 +18,7 @@
 			  <el-form-item label="签章编号" prop="number"
 							:rules="[
                ]">
-				  <el-input :disabled="true" placeholder="请填写签章编号" v-model="inputForm.number" clearable></el-input>
+				  <el-input :disabled="true" placeholder="签章编号自动生成" v-model="inputForm.number" clearable></el-input>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">

src/views/program/signatureDaily/SignatureReportDia.vue

@@ -66,7 +66,7 @@
 			  <el-form-item label="签章编号" prop="number"
 							:rules="[
                ]">
-				  <el-input :disabled="true" placeholder="请填写签章编号" v-model="inputForm.number" clearable></el-input>
+				  <el-input :disabled="true" placeholder="签章编号自动生成" v-model="inputForm.number" clearable></el-input>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">

src/views/program/signatureDaily/SignatureReportFormTask.vue

@@ -57,7 +57,7 @@
 			  <el-form-item label="签章编号" prop="number"
 							:rules="[
                ]">
-				  <el-input :disabled="true" placeholder="请填写签章编号" v-model="inputForm.number" clearable></el-input>
+				  <el-input :disabled="true" placeholder="签章编号自动生成" v-model="inputForm.number" clearable></el-input>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">

src/views/reimbursement/info/InfoList.vue

@@ -178,7 +178,7 @@
           <vxe-column title="操作" min-width="130px" fixed="right" align="center">
             <template  #default="scope">
 <!--				管理员修改-->
-				<el-button v-if=" (scope.row.type === '5' && isAdmin)" text type="primary" @click="editForm(scope.row)">修改</el-button>
+				<el-button v-if=" (isAdmin)" text type="primary" @click="editForm(scope.row)">修改</el-button>
 
 				<el-button v-if="hasPermission('reimbursement:info:edit')&& scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3')" text type="primary"  @click="edit(scope.row)">修改</el-button>
               <el-button v-if="hasPermission('reimbursement:info:edit')&& scope.row.createId === $store.state.user.id && (scope.row.type === '2')" text type="primary" @click="reback(scope.row)">撤回</el-button>

src/views/sys/mould/SerialnumTplForm.vue

@@ -104,6 +104,7 @@
           border
           show-overflow
           ref="xTable"
+		  :key="serialnumTplKey"
           class="vxe-table-element"
           :data="mouldList"
           :disabled="method==='view'"
@@ -154,6 +155,7 @@
   export default {
     data () {
       return {
+		serialnumTplKey: "",
         visable: false,
         gridData: [],
         radio: 0,
@@ -296,6 +298,7 @@
         } else {
           await this.$refs.xTable.insert().then((data) => {
             this.mouldList.push(data)
+			  this.serialnumTplKey = Math.random()
           })
         }
       },

src/views/zs/reimbursement/info/InfoList.vue

@@ -187,7 +187,7 @@
           <vxe-column title="操作" width="130px" fixed="right" align="center">
             <template  #default="scope">
 				<!--				管理员修改-->
-				<el-button v-if=" (scope.row.type === '5' && isAdmin)" text type="primary" @click="editForm(scope.row)">修改</el-button>
+				<el-button v-if=" (isAdmin)" text type="primary" @click="editForm(scope.row)">修改</el-button>
 
 				<el-button v-if="hasPermission('zsReimbursement:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3' )" text type="primary"   @click="edit(scope.row)">修改</el-button>
               <el-button v-if="hasPermission('zsReimbursement:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '4')" text type="primary"   @click="todo(scope.row)">驳回调整</el-button>