Преглед изворни кода

报销列表展示及新增调整

sangwenwei пре 11 месеци
родитељ
комит
2386de707f

+ 2 - 3
src/views/ccpm/reimbursement/info/InfoFormDetail.vue

@@ -14,7 +14,7 @@
         <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 		  <el-row >
 			  <el-col :span="12">
-				  <el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+				  <el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 								:rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -562,8 +562,7 @@
         </el-row>
 		  </div>
 		  <div v-if="inputForm.reimbursementType === '1'">
-			  <el-divider content-position="left"><i class="el-icon-document"></i>
-				  <span style="color: red;border-top: 20px">* </span>电子发票信息
+			  <el-divider content-position="left">电子发票信息
 				  <!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 					  新增
 				  </el-button>-->

+ 1 - 1
src/views/ccpm/reimbursement/info/InfoList.vue

@@ -171,7 +171,7 @@
               <span v-else>{{scope.row.no}}</span>
             </template>
           </vxe-column>
-			<vxe-column width="130" title="报销项" field="reimbursementType" align="center">
+			<vxe-column v-if="hasPermission('reimbursement:payment:view')" width="130" title="报销项" field="reimbursementType" align="center">
 				<template #default="scope">
 					{{$dictUtils.getDictLabel('reimbursement_type', scope.row.reimbursementType, '')}}
 				</template>

+ 2 - 3
src/views/ccpm/reimbursement/info/InfoUpdateForm.vue

@@ -17,7 +17,7 @@
 			<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 			<el-row >
 				<el-col :span="12">
-					<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+					<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 								  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -567,8 +567,7 @@
 				</el-row>
 			</div>
 			<div v-if="inputForm.reimbursementType === '1'">
-				<el-divider content-position="left"><i class="el-icon-document"></i>
-					<span style="color: red;border-top: 20px">* </span>
+				<el-divider content-position="left">
 					电子发票信息
 					<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 						新增

+ 10 - 11
src/views/ccpm/reimbursement/info/ReimbursementForm.vue

@@ -6,7 +6,7 @@
       <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 		<el-row >
 			<el-col :span="12">
-				<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+				<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 							  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -556,8 +556,7 @@
 		  </el-row>
 		</div>
 		<div v-if="inputForm.reimbursementType === '1'">
-			<el-divider content-position="left"><i class="el-icon-document"></i>
-				<span style="color: red;border-top: 20px">* </span>
+			<el-divider content-position="left">
 				电子发票信息
 				<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 					新增
@@ -786,7 +785,7 @@
         detailKeyOthers: '',
         detailKeyProcured: '',
         inputForm: {
-			reimbursementType: '0',
+			reimbursementType: '1',
           userId: '',
           userName: '',
           no: '',
@@ -907,7 +906,7 @@
       init (method, id) {
         this.method = method
         this.inputForm = {
-			reimbursementType: '0',
+			reimbursementType: '1',
           userName: '',
           no: '',
           department: '',
@@ -970,7 +969,7 @@
 				  this.inputForm.files = []
 			  }
 			  if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
-				  this.inputForm.reimbursementType = '0'
+				  this.inputForm.reimbursementType = '1'
 			  }
 			  if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
 				  this.payment = '已付款'
@@ -1451,11 +1450,11 @@
 			  this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 			  this.inputForm.files = this.$refs.uploadComponent.getDataList()
 			  this.dataFiltering()
-			  if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
-				  this.$message.error("请上传电子发票发票xml文件!")
-				  this.loading = false
-				  throw new Error("已填写电子发票信息,请上传对应发票的xml文件!")
-			  }
+			  // if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
+				//   this.$message.error("请上传电子发票发票xml文件!")
+				//   this.loading = false
+				//   throw new Error("已填写电子发票信息,请上传对应发票的xml文件!")
+			  // }
 			  //判定附件中xml文件数量是否小于电子发票报销行数量
 			  if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
 				  //获取电子报销行数

+ 1 - 1
src/views/common/InvoiceReimbursementUpLoadComponent.vue

@@ -1,7 +1,7 @@
 <!--文件上传组件-->
 <template>
   <div :key="uploadKey">
-    <el-divider v-if="showDivider" content-position="left"><i class="el-icon-document"></i><span style="color: red;border-top: 20px">* </span> {{dividerName}} </el-divider>
+    <el-divider v-if="showDivider" content-position="left"><i class="el-icon-document"></i> {{dividerName}} </el-divider>
     <el-upload ref="upload" style="display: inline-block; :show-header='status'" action=""
                :limit="999" :http-request="httpRequest"
                multiple

+ 2 - 3
src/views/consultancy/reimbursement/info/InfoForm.vue

@@ -14,7 +14,7 @@
         <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 		  <el-row >
 			  <el-col :span="12">
-				  <el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+				  <el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 								:rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -568,8 +568,7 @@
         </el-row>
 		  </div>
 		  <div v-if="inputForm.reimbursementType === '1'">
-			  <el-divider content-position="left"><i class="el-icon-document"></i>
-				  <span style="color: red;border-top: 20px">* </span>电子发票信息
+			  <el-divider content-position="left">电子发票信息
 				  <!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 					  新增
 				  </el-button>-->

+ 1 - 1
src/views/consultancy/reimbursement/info/InfoList.vue

@@ -171,7 +171,7 @@
               <span v-else>{{scope.row.no}}</span>
             </template>
           </vxe-column>
-			<vxe-column width="130" title="报销项" field="reimbursementType" align="center">
+			<vxe-column v-if="hasPermission('reimbursement:payment:view')" width="130" title="报销项" field="reimbursementType" align="center">
 				<template #default="scope">
 					{{$dictUtils.getDictLabel('reimbursement_type', scope.row.reimbursementType, '')}}
 				</template>

+ 2 - 3
src/views/consultancy/reimbursement/info/InfoUpdateForm.vue

@@ -17,7 +17,7 @@
       <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 		<el-row >
 			<el-col :span="12">
-				<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+				<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 							  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -561,8 +561,7 @@
 		  </el-row>
 		</div>
 		<div v-if="inputForm.reimbursementType === '1'">
-			<el-divider content-position="left"><i class="el-icon-document"></i>
-				<span style="color: red;border-top: 20px">* </span>
+			<el-divider content-position="left">
 				电子发票信息
 				<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 					新增

+ 10 - 11
src/views/consultancy/reimbursement/info/ReimbursementForm.vue

@@ -6,7 +6,7 @@
       <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 		<el-row >
 			<el-col :span="12">
-				<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+				<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 							  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -557,8 +557,7 @@
 		  </el-row>
 		</div>
 		<div v-if="inputForm.reimbursementType === '1'">
-			<el-divider content-position="left"><i class="el-icon-document"></i>
-				<span style="color: red;border-top: 20px">* </span>
+			<el-divider content-position="left">
 				电子发票信息
 				<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 					新增
@@ -787,7 +786,7 @@
         detailKeyOthers: '',
         detailKeyProcured: '',
         inputForm: {
-			reimbursementType: '0',
+			reimbursementType: '1',
           userId: '',
           userName: '',
           no: '',
@@ -905,7 +904,7 @@
       init (method, id) {
         this.method = method
         this.inputForm = {
-			reimbursementType: '0',
+			reimbursementType: '1',
           userName: '',
           no: '',
           department: '',
@@ -968,7 +967,7 @@
 				  this.inputForm.files = []
 			  }
 			  if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
-				  this.inputForm.reimbursementType = '0'
+				  this.inputForm.reimbursementType = '1'
 			  }
 			  if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
 				  this.payment = '已付款'
@@ -1398,11 +1397,11 @@
 			  this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 			  this.inputForm.files = this.$refs.uploadComponent.getDataList()
 			  this.dataFiltering()
-			  if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
-				  this.$message.error("请上传电子发票发票xml文件!")
-				  this.loading = false
-				  throw new Error("已填写电子发票信息,请上传对应发票的xml文件!")
-			  }
+			  // if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
+				//   this.$message.error("请上传电子发票发票xml文件!")
+				//   this.loading = false
+				//   throw new Error("已填写电子发票信息,请上传对应发票的xml文件!")
+			  // }
 			  //判定附件中xml文件数量是否小于电子发票报销行数量
 			  if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
 				  //获取电子报销行数

+ 2 - 3
src/views/cw/reimbursementApproval/info/InfoForm.vue

@@ -15,7 +15,7 @@
 				<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 				<el-row >
 					<el-col :span="12">
-						<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+						<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 									  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -638,8 +638,7 @@
 					</el-row>
 				</div>
 				<div v-if="inputForm.reimbursementType === '1'">
-					<el-divider content-position="left"><i class="el-icon-document"></i>
-						<span style="color: red;border-top: 20px">* </span>数电发票信息
+					<el-divider content-position="left">数电发票信息
 						<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 							新增
 						</el-button>-->

+ 1 - 1
src/views/cw/reimbursementApproval/info/InfoList.vue

@@ -179,7 +179,7 @@
 							<span v-else>{{scope.row.no}}</span>
 						</template>
 					</vxe-column>
-					<vxe-column width="130" title="报销项" field="reimbursementType" align="center">
+					<vxe-column v-if="hasPermission('reimbursement:payment:view')" width="130" title="报销项" field="reimbursementType" align="center">
 						<template #default="scope">
 							{{$dictUtils.getDictLabel('reimbursement_type', scope.row.reimbursementType, '')}}
 						</template>

+ 2 - 3
src/views/cw/reimbursementApproval/info/InfoUpdateForm.vue

@@ -17,7 +17,7 @@
 			<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 			<el-row >
 				<el-col :span="12">
-					<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+					<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 								  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -673,8 +673,7 @@
 				</el-row>
 			</div>
 			<div v-if="inputForm.reimbursementType === '1'">
-				<el-divider content-position="left"><i class="el-icon-document"></i>
-					<span style="color: red;border-top: 20px">* </span>
+				<el-divider content-position="left">
 					数电发票信息
 					<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 						新增

+ 9 - 10
src/views/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -6,7 +6,7 @@
 			<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 			<el-row >
 				<el-col :span="12">
-					<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+					<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 								  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -669,7 +669,6 @@
 			</div>
 			<div v-if="inputForm.reimbursementType === '1'">
 				<el-divider content-position="left"><i class="el-icon-document"></i>
-					<span style="color: red;border-top: 20px">* </span>
 					数电发票信息
 					<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 						新增
@@ -907,7 +906,7 @@
 				detailKeyProcured: '',
 				humanKeyProcured: '',
 				inputForm: {
-					reimbursementType: '0',
+					reimbursementType: '1',
 					userId: '',
 					userName: '',
 					no: '',
@@ -1037,7 +1036,7 @@
 			init (method, id) {
 				this.method = method
 				this.inputForm = {
-					reimbursementType: '0',
+					reimbursementType: '1',
 					userName: '',
 					no: '',
 					department: '',
@@ -1102,7 +1101,7 @@
 							this.inputForm.files = []
 						}
 						if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
-							this.inputForm.reimbursementType = '0'
+							this.inputForm.reimbursementType = '1'
 						}
 						if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
 							this.payment = '已付款'
@@ -1604,11 +1603,11 @@
 						this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 						this.inputForm.files = this.$refs.uploadComponent.getDataList()
 						this.dataFiltering()
-						if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
-							this.$message.error("请上传数电发票发票xml文件!")
-							this.loading = false
-							throw new Error("已填写数电发票信息,请上传对应发票的xml文件!")
-						}
+						// if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
+						// 	this.$message.error("请上传数电发票发票xml文件!")
+						// 	this.loading = false
+						// 	throw new Error("已填写数电发票信息,请上传对应发票的xml文件!")
+						// }
 						//判定附件中xml文件数量是否小于电子发票报销行数量
 						if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
 							//获取电子报销行数

+ 2 - 3
src/views/reimbursement/info/InfoFormDetail.vue

@@ -14,7 +14,7 @@
         <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 		  <el-row >
 			  <el-col :span="12">
-				  <el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+				  <el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 								:rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -591,8 +591,7 @@
         </el-row>
 		  </div>
 		  <div v-if="inputForm.reimbursementType === '1'">
-			  <el-divider content-position="left"><i class="el-icon-document"></i>
-				  <span style="color: red;border-top: 20px">* </span>数电发票信息
+			  <el-divider content-position="left">数电发票信息
 				  <!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 					  新增
 				  </el-button>-->

+ 1 - 1
src/views/reimbursement/info/InfoList.vue

@@ -162,7 +162,7 @@
               <span v-else>{{scope.row.no}}</span>
             </template>
           </vxe-column>
-			<vxe-column width="130" title="报销项" field="reimbursementType" align="center">
+			<vxe-column v-if="hasPermission('reimbursement:payment:view')" width="130" title="报销项" field="reimbursementType" align="center">
 				<template #default="scope">
 					{{$dictUtils.getDictLabel('reimbursement_type', scope.row.reimbursementType, '')}}
 				</template>

+ 2 - 3
src/views/reimbursement/info/InfoUpdateForm.vue

@@ -17,7 +17,7 @@
 			<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 			<el-row >
 				<el-col :span="12">
-					<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+					<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 								  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -642,8 +642,7 @@
 			</div>
 
 			<div v-if="inputForm.reimbursementType === '1'">
-				<el-divider content-position="left"><i class="el-icon-document"></i>
-					<span style="color: red;border-top: 20px">* </span>数电发票信息
+				<el-divider content-position="left">数电发票信息
 					<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 						新增
 					</el-button>-->

+ 10 - 11
src/views/reimbursement/info/ReimbursementForm.vue

@@ -6,7 +6,7 @@
 			<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 			<el-row >
 				<el-col :span="12">
-					<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+					<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 								  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -631,8 +631,7 @@
 			</div>
 
 			<div v-if="inputForm.reimbursementType === '1'">
-				<el-divider content-position="left"><i class="el-icon-document"></i>
-					<span style="color: red;border-top: 20px">* </span>数电发票信息
+				<el-divider content-position="left">数电发票信息
 					<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 						新增
 					</el-button>-->
@@ -854,7 +853,7 @@
 				detailKeyOthers: '',
 				detailKeyProcured: '',
 				inputForm: {
-					reimbursementType: '0',
+					reimbursementType: '1',
 					userId: '',
 					userName: '',
 					no: '',
@@ -992,7 +991,7 @@
 			init (method, id) {
 				this.method = method
 				this.inputForm = {
-					reimbursementType: '0',
+					reimbursementType: '1',
 					userId: '',
 					userName: '',
 					no: '',
@@ -1051,7 +1050,7 @@
 							this.inputForm.files = []
 						}
 						if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
-							this.inputForm.reimbursementType = '0'
+							this.inputForm.reimbursementType = '1'
 						}
 						if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
 							this.payment = '已付款'
@@ -1496,11 +1495,11 @@
 						this.inputForm.files = this.$refs.uploadComponent.getDataList()
 
 						this.dataFiltering()
-						if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
-							this.$message.error("请上传数电发票发票xml文件!")
-							this.loading = false
-							throw new Error("已填写数电发票信息,请上传对应发票的xml文件!")
-						}
+						// if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
+						// 	this.$message.error("请上传数电发票发票xml文件!")
+						// 	this.loading = false
+						// 	throw new Error("已填写数电发票信息,请上传对应发票的xml文件!")
+						// }
 						//判定附件中xml文件数量是否小于电子发票报销行数量
 						if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
 							//获取电子报销行数

+ 2 - 3
src/views/zs/reimbursement/info/InfoForm.vue

@@ -14,7 +14,7 @@
         <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 		  <el-row >
 			  <el-col :span="12">
-				  <el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+				  <el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 								:rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -568,8 +568,7 @@
         </el-row>
 		  </div>
 		  <div v-if="inputForm.reimbursementType === '1'">
-			  <el-divider content-position="left"><i class="el-icon-document"></i>
-				  <span style="color: red;border-top: 20px">* </span>数电发票信息
+			  <el-divider content-position="left">数电发票信息
 				  <!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 					  新增
 				  </el-button>-->

+ 1 - 1
src/views/zs/reimbursement/info/InfoList.vue

@@ -171,7 +171,7 @@
               <span v-else>{{scope.row.no}}</span>
             </template>
           </vxe-column>
-			<vxe-column width="130" title="报销项" field="reimbursementType" align="center">
+			<vxe-column v-if="hasPermission('reimbursement:payment:view')" width="130" title="报销项" field="reimbursementType" align="center">
 				<template #default="scope">
 					{{$dictUtils.getDictLabel('reimbursement_type', scope.row.reimbursementType, '')}}
 				</template>

+ 2 - 3
src/views/zs/reimbursement/info/InfoUpdateForm.vue

@@ -17,7 +17,7 @@
       <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 		<el-row >
 			<el-col :span="12">
-				<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+				<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 							  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -561,8 +561,7 @@
 		  </el-row>
 		</div>
 		<div v-if="inputForm.reimbursementType === '1'">
-			<el-divider content-position="left"><i class="el-icon-document"></i>
-				<span style="color: red;border-top: 20px">* </span>
+			<el-divider content-position="left">
 				数电发票信息
 				<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 					新增

+ 10 - 11
src/views/zs/reimbursement/info/ReimbursementForm.vue

@@ -6,7 +6,7 @@
       <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 		<el-row >
 			<el-col :span="12">
-				<el-form-item label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
+				<el-form-item hidden label="报销项" prop="reimbursementType" :disabled="status === 'audit' || status === 'taskFormDetail'"
 							  :rules="[
                         {required: true, message:'报销项不能为空', trigger:'blur'}
                ]">
@@ -556,8 +556,7 @@
 		  </el-row>
 		</div>
 		<div v-if="inputForm.reimbursementType === '1'">
-			<el-divider content-position="left"><i class="el-icon-document"></i>
-				<span style="color: red;border-top: 20px">* </span>
+			<el-divider content-position="left">
 				数电发票信息
 				<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
 					新增
@@ -786,7 +785,7 @@
         detailKeyOthers: '',
         detailKeyProcured: '',
         inputForm: {
-			reimbursementType: '0',
+			reimbursementType: '1',
           userId: '',
           userName: '',
           no: '',
@@ -904,7 +903,7 @@
       init (method, id) {
         this.method = method
         this.inputForm = {
-			reimbursementType: '0',
+			reimbursementType: '1',
           userName: '',
           no: '',
           department: '',
@@ -967,7 +966,7 @@
 				  this.inputForm.files = []
 			  }
 			  if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
-				  this.inputForm.reimbursementType = '0'
+				  this.inputForm.reimbursementType = '1'
 			  }
 			  if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
 				  this.payment = '已付款'
@@ -1397,11 +1396,11 @@
 			  this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 			  this.inputForm.files = this.$refs.uploadComponent.getDataList()
 			  this.dataFiltering()
-			  if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
-				  this.$message.error("请上传数电发票发票xml文件!")
-				  this.loading = false
-				  throw new Error("已填写数电发票信息,请上传对应发票的xml文件!")
-			  }
+			  // if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
+				//   this.$message.error("请上传数电发票发票xml文件!")
+				//   this.loading = false
+				//   throw new Error("已填写数电发票信息,请上传对应发票的xml文件!")
+			  // }
 			  //判定附件中xml文件数量是否小于电子发票报销行数量
 			  if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
 				  //获取电子报销行数