数电发票报销调整

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

@@ -567,96 +567,96 @@
 
         </el-row>
 		  </div>
-		  <div v-if="inputForm.reimbursementType === '1'">
-			  <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>-->
-			  </el-divider>
-			  <el-row  :gutter="15" >
-				  <el-col :span="24">
-					  <vxe-table
-						  border
-						  show-footer
-						  show-overflow
-						  ref="invoiceReimbursementTable"
-						  :footer-method="footerMethod1111"
-						  class="vxe-table-element"
-						  :data="inputForm.invoiceReimbursements"
-						  style="margin-left: 5em"
-						  @cell-click=""
-						  :key="invoiceReimbursementKey"
-						  @edit-closed=""
-						  highlight-current-row
-						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						  :edit-rules="invoiceReimbursementRules"
-					  >
-						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							  <template v-slot:edit="scope">
-								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									  <vxe-option
-										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										  :key="item.value"
-										  :label="item.label"
-										  :value="item.value">
-									  </vxe-option>
-								  </vxe-select>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							  <template v-slot:edit="scope">
-								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input disabled="true" v-model="scope.row.count" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <!--<vxe-table-column title="操作" width="100">
-							  <template #default="scope">
-								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							  </template>
-						  </vxe-table-column>-->
-					  </vxe-table>
-				  </el-col>
-			  </el-row>
-		  </div>
+<!--		  <div v-if="inputForm.reimbursementType === '1'">-->
+<!--			  <el-divider content-position="left">电子发票信息-->
+<!--				  &lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					  新增-->
+<!--				  </el-button>&ndash;&gt;-->
+<!--			  </el-divider>-->
+<!--			  <el-row  :gutter="15" >-->
+<!--				  <el-col :span="24">-->
+<!--					  <vxe-table-->
+<!--						  border-->
+<!--						  show-footer-->
+<!--						  show-overflow-->
+<!--						  ref="invoiceReimbursementTable"-->
+<!--						  :footer-method="footerMethod1111"-->
+<!--						  class="vxe-table-element"-->
+<!--						  :data="inputForm.invoiceReimbursements"-->
+<!--						  style="margin-left: 5em"-->
+<!--						  @cell-click=""-->
+<!--						  :key="invoiceReimbursementKey"-->
+<!--						  @edit-closed=""-->
+<!--						  highlight-current-row-->
+<!--						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						  :edit-rules="invoiceReimbursementRules"-->
+<!--					  >-->
+<!--						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									  <vxe-option-->
+<!--										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										  :key="item.value"-->
+<!--										  :label="item.label"-->
+<!--										  :value="item.value">-->
+<!--									  </vxe-option>-->
+<!--								  </vxe-select>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  &lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							  <template #default="scope">-->
+<!--								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>&ndash;&gt;-->
+<!--					  </vxe-table>-->
+<!--				  </el-col>-->
+<!--			  </el-row>-->
+<!--		  </div>-->
 
       </el-form>
 		<!-- 附件 -->
@@ -678,7 +678,7 @@
    // import ReimbursementService from '@/api/sys/ReimbursementService'
   import ReimbursementService from '@/api/consultancy/reimbursement/ReimbursementService'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
-   import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+   import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import XEUtils from 'xe-utils'
   // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
   // import MaterialManagementDialog from '../../../materialManagement/file/MaterialManagementDialog'
@@ -814,7 +814,7 @@
 				}else {
 					this.payment = '未付款'
 				}
-				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'南京兴光培训咨询有限公司')
 				this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
               if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {

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

@@ -561,92 +561,92 @@
 
         </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-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
-					  新增
-				  </el-button>-->
-			  </el-divider>
-			  <el-row  :gutter="15" >
-				  <el-col :span="24">
-					  <vxe-table
-						  border
-						  show-footer
-						  show-overflow
-						  ref="invoiceReimbursementTable"
-						  :footer-method="footerMethod1111"
-						  class="vxe-table-element"
-						  :data="inputForm.invoiceReimbursements"
-						  style="margin-left: 5em"
-						  @cell-click=""
-						  :key="invoiceReimbursementKey"
-						  @edit-closed=""
-						  highlight-current-row
-						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						  :edit-rules="invoiceReimbursementRules"
-					  >
-						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							  <template v-slot:edit="scope">
-								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									  <vxe-option
-										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										  :key="item.value"
-										  :label="item.label"
-										  :value="item.value">
-									  </vxe-option>
-								  </vxe-select>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							  <template v-slot:edit="scope">
-								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input disabled="true" v-model="scope.row.count" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <!--<vxe-table-column title="操作" width="100">
-							  <template #default="scope">
-								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							  </template>
-						  </vxe-table-column>-->
-					  </vxe-table>
-				  </el-col>
-			  </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>电子发票信息-->
+<!--				  &lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					  新增-->
+<!--				  </el-button>&ndash;&gt;-->
+<!--			  </el-divider>-->
+<!--			  <el-row  :gutter="15" >-->
+<!--				  <el-col :span="24">-->
+<!--					  <vxe-table-->
+<!--						  border-->
+<!--						  show-footer-->
+<!--						  show-overflow-->
+<!--						  ref="invoiceReimbursementTable"-->
+<!--						  :footer-method="footerMethod1111"-->
+<!--						  class="vxe-table-element"-->
+<!--						  :data="inputForm.invoiceReimbursements"-->
+<!--						  style="margin-left: 5em"-->
+<!--						  @cell-click=""-->
+<!--						  :key="invoiceReimbursementKey"-->
+<!--						  @edit-closed=""-->
+<!--						  highlight-current-row-->
+<!--						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						  :edit-rules="invoiceReimbursementRules"-->
+<!--					  >-->
+<!--						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									  <vxe-option-->
+<!--										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										  :key="item.value"-->
+<!--										  :label="item.label"-->
+<!--										  :value="item.value">-->
+<!--									  </vxe-option>-->
+<!--								  </vxe-select>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  &lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							  <template #default="scope">-->
+<!--								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>&ndash;&gt;-->
+<!--					  </vxe-table>-->
+<!--				  </el-col>-->
+<!--			  </el-row>-->
+<!--		  </div>-->
 
       </el-form>
 		<!-- 附件 -->
@@ -668,7 +668,7 @@
    // import ReimbursementService from '@/api/sys/ReimbursementService'
   import ReimbursementService from '@/api/consultancy/reimbursement/ReimbursementService'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
-   import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+   import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import XEUtils from 'xe-utils'
   // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
   // import MaterialManagementDialog from '../../../materialManagement/file/MaterialManagementDialog'
@@ -796,7 +796,7 @@
 				if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 					this.inputForm.reimbursementType = '0'
 				}
-				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'南京兴光培训咨询有限公司')
 				this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
               if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {

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

@@ -562,95 +562,95 @@
 
 		  </el-row>
 		</div>
-		<div v-if="inputForm.reimbursementType === '1'">
-			<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>-->
-			</el-divider>
-			<el-row  :gutter="15" >
-				<el-col :span="24">
-					<vxe-table
-						border
-						show-footer
-						show-overflow
-						ref="invoiceReimbursementTable"
-						class="vxe-table-element"
-						:data="inputForm.invoiceReimbursements"
-						style="margin-left: 5em"
-						:footer-method="footerMethod1111"
-						:key="invoiceReimbursementKey"
-						highlight-current-row
-						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						:edit-rules="invoiceReimbursementRules"
-					>
-						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							<template v-slot:edit="scope">
-								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									<vxe-option
-										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value">
-									</vxe-option>
-								</vxe-select>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							<template v-slot:edit="scope">
-								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input disabled="true" v-model="scope.row.count" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							</template>
-						</vxe-table-column>
-						<!--<vxe-table-column title="操作" width="100">
-							<template #default="scope">
-								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							</template>
-						</vxe-table-column>-->
-					</vxe-table>
-				</el-col>
-			</el-row>
-		</div>
+<!--		<div v-if="inputForm.reimbursementType === '1'">-->
+<!--			<el-divider content-position="left">-->
+<!--				电子发票信息-->
+<!--				&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					新增-->
+<!--				</el-button>&ndash;&gt;-->
+<!--			</el-divider>-->
+<!--			<el-row  :gutter="15" >-->
+<!--				<el-col :span="24">-->
+<!--					<vxe-table-->
+<!--						border-->
+<!--						show-footer-->
+<!--						show-overflow-->
+<!--						ref="invoiceReimbursementTable"-->
+<!--						class="vxe-table-element"-->
+<!--						:data="inputForm.invoiceReimbursements"-->
+<!--						style="margin-left: 5em"-->
+<!--						:footer-method="footerMethod1111"-->
+<!--						:key="invoiceReimbursementKey"-->
+<!--						highlight-current-row-->
+<!--						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						:edit-rules="invoiceReimbursementRules"-->
+<!--					>-->
+<!--						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									<vxe-option-->
+<!--										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										:key="item.value"-->
+<!--										:label="item.label"-->
+<!--										:value="item.value">-->
+<!--									</vxe-option>-->
+<!--								</vxe-select>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							<template #default="scope">-->
+<!--								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							</template>-->
+<!--						</vxe-table-column>&ndash;&gt;-->
+<!--					</vxe-table>-->
+<!--				</el-col>-->
+<!--			</el-row>-->
+<!--		</div>-->
 <!--      <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>-->
       <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
       <CwProgramPageForm ref="cwProgramPageForm3" @getProgram="getProgram3"></CwProgramPageForm>
@@ -693,7 +693,7 @@
   // import UserSelectV2 from '@/components/userSelect'
   import ReimbursementService from '@/api/consultancy/reimbursement/ReimbursementService'
   import ReimbursementTypeService from '@/api/consultancy/reimbursement/ReimbursementTypeService'
-  import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+  import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   // import SelectUserTree from '@/views/utils/treeUserSelect'
   // import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -985,7 +985,7 @@
 			  if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 				  this.inputForm.reimbursementType = '0'
 			  }
-            this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+            this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'南京兴光培训咨询有限公司')
             this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
             if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
               // this.startPur(this.inputForm.purchaseId)

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

@@ -556,95 +556,95 @@
 
 		  </el-row>
 		</div>
-		<div v-if="inputForm.reimbursementType === '1'">
-			<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>-->
-			</el-divider>
-			<el-row  :gutter="15" >
-				<el-col :span="24">
-					<vxe-table
-						border
-						show-footer
-						show-overflow
-						ref="invoiceReimbursementTable"
-						class="vxe-table-element"
-						:data="inputForm.invoiceReimbursements"
-						style="margin-left: 5em"
-						:footer-method="footerMethod1111"
-						:key="invoiceReimbursementKey"
-						highlight-current-row
-						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						:edit-rules="invoiceReimbursementRules"
-					>
-						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							<template v-slot:edit="scope">
-								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									<vxe-option
-										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value">
-									</vxe-option>
-								</vxe-select>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							<template v-slot:edit="scope">
-								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input disabled="true" v-model="scope.row.count" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							</template>
-						</vxe-table-column>
-						<!--<vxe-table-column title="操作" width="100">
-							<template #default="scope">
-								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							</template>
-						</vxe-table-column>-->
-					</vxe-table>
-				</el-col>
-			</el-row>
-		</div>
+<!--		<div v-if="inputForm.reimbursementType === '1'">-->
+<!--			<el-divider content-position="left">-->
+<!--				电子发票信息-->
+<!--				&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					新增-->
+<!--				</el-button>&ndash;&gt;-->
+<!--			</el-divider>-->
+<!--			<el-row  :gutter="15" >-->
+<!--				<el-col :span="24">-->
+<!--					<vxe-table-->
+<!--						border-->
+<!--						show-footer-->
+<!--						show-overflow-->
+<!--						ref="invoiceReimbursementTable"-->
+<!--						class="vxe-table-element"-->
+<!--						:data="inputForm.invoiceReimbursements"-->
+<!--						style="margin-left: 5em"-->
+<!--						:footer-method="footerMethod1111"-->
+<!--						:key="invoiceReimbursementKey"-->
+<!--						highlight-current-row-->
+<!--						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						:edit-rules="invoiceReimbursementRules"-->
+<!--					>-->
+<!--						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									<vxe-option-->
+<!--										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										:key="item.value"-->
+<!--										:label="item.label"-->
+<!--										:value="item.value">-->
+<!--									</vxe-option>-->
+<!--								</vxe-select>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							<template #default="scope">-->
+<!--								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							</template>-->
+<!--						</vxe-table-column>&ndash;&gt;-->
+<!--					</vxe-table>-->
+<!--				</el-col>-->
+<!--			</el-row>-->
+<!--		</div>-->
 <!--      <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>-->
       <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
       <CwProgramPageForm ref="cwProgramPageForm3" @getProgram="getProgram3"></CwProgramPageForm>
@@ -679,7 +679,7 @@
   // import UserSelectV2 from '@/components/userSelect'
   import ReimbursementService from '@/api/consultancy/reimbursement/ReimbursementService'
   import ReimbursementTypeService from '@/api/consultancy/reimbursement/ReimbursementTypeService'
-  import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+  import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   // import SelectUserTree from '@/views/utils/treeUserSelect'
   // import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -988,7 +988,7 @@
 				  }else {
 					  method = 'view'
 				  }
-				  this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+				  this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'南京兴光培训咨询有限公司')
 				  this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 			  })
 

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

@@ -556,95 +556,95 @@
 
 		  </el-row>
 		</div>
-		<div v-if="inputForm.reimbursementType === '1'">
-			<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>-->
-			</el-divider>
-			<el-row  :gutter="15" >
-				<el-col :span="24">
-					<vxe-table
-						border
-						show-footer
-						show-overflow
-						ref="invoiceReimbursementTable"
-						class="vxe-table-element"
-						:data="inputForm.invoiceReimbursements"
-						style="margin-left: 5em"
-						:footer-method="footerMethod1111"
-						:key="invoiceReimbursementKey"
-						highlight-current-row
-						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						:edit-rules="invoiceReimbursementRules"
-					>
-						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							<template v-slot:edit="scope">
-								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									<vxe-option
-										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value">
-									</vxe-option>
-								</vxe-select>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							<template v-slot:edit="scope">
-								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input disabled="true" v-model="scope.row.count" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							</template>
-						</vxe-table-column>
-						<!--<vxe-table-column title="操作" width="100">
-							<template #default="scope">
-								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							</template>
-						</vxe-table-column>-->
-					</vxe-table>
-				</el-col>
-			</el-row>
-		</div>
+<!--		<div v-if="inputForm.reimbursementType === '1'">-->
+<!--			<el-divider content-position="left">-->
+<!--				电子发票信息-->
+<!--				&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					新增-->
+<!--				</el-button>&ndash;&gt;-->
+<!--			</el-divider>-->
+<!--			<el-row  :gutter="15" >-->
+<!--				<el-col :span="24">-->
+<!--					<vxe-table-->
+<!--						border-->
+<!--						show-footer-->
+<!--						show-overflow-->
+<!--						ref="invoiceReimbursementTable"-->
+<!--						class="vxe-table-element"-->
+<!--						:data="inputForm.invoiceReimbursements"-->
+<!--						style="margin-left: 5em"-->
+<!--						:footer-method="footerMethod1111"-->
+<!--						:key="invoiceReimbursementKey"-->
+<!--						highlight-current-row-->
+<!--						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						:edit-rules="invoiceReimbursementRules"-->
+<!--					>-->
+<!--						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									<vxe-option-->
+<!--										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										:key="item.value"-->
+<!--										:label="item.label"-->
+<!--										:value="item.value">-->
+<!--									</vxe-option>-->
+<!--								</vxe-select>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							<template #default="scope">-->
+<!--								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							</template>-->
+<!--						</vxe-table-column>&ndash;&gt;-->
+<!--					</vxe-table>-->
+<!--				</el-col>-->
+<!--			</el-row>-->
+<!--		</div>-->
 <!--      <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>-->
       <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
       <CwProgramPageForm ref="cwProgramPageForm3" @getProgram="getProgram3"></CwProgramPageForm>
@@ -679,7 +679,7 @@
   // import UserSelectV2 from '@/components/userSelect'
   import ReimbursementService from '@/api/consultancy/reimbursement/ReimbursementService'
   import ReimbursementTypeService from '@/api/consultancy/reimbursement/ReimbursementTypeService'
-  import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+  import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   // import SelectUserTree from '@/views/utils/treeUserSelect'
   // import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -974,7 +974,7 @@
 			  }else {
 				  this.payment = '未付款'
 			  }
-            this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+            this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'南京兴光培训咨询有限公司')
             this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
             if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
               // this.startPur(this.inputForm.purchaseId)
@@ -1404,33 +1404,33 @@
 			  // }
 			  //判定附件中xml文件数量是否小于电子发票报销行数量
 			  let flag1 = false
-			  if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
+			  if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursementFiles) && "1" === this.inputForm.reimbursementType) {
 				  //获取电子报销行数
-				  let invoiceReimbursementCount = this.inputForm.invoiceReimbursements.length
-				  if(invoiceReimbursementCount>0){
-					  //获取附件信息以xml结尾的附件数量
-					  var flag = false;
-					  var countFlag = 0;
-
-					  for (var i=0; i<this.inputForm.invoiceReimbursementFiles.length; i++){
-						  //如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
-						  const spliceLength2 = this.inputForm.invoiceReimbursementFiles[i].name.lastIndexOf(".");
-						  var fileNameSuffix = this.inputForm.invoiceReimbursementFiles[i].name.slice(spliceLength2 + 1);
-						  if(fileNameSuffix === "xml" ) {
-							  flag = true;
-							  countFlag ++;
-						  }
-					  }
-					  if(!flag){
-						  this.$message.error("已填写电子发票信息，请上传对应发票的xml文件!")
-						  this.loading = false
-						  throw new Error("已填写电子发票信息，请上传对应发票的xml文件!")
-					  }
-				  }
+				  // let invoiceReimbursementCount = this.inputForm.invoiceReimbursements.length
+				  // if(invoiceReimbursementCount>0){
+					//   //获取附件信息以xml结尾的附件数量
+					//   var flag = false;
+					//   var countFlag = 0;
+				  //
+					//   for (var i=0; i<this.inputForm.invoiceReimbursementFiles.length; i++){
+					// 	  //如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
+					// 	  const spliceLength2 = this.inputForm.invoiceReimbursementFiles[i].name.lastIndexOf(".");
+					// 	  var fileNameSuffix = this.inputForm.invoiceReimbursementFiles[i].name.slice(spliceLength2 + 1);
+					// 	  if(fileNameSuffix === "xml" ) {
+					// 		  flag = true;
+					// 		  countFlag ++;
+					// 	  }
+					//   }
+					//   if(!flag){
+					// 	  this.$message.error("已填写电子发票信息，请上传对应发票的xml文件!")
+					// 	  this.loading = false
+					// 	  throw new Error("已填写电子发票信息，请上传对应发票的xml文件!")
+					//   }
+				  // }
 				  //数电发票信息不为空的时候在提交时需要再次判断看当前数电发票是否有存在其他发起或完成的报销
 				  let numbers =[];
-				  for (let i = 0; i < this.inputForm.invoiceReimbursements.length; i++) {
-					  numbers.push(this.inputForm.invoiceReimbursements[i].number)
+				  for (let i = 0; i < this.inputForm.invoiceReimbursementFiles.length; i++) {
+					  numbers.push(this.inputForm.invoiceReimbursementFiles[i].number)
 				  }
 				  const decide = await this.reimbursementService.getEffectiveDataByNumbers(numbers.join(","),this.inputForm.id)
 				  // .then((decide) => {

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

@@ -637,96 +637,96 @@
 						</el-col>
 					</el-row>
 				</div>
-				<div v-if="inputForm.reimbursementType === '1'">
-					<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>-->
-					</el-divider>
-					<el-row  :gutter="15" >
-						<el-col :span="24">
-							<vxe-table
-								border
-								show-footer
-								show-overflow
-								ref="invoiceReimbursementTable"
-								class="vxe-table-element"
-								:data="inputForm.invoiceReimbursements"
-								:footer-method="footerMethod1111"
-								style="margin-left: 5em"
-								@cell-click=""
-								:key="invoiceReimbursementKey"
-								@edit-closed=""
-								highlight-current-row
-								:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-								:edit-rules="invoiceReimbursementRules"
-							>
-								<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-									<template v-slot:edit="scope">
-										<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-											<vxe-option
-												v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-												:key="item.value"
-												:label="item.label"
-												:value="item.value">
-											</vxe-option>
-										</vxe-select>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-									<template v-slot:edit="scope">
-										<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input disabled="true" v-model="scope.row.count" ></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-									</template>
-								</vxe-table-column>
-								<!--<vxe-table-column title="操作" width="100">
-									<template #default="scope">
-										<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-									</template>
-								</vxe-table-column>-->
-							</vxe-table>
-						</el-col>
-					</el-row>
-				</div>
+<!--				<div v-if="inputForm.reimbursementType === '1'">-->
+<!--					<el-divider content-position="left">数电发票信息-->
+<!--						&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--							新增-->
+<!--						</el-button>&ndash;&gt;-->
+<!--					</el-divider>-->
+<!--					<el-row  :gutter="15" >-->
+<!--						<el-col :span="24">-->
+<!--							<vxe-table-->
+<!--								border-->
+<!--								show-footer-->
+<!--								show-overflow-->
+<!--								ref="invoiceReimbursementTable"-->
+<!--								class="vxe-table-element"-->
+<!--								:data="inputForm.invoiceReimbursements"-->
+<!--								:footer-method="footerMethod1111"-->
+<!--								style="margin-left: 5em"-->
+<!--								@cell-click=""-->
+<!--								:key="invoiceReimbursementKey"-->
+<!--								@edit-closed=""-->
+<!--								highlight-current-row-->
+<!--								:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--								:edit-rules="invoiceReimbursementRules"-->
+<!--							>-->
+<!--								<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--									<template v-slot:edit="scope">-->
+<!--										<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--											<vxe-option-->
+<!--												v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--												:key="item.value"-->
+<!--												:label="item.label"-->
+<!--												:value="item.value">-->
+<!--											</vxe-option>-->
+<!--										</vxe-select>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--									<template v-slot:edit="scope">-->
+<!--										<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--									<template #default="scope">-->
+<!--										<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--									</template>-->
+<!--								</vxe-table-column>&ndash;&gt;-->
+<!--							</vxe-table>-->
+<!--						</el-col>-->
+<!--					</el-row>-->
+<!--				</div>-->
 
 			</el-form>
 			<!-- 附件 -->
@@ -746,7 +746,7 @@
 <script>
 	import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
-	import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+	import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
 	import XEUtils from 'xe-utils'
 	// import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 	// import MaterialManagementDialog from '../../../materialManagement/file/MaterialManagementDialog'
@@ -882,7 +882,7 @@
 							}else {
 								this.payment = '未付款'
 							}
-							this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+							this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'江苏兴光会计师事务所有限责任公司')
 							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 							this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
 							if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {

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

@@ -631,92 +631,92 @@
 						</el-col>
 					</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-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
-							新增
-						</el-button>-->
-					</el-divider>
-					<el-row  :gutter="15" >
-						<el-col :span="24">
-							<vxe-table
-								border
-								show-footer
-								show-overflow
-								ref="invoiceReimbursementTable"
-								class="vxe-table-element"
-								:data="inputForm.invoiceReimbursements"
-								:footer-method="footerMethod1111"
-								style="margin-left: 5em"
-								@cell-click=""
-								:key="invoiceReimbursementKey"
-								@edit-closed=""
-								highlight-current-row
-								:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-								:edit-rules="invoiceReimbursementRules"
-							>
-								<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-									<template v-slot:edit="scope">
-										<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-											<vxe-option
-												v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-												:key="item.value"
-												:label="item.label"
-												:value="item.value">
-											</vxe-option>
-										</vxe-select>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-									<template v-slot:edit="scope">
-										<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input disabled="true" v-model="scope.row.count" ></el-input>
-									</template>
-								</vxe-table-column>
-								<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-									<template #edit="scope">
-										<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-									</template>
-								</vxe-table-column>
-								<!--<vxe-table-column title="操作" width="100">
-									<template #default="scope">
-										<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-									</template>
-								</vxe-table-column>-->
-							</vxe-table>
-						</el-col>
-					</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>数电发票信息-->
+<!--						&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--							新增-->
+<!--						</el-button>&ndash;&gt;-->
+<!--					</el-divider>-->
+<!--					<el-row  :gutter="15" >-->
+<!--						<el-col :span="24">-->
+<!--							<vxe-table-->
+<!--								border-->
+<!--								show-footer-->
+<!--								show-overflow-->
+<!--								ref="invoiceReimbursementTable"-->
+<!--								class="vxe-table-element"-->
+<!--								:data="inputForm.invoiceReimbursements"-->
+<!--								:footer-method="footerMethod1111"-->
+<!--								style="margin-left: 5em"-->
+<!--								@cell-click=""-->
+<!--								:key="invoiceReimbursementKey"-->
+<!--								@edit-closed=""-->
+<!--								highlight-current-row-->
+<!--								:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--								:edit-rules="invoiceReimbursementRules"-->
+<!--							>-->
+<!--								<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--									<template v-slot:edit="scope">-->
+<!--										<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--											<vxe-option-->
+<!--												v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--												:key="item.value"-->
+<!--												:label="item.label"-->
+<!--												:value="item.value">-->
+<!--											</vxe-option>-->
+<!--										</vxe-select>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--									<template v-slot:edit="scope">-->
+<!--										<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--									<template #edit="scope">-->
+<!--										<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--									</template>-->
+<!--								</vxe-table-column>-->
+<!--								&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--									<template #default="scope">-->
+<!--										<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--									</template>-->
+<!--								</vxe-table-column>&ndash;&gt;-->
+<!--							</vxe-table>-->
+<!--						</el-col>-->
+<!--					</el-row>-->
+<!--				</div>-->
 
 			</el-form>
 			<!-- 附件 -->
@@ -736,7 +736,7 @@
 <script>
 	import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
-	import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+	import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
 	import XEUtils from 'xe-utils'
 	// import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 	// import MaterialManagementDialog from '../../../materialManagement/file/MaterialManagementDialog'
@@ -863,7 +863,7 @@
 							if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 								this.inputForm.reimbursementType = '0'
 							}
-							this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+							this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'江苏兴光会计师事务所有限责任公司')
 							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 							this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
 							if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {

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

@@ -674,95 +674,95 @@
 					</el-col>
 				</el-row>
 			</div>
-			<div v-if="inputForm.reimbursementType === '1'">
-				<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>-->
-				</el-divider>
-				<el-row  :gutter="15" >
-					<el-col :span="24">
-						<vxe-table
-							border
-							show-footer
-							show-overflow
-							ref="invoiceReimbursementTable"
-							class="vxe-table-element"
-							:data="inputForm.invoiceReimbursements"
-							:footer-method="footerMethod1111"
-							style="margin-left: 5em"
-							:key="invoiceReimbursementKey"
-							highlight-current-row
-							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-							:edit-rules="invoiceReimbursementRules"
-						>
-							<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-								<template v-slot:edit="scope">
-									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-										<vxe-option
-											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-											:key="item.value"
-											:label="item.label"
-											:value="item.value">
-										</vxe-option>
-									</vxe-select>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)"  v-model="scope.row.number" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-								<template v-slot:edit="scope">
-									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="date" transfer placeholder="请选择日期"></vxe-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input disabled="true" v-model="scope.row.count" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-								</template>
-							</vxe-table-column>
-							<!--<vxe-table-column title="操作" width="100">
-								<template #default="scope">
-									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-								</template>
-							</vxe-table-column>-->
-						</vxe-table>
-					</el-col>
-				</el-row>
-			</div>
+<!--			<div v-if="inputForm.reimbursementType === '1'">-->
+<!--				<el-divider content-position="left">-->
+<!--					数电发票信息-->
+<!--					&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--						新增-->
+<!--					</el-button>&ndash;&gt;-->
+<!--				</el-divider>-->
+<!--				<el-row  :gutter="15" >-->
+<!--					<el-col :span="24">-->
+<!--						<vxe-table-->
+<!--							border-->
+<!--							show-footer-->
+<!--							show-overflow-->
+<!--							ref="invoiceReimbursementTable"-->
+<!--							class="vxe-table-element"-->
+<!--							:data="inputForm.invoiceReimbursements"-->
+<!--							:footer-method="footerMethod1111"-->
+<!--							style="margin-left: 5em"-->
+<!--							:key="invoiceReimbursementKey"-->
+<!--							highlight-current-row-->
+<!--							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--							:edit-rules="invoiceReimbursementRules"-->
+<!--						>-->
+<!--							<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--										<vxe-option-->
+<!--											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--											:key="item.value"-->
+<!--											:label="item.label"-->
+<!--											:value="item.value">-->
+<!--										</vxe-option>-->
+<!--									</vxe-select>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)"  v-model="scope.row.number" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="date" transfer placeholder="请选择日期"></vxe-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--								<template #default="scope">-->
+<!--									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--								</template>-->
+<!--							</vxe-table-column>&ndash;&gt;-->
+<!--						</vxe-table>-->
+<!--					</el-col>-->
+<!--				</el-row>-->
+<!--			</div>-->
 
 			<!--      <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>-->
 			<CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
@@ -811,7 +811,7 @@
 	import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
 	// import ReimbursementTypeService from '@/api/sys/ReimbursementTypeService'
 	import ReimbursementApprovalTypeService from '@/api/cw/reimbursementApproval/ReimbursementApprovalTypeService'
-	import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+	import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import XEUtils from 'xe-utils'
 	// import ProgramPageForm from '@/views/modules/finance/invoice/ProgramPageForm'
@@ -1118,7 +1118,7 @@
 						if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 							this.inputForm.reimbursementType = '0'
 						}
-						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'江苏兴光会计师事务所有限责任公司')
 						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
 							this.startPur(this.inputForm.purchaseId)

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

@@ -667,95 +667,95 @@
 					</el-col>
 				</el-row>
 			</div>
-			<div v-if="inputForm.reimbursementType === '1'">
-				<el-divider content-position="left"><i class="el-icon-document"></i>
-					数电发票信息
-					<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
-						新增
-					</el-button>-->
-				</el-divider>
-				<el-row  :gutter="15" >
-					<el-col :span="24">
-						<vxe-table
-							border
-							show-footer
-							show-overflow
-							ref="invoiceReimbursementTable"
-							class="vxe-table-element"
-							:data="inputForm.invoiceReimbursements"
-							:footer-method="footerMethod1111"
-							style="margin-left: 5em"
-							:key="invoiceReimbursementKey"
-							highlight-current-row
-							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-							:edit-rules="invoiceReimbursementRules"
-						>
-							<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-								<template v-slot:edit="scope">
-									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-										<vxe-option
-											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-											:key="item.value"
-											:label="item.label"
-											:value="item.value">
-										</vxe-option>
-									</vxe-select>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)"  v-model="scope.row.number" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-								<template v-slot:edit="scope">
-									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="date" transfer placeholder="请选择日期"></vxe-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input disabled="true" v-model="scope.row.count" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-								</template>
-							</vxe-table-column>
-							<!--<vxe-table-column title="操作" width="100">
-								<template #default="scope">
-									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-								</template>
-							</vxe-table-column>-->
-						</vxe-table>
-					</el-col>
-				</el-row>
-			</div>
+<!--			<div v-if="inputForm.reimbursementType === '1'">-->
+<!--				<el-divider content-position="left"><i class="el-icon-document"></i>-->
+<!--					数电发票信息-->
+<!--					&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--						新增-->
+<!--					</el-button>&ndash;&gt;-->
+<!--				</el-divider>-->
+<!--				<el-row  :gutter="15" >-->
+<!--					<el-col :span="24">-->
+<!--						<vxe-table-->
+<!--							border-->
+<!--							show-footer-->
+<!--							show-overflow-->
+<!--							ref="invoiceReimbursementTable"-->
+<!--							class="vxe-table-element"-->
+<!--							:data="inputForm.invoiceReimbursements"-->
+<!--							:footer-method="footerMethod1111"-->
+<!--							style="margin-left: 5em"-->
+<!--							:key="invoiceReimbursementKey"-->
+<!--							highlight-current-row-->
+<!--							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--							:edit-rules="invoiceReimbursementRules"-->
+<!--						>-->
+<!--							<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--										<vxe-option-->
+<!--											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--											:key="item.value"-->
+<!--											:label="item.label"-->
+<!--											:value="item.value">-->
+<!--										</vxe-option>-->
+<!--									</vxe-select>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)"  v-model="scope.row.number" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="date" transfer placeholder="请选择日期"></vxe-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--								<template #default="scope">-->
+<!--									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--								</template>-->
+<!--							</vxe-table-column>&ndash;&gt;-->
+<!--						</vxe-table>-->
+<!--					</el-col>-->
+<!--				</el-row>-->
+<!--			</div>-->
 
 			<!--      <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>-->
 			<CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
@@ -796,7 +796,7 @@
 	import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
 	// import ReimbursementTypeService from '@/api/sys/ReimbursementTypeService'
 	import ReimbursementApprovalTypeService from '@/api/cw/reimbursementApproval/ReimbursementApprovalTypeService'
-	import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+	import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import XEUtils from 'xe-utils'
 	// import ProgramPageForm from '@/views/modules/finance/invoice/ProgramPageForm'
@@ -1122,7 +1122,7 @@
 							}else {
 								method = 'view'
 							}
-							this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'invoiceReimbursement',300,'电子发票附件')
+							this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'invoiceReimbursement',300,'数电发票信息',null,null,null,'江苏兴光会计师事务所有限责任公司')
 							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 						})
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {

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

@@ -667,95 +667,95 @@
 					</el-col>
 				</el-row>
 			</div>
-			<div v-if="inputForm.reimbursementType === '1'">
-				<el-divider content-position="left"><i class="el-icon-document"></i>
-					数电发票信息
-					<!--<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
-						新增
-					</el-button>-->
-				</el-divider>
-				<el-row  :gutter="15" >
-					<el-col :span="24">
-						<vxe-table
-							border
-							show-footer
-							show-overflow
-							ref="invoiceReimbursementTable"
-							class="vxe-table-element"
-							:data="inputForm.invoiceReimbursements"
-							:footer-method="footerMethod1111"
-							style="margin-left: 5em"
-							:key="invoiceReimbursementKey"
-							highlight-current-row
-							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-							:edit-rules="invoiceReimbursementRules"
-						>
-							<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-								<template v-slot:edit="scope">
-									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-										<vxe-option
-											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-											:key="item.value"
-											:label="item.label"
-											:value="item.value">
-										</vxe-option>
-									</vxe-select>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)"  v-model="scope.row.number" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-								<template v-slot:edit="scope">
-									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="date" transfer placeholder="请选择日期"></vxe-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input disabled="true" v-model="scope.row.count" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-								</template>
-							</vxe-table-column>
-							<!--<vxe-table-column title="操作" width="100">
-								<template #default="scope">
-									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-								</template>
-							</vxe-table-column>-->
-						</vxe-table>
-					</el-col>
-				</el-row>
-			</div>
+<!--			<div v-if="inputForm.reimbursementType === '1'">-->
+<!--				<el-divider content-position="left"><i class="el-icon-document"></i>-->
+<!--					数电发票信息-->
+<!--					&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--						新增-->
+<!--					</el-button>&ndash;&gt;-->
+<!--				</el-divider>-->
+<!--				<el-row  :gutter="15" >-->
+<!--					<el-col :span="24">-->
+<!--						<vxe-table-->
+<!--							border-->
+<!--							show-footer-->
+<!--							show-overflow-->
+<!--							ref="invoiceReimbursementTable"-->
+<!--							class="vxe-table-element"-->
+<!--							:data="inputForm.invoiceReimbursements"-->
+<!--							:footer-method="footerMethod1111"-->
+<!--							style="margin-left: 5em"-->
+<!--							:key="invoiceReimbursementKey"-->
+<!--							highlight-current-row-->
+<!--							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--							:edit-rules="invoiceReimbursementRules"-->
+<!--						>-->
+<!--							<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--										<vxe-option-->
+<!--											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--											:key="item.value"-->
+<!--											:label="item.label"-->
+<!--											:value="item.value">-->
+<!--										</vxe-option>-->
+<!--									</vxe-select>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)"  v-model="scope.row.number" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="date" transfer placeholder="请选择日期"></vxe-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--								<template #default="scope">-->
+<!--									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--								</template>-->
+<!--							</vxe-table-column>&ndash;&gt;-->
+<!--						</vxe-table>-->
+<!--					</el-col>-->
+<!--				</el-row>-->
+<!--			</div>-->
 
 			<!--      <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>-->
 			<CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
@@ -796,7 +796,7 @@
 	import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/ReimbursementApprovalService'
 	// import ReimbursementTypeService from '@/api/sys/ReimbursementTypeService'
 	import ReimbursementApprovalTypeService from '@/api/cw/reimbursementApproval/ReimbursementApprovalTypeService'
-	import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+	import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import XEUtils from 'xe-utils'
 	// import ProgramPageForm from '@/views/modules/finance/invoice/ProgramPageForm'
@@ -1108,7 +1108,7 @@
 						}else {
 							this.payment = '未付款'
 						}
-						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'江苏兴光会计师事务所有限责任公司')
 						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
 							this.startPur(this.inputForm.purchaseId)
@@ -1610,33 +1610,33 @@
 						// }
 						//判定附件中xml文件数量是否小于电子发票报销行数量
 						let flag1 = false
-						if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
+						if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursementFiles) && "1" === this.inputForm.reimbursementType) {
 							//获取电子报销行数
-							let invoiceReimbursementCount = this.inputForm.invoiceReimbursements.length
-							if(invoiceReimbursementCount>0){
-								//获取附件信息以xml结尾的附件数量
-								var flag = false;
-								var countFlag = 0;
-
-								for (var i=0; i<this.inputForm.invoiceReimbursementFiles.length; i++){
-									//如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
-									const spliceLength2 = this.inputForm.invoiceReimbursementFiles[i].name.lastIndexOf(".");
-									var fileNameSuffix = this.inputForm.invoiceReimbursementFiles[i].name.slice(spliceLength2 + 1);
-									if(fileNameSuffix === "xml" ) {
-										flag = true;
-										countFlag ++;
-									}
-								}
-								if(!flag){
-									this.$message.error("已填写数电发票信息，请上传对应发票的xml文件!")
-									this.loading = false
-									throw new Error("已填写数电发票信息，请上传对应发票的xml文件!")
-								}
-							}
+							// let invoiceReimbursementCount = this.inputForm.invoiceReimbursements.length
+							// if(invoiceReimbursementCount>0){
+							// 	//获取附件信息以xml结尾的附件数量
+							// 	var flag = false;
+							// 	var countFlag = 0;
+							//
+							// 	for (var i=0; i<this.inputForm.invoiceReimbursementFiles.length; i++){
+							// 		//如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
+							// 		const spliceLength2 = this.inputForm.invoiceReimbursementFiles[i].name.lastIndexOf(".");
+							// 		var fileNameSuffix = this.inputForm.invoiceReimbursementFiles[i].name.slice(spliceLength2 + 1);
+							// 		if(fileNameSuffix === "xml" ) {
+							// 			flag = true;
+							// 			countFlag ++;
+							// 		}
+							// 	}
+							// 	if(!flag){
+							// 		this.$message.error("已填写数电发票信息，请上传对应发票的xml文件!")
+							// 		this.loading = false
+							// 		throw new Error("已填写数电发票信息，请上传对应发票的xml文件!")
+							// 	}
+							// }
 							//数电发票信息不为空的时候在提交时需要再次判断看当前数电发票是否有存在其他发起或完成的报销
 							let numbers =[];
-							for (let i = 0; i < this.inputForm.invoiceReimbursements.length; i++) {
-								numbers.push(this.inputForm.invoiceReimbursements[i].number)
+							for (let i = 0; i < this.inputForm.invoiceReimbursementFiles.length; i++) {
+								numbers.push(this.inputForm.invoiceReimbursementFiles[i].number)
 							}
 							const decide = await this.reimbursementApprovalService.getEffectiveDataByNumbers(numbers.join(","),this.inputForm.id)
 							// .then((decide) => {

src/views/reimbursement/info/InfoFormDetail.vue

@@ -590,91 +590,91 @@
 
         </el-row>
 		  </div>
-		  <div v-if="inputForm.reimbursementType === '1'">
-			  <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>-->
-			  </el-divider>
-			  <el-row  :gutter="15" >
-				  <el-col :span="24">
-					  <vxe-table
-						  border
-						  show-footer
-						  show-overflow
-						  ref="invoiceReimbursementTable"
-						  class="vxe-table-element"
-						  :data="inputForm.invoiceReimbursements"
-						  :footer-method="footerMethod1111"
-						  style="margin-left: 5em"
-						  @cell-click=""
-						  :key="invoiceReimbursementKey"
-						  @edit-closed=""
-						  highlight-current-row
-						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						  :edit-rules="invoiceReimbursementRules"
-					  >
-						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							  <template v-slot:edit="scope">
-								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									  <vxe-option
-										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										  :key="item.value"
-										  :label="item.label"
-										  :value="item.value">
-									  </vxe-option>
-								  </vxe-select>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							  <template v-slot:edit="scope">
-								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input disabled="true" v-model="scope.row.count" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <!--<vxe-table-column title="操作" width="100">
-							  <template #default="scope">
-								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							  </template>
-						  </vxe-table-column>-->
-					  </vxe-table>
-				  </el-col>
-			  </el-row>
-		  </div>
+<!--		  <div v-if="inputForm.reimbursementType === '1'">-->
+<!--			  <el-divider content-position="left">数电发票信息-->
+<!--				  &lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					  新增-->
+<!--				  </el-button>&ndash;&gt;-->
+<!--			  </el-divider>-->
+<!--			  <el-row  :gutter="15" >-->
+<!--				  <el-col :span="24">-->
+<!--					  <vxe-table-->
+<!--						  border-->
+<!--						  show-footer-->
+<!--						  show-overflow-->
+<!--						  ref="invoiceReimbursementTable"-->
+<!--						  class="vxe-table-element"-->
+<!--						  :data="inputForm.invoiceReimbursements"-->
+<!--						  :footer-method="footerMethod1111"-->
+<!--						  style="margin-left: 5em"-->
+<!--						  @cell-click=""-->
+<!--						  :key="invoiceReimbursementKey"-->
+<!--						  @edit-closed=""-->
+<!--						  highlight-current-row-->
+<!--						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						  :edit-rules="invoiceReimbursementRules"-->
+<!--					  >-->
+<!--						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									  <vxe-option-->
+<!--										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										  :key="item.value"-->
+<!--										  :label="item.label"-->
+<!--										  :value="item.value">-->
+<!--									  </vxe-option>-->
+<!--								  </vxe-select>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  &lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							  <template #default="scope">-->
+<!--								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>&ndash;&gt;-->
+<!--					  </vxe-table>-->
+<!--				  </el-col>-->
+<!--			  </el-row>-->
+<!--		  </div>-->
 
       </el-form>
 		<!-- 附件 -->
@@ -693,7 +693,7 @@
 <script>
   import ReimbursementService from '@/api/sys/ReimbursementService'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
-  import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+  import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
   import XEUtils from 'xe-utils'
   export default {
@@ -860,7 +860,7 @@
 				if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 					this.inputForm.reimbursementType = '0'
 				}
-				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'电子发票附件')
+				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'数电发票信息',null,null,null,'江苏兴光资产评估有限公司')
 				this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement_ping_gu')
               if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
                 this.startPur(this.inputForm.purchaseId)

src/views/reimbursement/info/InfoUpdateForm.vue

@@ -643,96 +643,96 @@
 				</el-row>
 			</div>
 
-			<div v-if="inputForm.reimbursementType === '1'">
-				<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>-->
-				</el-divider>
-				<el-row  :gutter="15" >
-					<el-col :span="24">
-						<vxe-table
-							border
-							show-footer
-							show-overflow
-							ref="invoiceReimbursementTable"
-							class="vxe-table-element"
-							:data="inputForm.invoiceReimbursements"
-							:footer-method="footerMethod1111"
-							style="margin-left: 5em"
-							@cell-click=""
-							:key="invoiceReimbursementKey"
-							@edit-closed=""
-							highlight-current-row
-							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-							:edit-rules="invoiceReimbursementRules"
-						>
-							<vxe-table-column  field="invoiceType" title="发票类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-								<template v-slot:edit="scope">
-									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-										<vxe-option
-											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-											:key="item.value"
-											:label="item.label"
-											:value="item.value">
-										</vxe-option>
-									</vxe-select>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-								<template v-slot:edit="scope">
-									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input disabled="true" v-model="scope.row.count" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-								</template>
-							</vxe-table-column>
-							<!--<vxe-table-column title="操作" width="100">
-								<template #default="scope">
-									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-								</template>
-							</vxe-table-column>-->
-						</vxe-table>
-					</el-col>
-				</el-row>
-			</div>
+<!--			<div v-if="inputForm.reimbursementType === '1'">-->
+<!--				<el-divider content-position="left">数电发票信息-->
+<!--					&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--						新增-->
+<!--					</el-button>&ndash;&gt;-->
+<!--				</el-divider>-->
+<!--				<el-row  :gutter="15" >-->
+<!--					<el-col :span="24">-->
+<!--						<vxe-table-->
+<!--							border-->
+<!--							show-footer-->
+<!--							show-overflow-->
+<!--							ref="invoiceReimbursementTable"-->
+<!--							class="vxe-table-element"-->
+<!--							:data="inputForm.invoiceReimbursements"-->
+<!--							:footer-method="footerMethod1111"-->
+<!--							style="margin-left: 5em"-->
+<!--							@cell-click=""-->
+<!--							:key="invoiceReimbursementKey"-->
+<!--							@edit-closed=""-->
+<!--							highlight-current-row-->
+<!--							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--							:edit-rules="invoiceReimbursementRules"-->
+<!--						>-->
+<!--							<vxe-table-column  field="invoiceType" title="发票类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--										<vxe-option-->
+<!--											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--											:key="item.value"-->
+<!--											:label="item.label"-->
+<!--											:value="item.value">-->
+<!--										</vxe-option>-->
+<!--									</vxe-select>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--								<template #default="scope">-->
+<!--									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--								</template>-->
+<!--							</vxe-table-column>&ndash;&gt;-->
+<!--						</vxe-table>-->
+<!--					</el-col>-->
+<!--				</el-row>-->
+<!--			</div>-->
 
 
 		</el-form>
@@ -780,7 +780,7 @@
 	import ReimbursementApprovalTypeService from '@/api/pubmodules/ReimbursementApprovalTypeService'
 	import ReimbursementService from '@/api/sys/ReimbursementService'
 	import ReimbursementTypeService from '@/api/sys/ReimbursementTypeService'
-	import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+	import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import SelectUserTree from '@/views/utils/treeUserSelect'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -1083,7 +1083,7 @@
 						}else {
 							this.payment = '未付款'
 						}
-						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'电子发票附件')
+						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'数电发票信息',null,null,null,'江苏兴光资产评估有限公司')
 						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement_ping_gu')
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
 							// this.startPur(this.inputForm.purchaseId)

src/views/reimbursement/info/ReimbursementFileSupplementForm.vue

@@ -630,96 +630,96 @@
 				</el-row>
 			</div>
 
-			<div v-if="inputForm.reimbursementType === '1'">
-				<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>-->
-				</el-divider>
-				<el-row  :gutter="15" >
-					<el-col :span="24">
-						<vxe-table
-							border
-							show-footer
-							show-overflow
-							ref="invoiceReimbursementTable"
-							class="vxe-table-element"
-							:data="inputForm.invoiceReimbursements"
-							:footer-method="footerMethod1111"
-							style="margin-left: 5em"
-							@cell-click=""
-							:key="invoiceReimbursementKey"
-							@edit-closed=""
-							highlight-current-row
-							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-							:edit-rules="invoiceReimbursementRules"
-						>
-							<vxe-table-column  field="invoiceType" title="发票类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-								<template v-slot:edit="scope">
-									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-										<vxe-option
-											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-											:key="item.value"
-											:label="item.label"
-											:value="item.value">
-										</vxe-option>
-									</vxe-select>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-								<template v-slot:edit="scope">
-									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input disabled="true" v-model="scope.row.count" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-								</template>
-							</vxe-table-column>
-							<!--<vxe-table-column title="操作" width="100">
-								<template #default="scope">
-									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-								</template>
-							</vxe-table-column>-->
-						</vxe-table>
-					</el-col>
-				</el-row>
-			</div>
+<!--			<div v-if="inputForm.reimbursementType === '1'">-->
+<!--				<el-divider content-position="left">数电发票信息-->
+<!--					&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--						新增-->
+<!--					</el-button>&ndash;&gt;-->
+<!--				</el-divider>-->
+<!--				<el-row  :gutter="15" >-->
+<!--					<el-col :span="24">-->
+<!--						<vxe-table-->
+<!--							border-->
+<!--							show-footer-->
+<!--							show-overflow-->
+<!--							ref="invoiceReimbursementTable"-->
+<!--							class="vxe-table-element"-->
+<!--							:data="inputForm.invoiceReimbursements"-->
+<!--							:footer-method="footerMethod1111"-->
+<!--							style="margin-left: 5em"-->
+<!--							@cell-click=""-->
+<!--							:key="invoiceReimbursementKey"-->
+<!--							@edit-closed=""-->
+<!--							highlight-current-row-->
+<!--							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--							:edit-rules="invoiceReimbursementRules"-->
+<!--						>-->
+<!--							<vxe-table-column  field="invoiceType" title="发票类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--										<vxe-option-->
+<!--											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--											:key="item.value"-->
+<!--											:label="item.label"-->
+<!--											:value="item.value">-->
+<!--										</vxe-option>-->
+<!--									</vxe-select>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--								<template #default="scope">-->
+<!--									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--								</template>-->
+<!--							</vxe-table-column>&ndash;&gt;-->
+<!--						</vxe-table>-->
+<!--					</el-col>-->
+<!--				</el-row>-->
+<!--			</div>-->
 
 
 		</el-form>
@@ -759,7 +759,7 @@
 	import ReimbursementApprovalTypeService from '@/api/pubmodules/ReimbursementApprovalTypeService'
 	import ReimbursementService from '@/api/sys/ReimbursementService'
 	import ReimbursementTypeService from '@/api/sys/ReimbursementTypeService'
-	import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+	import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import SelectUserTree from '@/views/utils/treeUserSelect'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -1071,7 +1071,7 @@
 							}else {
 								method = 'view'
 							}
-							this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'电子发票附件')
+							this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'数电发票信息',null,null,null,'江苏兴光资产评估有限公司')
 							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement_ping_gu')
 						})
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {

src/views/reimbursement/info/ReimbursementForm.vue

@@ -630,96 +630,96 @@
 				</el-row>
 			</div>
 
-			<div v-if="inputForm.reimbursementType === '1'">
-				<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>-->
-				</el-divider>
-				<el-row  :gutter="15" >
-					<el-col :span="24">
-						<vxe-table
-							border
-							show-footer
-							show-overflow
-							ref="invoiceReimbursementTable"
-							class="vxe-table-element"
-							:data="inputForm.invoiceReimbursements"
-							:footer-method="footerMethod1111"
-							style="margin-left: 5em"
-							@cell-click=""
-							:key="invoiceReimbursementKey"
-							@edit-closed=""
-							highlight-current-row
-							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-							:edit-rules="invoiceReimbursementRules"
-						>
-							<vxe-table-column  field="invoiceType" title="发票类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-								<template v-slot:edit="scope">
-									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-										<vxe-option
-											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-											:key="item.value"
-											:label="item.label"
-											:value="item.value">
-										</vxe-option>
-									</vxe-select>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-								<template v-slot:edit="scope">
-									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input disabled="true" v-model="scope.row.count" ></el-input>
-								</template>
-							</vxe-table-column>
-							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-								<template #edit="scope">
-									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-								</template>
-							</vxe-table-column>
-							<!--<vxe-table-column title="操作" width="100">
-								<template #default="scope">
-									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-								</template>
-							</vxe-table-column>-->
-						</vxe-table>
-					</el-col>
-				</el-row>
-			</div>
+<!--			<div v-if="inputForm.reimbursementType === '1'">-->
+<!--				<el-divider content-position="left">数电发票信息-->
+<!--					&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--						新增-->
+<!--					</el-button>&ndash;&gt;-->
+<!--				</el-divider>-->
+<!--				<el-row  :gutter="15" >-->
+<!--					<el-col :span="24">-->
+<!--						<vxe-table-->
+<!--							border-->
+<!--							show-footer-->
+<!--							show-overflow-->
+<!--							ref="invoiceReimbursementTable"-->
+<!--							class="vxe-table-element"-->
+<!--							:data="inputForm.invoiceReimbursements"-->
+<!--							:footer-method="footerMethod1111"-->
+<!--							style="margin-left: 5em"-->
+<!--							@cell-click=""-->
+<!--							:key="invoiceReimbursementKey"-->
+<!--							@edit-closed=""-->
+<!--							highlight-current-row-->
+<!--							:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--							:edit-rules="invoiceReimbursementRules"-->
+<!--						>-->
+<!--							<vxe-table-column  field="invoiceType" title="发票类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--										<vxe-option-->
+<!--											v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--											:key="item.value"-->
+<!--											:label="item.label"-->
+<!--											:value="item.value">-->
+<!--										</vxe-option>-->
+<!--									</vxe-select>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--								<template v-slot:edit="scope">-->
+<!--									<vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--								<template #edit="scope">-->
+<!--									<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--								</template>-->
+<!--							</vxe-table-column>-->
+<!--							&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--								<template #default="scope">-->
+<!--									<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--								</template>-->
+<!--							</vxe-table-column>&ndash;&gt;-->
+<!--						</vxe-table>-->
+<!--					</el-col>-->
+<!--				</el-row>-->
+<!--			</div>-->
 
 
 		</el-form>
@@ -759,7 +759,7 @@
 	import ReimbursementApprovalTypeService from '@/api/pubmodules/ReimbursementApprovalTypeService'
 	import ReimbursementService from '@/api/sys/ReimbursementService'
 	import ReimbursementTypeService from '@/api/sys/ReimbursementTypeService'
-	import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+	import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import SelectUserTree from '@/views/utils/treeUserSelect'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -1057,7 +1057,7 @@
 						}else {
 							this.payment = '未付款'
 						}
-						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'电子发票附件')
+						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'数电发票信息',null,null,null,'江苏兴光资产评估有限公司')
 						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement_ping_gu')
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
 							// this.startPur(this.inputForm.purchaseId)
@@ -1504,34 +1504,34 @@
 						// }
 						//判定附件中xml文件数量是否小于电子发票报销行数量
 						let flag1 = false
-						if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
+						if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursementFiles) && "1" === this.inputForm.reimbursementType) {
 							//获取电子报销行数
-							let invoiceReimbursementCount = this.inputForm.invoiceReimbursements.length
-							if(invoiceReimbursementCount>0){
-								//获取附件信息以xml结尾的附件数量
-								var flag = false;
-								var countFlag = 0;
-
-								for (var i=0; i<this.inputForm.invoiceReimbursementFiles.length; i++){
-									//如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
-									const spliceLength2 = this.inputForm.invoiceReimbursementFiles[i].name.lastIndexOf(".");
-									var fileNameSuffix = this.inputForm.invoiceReimbursementFiles[i].name.slice(spliceLength2 + 1);
-									if(fileNameSuffix === "xml" ) {
-										flag = true;
-										countFlag ++;
-									}
-								}
-								if(!flag){
-									this.$message.error("已填写数电发票信息，请上传对应发票的xml文件!")
-									this.loading = false
-									throw new Error("已填写数电发票信息，请上传对应发票的xml文件!")
-								}
-							}
+							// let invoiceReimbursementCount = this.inputForm.invoiceReimbursements.length
+							// if(invoiceReimbursementCount>0){
+							// 	//获取附件信息以xml结尾的附件数量
+							// 	var flag = false;
+							// 	var countFlag = 0;
+							//
+							// 	for (var i=0; i<this.inputForm.invoiceReimbursementFiles.length; i++){
+							// 		//如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
+							// 		const spliceLength2 = this.inputForm.invoiceReimbursementFiles[i].name.lastIndexOf(".");
+							// 		var fileNameSuffix = this.inputForm.invoiceReimbursementFiles[i].name.slice(spliceLength2 + 1);
+							// 		if(fileNameSuffix === "xml" ) {
+							// 			flag = true;
+							// 			countFlag ++;
+							// 		}
+							// 	}
+							// 	if(!flag){
+							// 		this.$message.error("已填写数电发票信息，请上传对应发票的xml文件!")
+							// 		this.loading = false
+							// 		throw new Error("已填写数电发票信息，请上传对应发票的xml文件!")
+							// 	}
+							// }
 
 							//数电发票信息不为空的时候在提交时需要再次判断看当前数电发票是否有存在其他发起或完成的报销
 							let numbers =[];
-							for (let i = 0; i < this.inputForm.invoiceReimbursements.length; i++) {
-								numbers.push(this.inputForm.invoiceReimbursements[i].number)
+							for (let i = 0; i < this.inputForm.invoiceReimbursementFiles.length; i++) {
+								numbers.push(this.inputForm.invoiceReimbursementFiles[i].number)
 							}
 							const decide = await this.reimbursementService.getEffectiveDataByNumbers(numbers.join(","),this.inputForm.id)
 							// .then((decide) => {

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

@@ -569,96 +569,96 @@
 
         </el-row>
 		  </div>
-		  <div v-if="inputForm.reimbursementType === '1'">
-			  <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>-->
-			  </el-divider>
-			  <el-row  :gutter="15" >
-				  <el-col :span="24">
-					  <vxe-table
-						  border
-						  show-footer
-						  show-overflow
-						  ref="invoiceReimbursementTable"
-						  class="vxe-table-element"
-						  :data="inputForm.invoiceReimbursements"
-						  :footer-method="footerMethod1111"
-						  style="margin-left: 5em"
-						  @cell-click=""
-						  :key="invoiceReimbursementKey"
-						  @edit-closed=""
-						  highlight-current-row
-						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						  :edit-rules="invoiceReimbursementRules"
-					  >
-						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							  <template v-slot:edit="scope">
-								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									  <vxe-option
-										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										  :key="item.value"
-										  :label="item.label"
-										  :value="item.value">
-									  </vxe-option>
-								  </vxe-select>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							  <template v-slot:edit="scope">
-								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input disabled="true" v-model="scope.row.count" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <!--<vxe-table-column title="操作" width="100">
-							  <template #default="scope">
-								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							  </template>
-						  </vxe-table-column>-->
-					  </vxe-table>
-				  </el-col>
-			  </el-row>
-		  </div>
+<!--		  <div v-if="inputForm.reimbursementType === '1'">-->
+<!--			  <el-divider content-position="left">数电发票信息-->
+<!--				  &lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					  新增-->
+<!--				  </el-button>&ndash;&gt;-->
+<!--			  </el-divider>-->
+<!--			  <el-row  :gutter="15" >-->
+<!--				  <el-col :span="24">-->
+<!--					  <vxe-table-->
+<!--						  border-->
+<!--						  show-footer-->
+<!--						  show-overflow-->
+<!--						  ref="invoiceReimbursementTable"-->
+<!--						  class="vxe-table-element"-->
+<!--						  :data="inputForm.invoiceReimbursements"-->
+<!--						  :footer-method="footerMethod1111"-->
+<!--						  style="margin-left: 5em"-->
+<!--						  @cell-click=""-->
+<!--						  :key="invoiceReimbursementKey"-->
+<!--						  @edit-closed=""-->
+<!--						  highlight-current-row-->
+<!--						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						  :edit-rules="invoiceReimbursementRules"-->
+<!--					  >-->
+<!--						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									  <vxe-option-->
+<!--										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										  :key="item.value"-->
+<!--										  :label="item.label"-->
+<!--										  :value="item.value">-->
+<!--									  </vxe-option>-->
+<!--								  </vxe-select>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  &lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							  <template #default="scope">-->
+<!--								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>&ndash;&gt;-->
+<!--					  </vxe-table>-->
+<!--				  </el-col>-->
+<!--			  </el-row>-->
+<!--		  </div>-->
 
       </el-form>
 		<!-- 附件 -->
@@ -680,7 +680,7 @@
    // import ReimbursementService from '@/api/sys/ReimbursementService'
   import ReimbursementService from '@/api/zs/reimbursement/ReimbursementService'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
-   import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+   import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import XEUtils from 'xe-utils'
   // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
   // import MaterialManagementDialog from '../../../materialManagement/file/MaterialManagementDialog'
@@ -816,7 +816,7 @@
 				}else {
 					this.payment = '未付款'
 				}
-				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'中审众环会计师事务所(特殊普通合伙)江苏分所')
 				this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
               if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {

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

@@ -563,92 +563,92 @@
 
         </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-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>
-					  新增
-				  </el-button>-->
-			  </el-divider>
-			  <el-row  :gutter="15" >
-				  <el-col :span="24">
-					  <vxe-table
-						  border
-						  show-footer
-						  show-overflow
-						  ref="invoiceReimbursementTable"
-						  class="vxe-table-element"
-						  :data="inputForm.invoiceReimbursements"
-						  :footer-method="footerMethod1111"
-						  style="margin-left: 5em"
-						  @cell-click=""
-						  :key="invoiceReimbursementKey"
-						  @edit-closed=""
-						  highlight-current-row
-						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						  :edit-rules="invoiceReimbursementRules"
-					  >
-						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							  <template v-slot:edit="scope">
-								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									  <vxe-option
-										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										  :key="item.value"
-										  :label="item.label"
-										  :value="item.value">
-									  </vxe-option>
-								  </vxe-select>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							  <template v-slot:edit="scope">
-								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input disabled="true" v-model="scope.row.count" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							  <template #edit="scope">
-								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							  </template>
-						  </vxe-table-column>
-						  <!--<vxe-table-column title="操作" width="100">
-							  <template #default="scope">
-								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							  </template>
-						  </vxe-table-column>-->
-					  </vxe-table>
-				  </el-col>
-			  </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>数电发票信息-->
+<!--				  &lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					  新增-->
+<!--				  </el-button>&ndash;&gt;-->
+<!--			  </el-divider>-->
+<!--			  <el-row  :gutter="15" >-->
+<!--				  <el-col :span="24">-->
+<!--					  <vxe-table-->
+<!--						  border-->
+<!--						  show-footer-->
+<!--						  show-overflow-->
+<!--						  ref="invoiceReimbursementTable"-->
+<!--						  class="vxe-table-element"-->
+<!--						  :data="inputForm.invoiceReimbursements"-->
+<!--						  :footer-method="footerMethod1111"-->
+<!--						  style="margin-left: 5em"-->
+<!--						  @cell-click=""-->
+<!--						  :key="invoiceReimbursementKey"-->
+<!--						  @edit-closed=""-->
+<!--						  highlight-current-row-->
+<!--						  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						  :edit-rules="invoiceReimbursementRules"-->
+<!--					  >-->
+<!--						  <vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									  <vxe-option-->
+<!--										  v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										  :key="item.value"-->
+<!--										  :label="item.label"-->
+<!--										  :value="item.value">-->
+<!--									  </vxe-option>-->
+<!--								  </vxe-select>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							  <template v-slot:edit="scope">-->
+<!--								  <vxe-input v-model="scope.row.invoiceDate" readonly="true" type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  <vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							  <template #edit="scope">-->
+<!--								  <el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>-->
+<!--						  &lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							  <template #default="scope">-->
+<!--								  <el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							  </template>-->
+<!--						  </vxe-table-column>&ndash;&gt;-->
+<!--					  </vxe-table>-->
+<!--				  </el-col>-->
+<!--			  </el-row>-->
+<!--		  </div>-->
 
       </el-form>
 		<!-- 附件 -->
@@ -670,7 +670,7 @@
    // import ReimbursementService from '@/api/sys/ReimbursementService'
   import ReimbursementService from '@/api/zs/reimbursement/ReimbursementService'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
-   import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+   import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import XEUtils from 'xe-utils'
   // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
   // import MaterialManagementDialog from '../../../materialManagement/file/MaterialManagementDialog'
@@ -798,7 +798,7 @@
 				if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 					this.inputForm.reimbursementType = '0'
 				}
-				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'中审众环会计师事务所(特殊普通合伙)江苏分所')
 				this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
               if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {

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

@@ -562,95 +562,95 @@
 
 		  </el-row>
 		</div>
-		<div v-if="inputForm.reimbursementType === '1'">
-			<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>-->
-			</el-divider>
-			<el-row  :gutter="15" >
-				<el-col :span="24">
-					<vxe-table
-						border
-						show-footer
-						show-overflow
-						ref="invoiceReimbursementTable"
-						class="vxe-table-element"
-						:data="inputForm.invoiceReimbursements"
-						:footer-method="footerMethod1111"
-						style="margin-left: 5em"
-						:key="invoiceReimbursementKey"
-						highlight-current-row
-						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						:edit-rules="invoiceReimbursementRules"
-					>
-						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							<template v-slot:edit="scope">
-								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									<vxe-option
-										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value">
-									</vxe-option>
-								</vxe-select>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							<template v-slot:edit="scope">
-								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input disabled="true" v-model="scope.row.count" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							</template>
-						</vxe-table-column>
-						<!--<vxe-table-column title="操作" width="100">
-							<template #default="scope">
-								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							</template>
-						</vxe-table-column>-->
-					</vxe-table>
-				</el-col>
-			</el-row>
-		</div>
+<!--		<div v-if="inputForm.reimbursementType === '1'">-->
+<!--			<el-divider content-position="left">-->
+<!--				数电发票信息-->
+<!--				&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					新增-->
+<!--				</el-button>&ndash;&gt;-->
+<!--			</el-divider>-->
+<!--			<el-row  :gutter="15" >-->
+<!--				<el-col :span="24">-->
+<!--					<vxe-table-->
+<!--						border-->
+<!--						show-footer-->
+<!--						show-overflow-->
+<!--						ref="invoiceReimbursementTable"-->
+<!--						class="vxe-table-element"-->
+<!--						:data="inputForm.invoiceReimbursements"-->
+<!--						:footer-method="footerMethod1111"-->
+<!--						style="margin-left: 5em"-->
+<!--						:key="invoiceReimbursementKey"-->
+<!--						highlight-current-row-->
+<!--						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						:edit-rules="invoiceReimbursementRules"-->
+<!--					>-->
+<!--						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									<vxe-option-->
+<!--										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										:key="item.value"-->
+<!--										:label="item.label"-->
+<!--										:value="item.value">-->
+<!--									</vxe-option>-->
+<!--								</vxe-select>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							<template #default="scope">-->
+<!--								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							</template>-->
+<!--						</vxe-table-column>&ndash;&gt;-->
+<!--					</vxe-table>-->
+<!--				</el-col>-->
+<!--			</el-row>-->
+<!--		</div>-->
 <!--      <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>-->
       <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
       <CwProgramPageForm ref="cwProgramPageForm3" @getProgram="getProgram3"></CwProgramPageForm>
@@ -693,7 +693,7 @@
   // import UserSelectV2 from '@/components/userSelect'
   import ReimbursementService from '@/api/zs/reimbursement/ReimbursementService'
   import ReimbursementTypeService from '@/api/zs/reimbursement/ReimbursementTypeService'
-  import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+  import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   // import SelectUserTree from '@/views/utils/treeUserSelect'
   // import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -984,7 +984,7 @@
 			  if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 				  this.inputForm.reimbursementType = '0'
 			  }
-            this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+            this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'中审众环会计师事务所(特殊普通合伙)江苏分所')
             this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
             if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
               // this.startPur(this.inputForm.purchaseId)

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

@@ -555,95 +555,95 @@
 
 		  </el-row>
 		</div>
-		<div v-if="inputForm.reimbursementType === '1'">
-			<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>-->
-			</el-divider>
-			<el-row  :gutter="15" >
-				<el-col :span="24">
-					<vxe-table
-						border
-						show-footer
-						show-overflow
-						ref="invoiceReimbursementTable"
-						class="vxe-table-element"
-						:data="inputForm.invoiceReimbursements"
-						:footer-method="footerMethod1111"
-						style="margin-left: 5em"
-						:key="invoiceReimbursementKey"
-						highlight-current-row
-						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						:edit-rules="invoiceReimbursementRules"
-					>
-						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							<template v-slot:edit="scope">
-								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									<vxe-option
-										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value">
-									</vxe-option>
-								</vxe-select>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							<template v-slot:edit="scope">
-								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input disabled="true" v-model="scope.row.count" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							</template>
-						</vxe-table-column>
-						<!--<vxe-table-column title="操作" width="100">
-							<template #default="scope">
-								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							</template>
-						</vxe-table-column>-->
-					</vxe-table>
-				</el-col>
-			</el-row>
-		</div>
+<!--		<div v-if="inputForm.reimbursementType === '1'">-->
+<!--			<el-divider content-position="left">-->
+<!--				数电发票信息-->
+<!--				&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					新增-->
+<!--				</el-button>&ndash;&gt;-->
+<!--			</el-divider>-->
+<!--			<el-row  :gutter="15" >-->
+<!--				<el-col :span="24">-->
+<!--					<vxe-table-->
+<!--						border-->
+<!--						show-footer-->
+<!--						show-overflow-->
+<!--						ref="invoiceReimbursementTable"-->
+<!--						class="vxe-table-element"-->
+<!--						:data="inputForm.invoiceReimbursements"-->
+<!--						:footer-method="footerMethod1111"-->
+<!--						style="margin-left: 5em"-->
+<!--						:key="invoiceReimbursementKey"-->
+<!--						highlight-current-row-->
+<!--						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						:edit-rules="invoiceReimbursementRules"-->
+<!--					>-->
+<!--						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									<vxe-option-->
+<!--										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										:key="item.value"-->
+<!--										:label="item.label"-->
+<!--										:value="item.value">-->
+<!--									</vxe-option>-->
+<!--								</vxe-select>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							<template #default="scope">-->
+<!--								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							</template>-->
+<!--						</vxe-table-column>&ndash;&gt;-->
+<!--					</vxe-table>-->
+<!--				</el-col>-->
+<!--			</el-row>-->
+<!--		</div>-->
 <!--      <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>-->
       <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
       <CwProgramPageForm ref="cwProgramPageForm3" @getProgram="getProgram3"></CwProgramPageForm>
@@ -678,7 +678,7 @@
   // import UserSelectV2 from '@/components/userSelect'
   import ReimbursementService from '@/api/zs/reimbursement/ReimbursementService'
   import ReimbursementTypeService from '@/api/zs/reimbursement/ReimbursementTypeService'
-  import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+  import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   // import SelectUserTree from '@/views/utils/treeUserSelect'
   // import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -987,7 +987,7 @@
 				  }else {
 					  method = 'view'
 				  }
-				  this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+				  this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'中审众环会计师事务所(特殊普通合伙)江苏分所')
 				  this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 			  })
             if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {

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

@@ -560,95 +560,95 @@
 
 		  </el-row>
 		</div>
-		<div v-if="inputForm.reimbursementType === '1'">
-			<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>-->
-			</el-divider>
-			<el-row  :gutter="15" >
-				<el-col :span="24">
-					<vxe-table
-						border
-						show-footer
-						show-overflow
-						ref="invoiceReimbursementTable"
-						class="vxe-table-element"
-						:data="inputForm.invoiceReimbursements"
-						:footer-method="footerMethod1111"
-						style="margin-left: 5em"
-						:key="invoiceReimbursementKey"
-						highlight-current-row
-						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-						:edit-rules="invoiceReimbursementRules"
-					>
-						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">
-							<template v-slot:edit="scope">
-								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>
-									<vxe-option
-										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value">
-									</vxe-option>
-								</vxe-select>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">
-							<template v-slot:edit="scope">
-								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input disabled="true" v-model="scope.row.count" ></el-input>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">
-							<template #edit="scope">
-								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>
-							</template>
-						</vxe-table-column>
-						<!--<vxe-table-column title="操作" width="100">
-							<template #default="scope">
-								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>
-							</template>
-						</vxe-table-column>-->
-					</vxe-table>
-				</el-col>
-			</el-row>
-		</div>
+<!--		<div v-if="inputForm.reimbursementType === '1'">-->
+<!--			<el-divider content-position="left">-->
+<!--				数电发票信息-->
+<!--				&lt;!&ndash;<el-button style="margin-left: 20px" type="primary" :disabled="method==='view' || status === 'audit' || status === 'taskFormDetail' " size="default" @click="insertEvent('invoiceReimbursement')" plain>-->
+<!--					新增-->
+<!--				</el-button>&ndash;&gt;-->
+<!--			</el-divider>-->
+<!--			<el-row  :gutter="15" >-->
+<!--				<el-col :span="24">-->
+<!--					<vxe-table-->
+<!--						border-->
+<!--						show-footer-->
+<!--						show-overflow-->
+<!--						ref="invoiceReimbursementTable"-->
+<!--						class="vxe-table-element"-->
+<!--						:data="inputForm.invoiceReimbursements"-->
+<!--						:footer-method="footerMethod1111"-->
+<!--						style="margin-left: 5em"-->
+<!--						:key="invoiceReimbursementKey"-->
+<!--						highlight-current-row-->
+<!--						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"-->
+<!--						:edit-rules="invoiceReimbursementRules"-->
+<!--					>-->
+<!--						<vxe-table-column  field="invoiceType" title="发票类型" show-overflow="title" :edit-render="{name: '$select', options: $dictUtils.getDictList('invoice_reimbursement_type')}">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-select :disabled="true" v-model="scope.row.invoiceType" placeholder="请选择发票类型" clearable style="width: 100%;" transfer>-->
+<!--									<vxe-option-->
+<!--										v-for="item in $dictUtils.getDictList('invoice_reimbursement_type')"-->
+<!--										:key="item.value"-->
+<!--										:label="item.label"-->
+<!--										:value="item.value">-->
+<!--									</vxe-option>-->
+<!--								</vxe-select>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceProjectName" title="发票项目名" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceProjectName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="number" title="发票号" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input oninput ="value=value.replace(/\D|^/g,'')" readonly="true" maxlength="30" @change="isExict(scope.row)" v-model="scope.row.number" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceDate" title="开票日期" :edit-render="{}" show-overflow="title">-->
+<!--							<template v-slot:edit="scope">-->
+<!--								<vxe-input v-model="scope.row.invoiceDate" :disabled="true"  type="datetime" transfer placeholder="请选择日期"></vxe-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="invoiceUnit" title="开票单位" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="taxAmount" title="税额" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="15" readonly="true" v-model="scope.row.taxAmount" @input="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="count" title="价税合计" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input disabled="true" v-model="scope.row.count" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						<vxe-table-column field="remarks" title="备注" :edit-render="{}" show-overflow="title">-->
+<!--							<template #edit="scope">-->
+<!--								<el-input maxlength="250" v-model="scope.row.remarks" ></el-input>-->
+<!--							</template>-->
+<!--						</vxe-table-column>-->
+<!--						&lt;!&ndash;<vxe-table-column title="操作" width="100">-->
+<!--							<template #default="scope">-->
+<!--								<el-button size="default" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'invoiceReimbursement')">删除</el-button>-->
+<!--							</template>-->
+<!--						</vxe-table-column>&ndash;&gt;-->
+<!--					</vxe-table>-->
+<!--				</el-col>-->
+<!--			</el-row>-->
+<!--		</div>-->
 <!--      <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>-->
       <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
 		<CwProgramPageForm2 ref="cwProgramPageForm3" @getProgram="getProgram3"></CwProgramPageForm2>
@@ -683,7 +683,7 @@
   // import UserSelectV2 from '@/components/userSelect'
   import ReimbursementService from '@/api/zs/reimbursement/ReimbursementService'
   import ReimbursementTypeService from '@/api/zs/reimbursement/ReimbursementTypeService'
-  import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimbursementUpLoadComponent'
+  import InvoiceReimbursementUpLoadComponent from '@/views/common/DigitalInvoiceUploadComponent'
   import ReimbursementApprovalTypeService from '@/api/cw/reimbursementApproval/ReimbursementApprovalTypeService'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   // import SelectUserTree from '@/views/utils/treeUserSelect'
@@ -984,7 +984,7 @@
 			  }else {
 				  this.payment = '未付款'
 			  }
-            this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
+            this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'数电发票信息',null,null,null,'中审众环会计师事务所(特殊普通合伙)江苏分所')
             this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
             if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
               // this.startPur(this.inputForm.purchaseId)
@@ -1414,33 +1414,33 @@
 			  // }
 			  //判定附件中xml文件数量是否小于电子发票报销行数量
 			  let flag1 = false
-			  if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
+			  if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursementFiles) && "1" === this.inputForm.reimbursementType) {
 				  //获取电子报销行数
-				  let invoiceReimbursementCount = this.inputForm.invoiceReimbursements.length
-				  if(invoiceReimbursementCount>0){
-					  //获取附件信息以xml结尾的附件数量
-					  var flag = false;
-					  var countFlag = 0;
-
-					  for (var i=0; i<this.inputForm.invoiceReimbursementFiles.length; i++){
-						  //如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
-						  const spliceLength2 = this.inputForm.invoiceReimbursementFiles[i].name.lastIndexOf(".");
-						  var fileNameSuffix = this.inputForm.invoiceReimbursementFiles[i].name.slice(spliceLength2 + 1);
-						  if(fileNameSuffix === "xml" ) {
-							  flag = true;
-							  countFlag ++;
-						  }
-					  }
-					  if(!flag){
-						  this.$message.error("已填写数电发票信息，请上传对应发票的xml文件!")
-						  this.loading = false
-						  throw new Error("已填写数电发票信息，请上传对应发票的xml文件!")
-					  }
-				  }
+				  // let invoiceReimbursementCount = this.inputForm.invoiceReimbursements.length
+				  // if(invoiceReimbursementCount>0){
+					//   //获取附件信息以xml结尾的附件数量
+					//   var flag = false;
+					//   var countFlag = 0;
+				  //
+					//   for (var i=0; i<this.inputForm.invoiceReimbursementFiles.length; i++){
+					// 	  //如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
+					// 	  const spliceLength2 = this.inputForm.invoiceReimbursementFiles[i].name.lastIndexOf(".");
+					// 	  var fileNameSuffix = this.inputForm.invoiceReimbursementFiles[i].name.slice(spliceLength2 + 1);
+					// 	  if(fileNameSuffix === "xml" ) {
+					// 		  flag = true;
+					// 		  countFlag ++;
+					// 	  }
+					//   }
+					//   if(!flag){
+					// 	  this.$message.error("已填写数电发票信息，请上传对应发票的xml文件!")
+					// 	  this.loading = false
+					// 	  throw new Error("已填写数电发票信息，请上传对应发票的xml文件!")
+					//   }
+				  // }
 				  //数电发票信息不为空的时候在提交时需要再次判断看当前数电发票是否有存在其他发起或完成的报销
 				  let numbers =[];
-				  for (let i = 0; i < this.inputForm.invoiceReimbursements.length; i++) {
-					  numbers.push(this.inputForm.invoiceReimbursements[i].number)
+				  for (let i = 0; i < this.inputForm.invoiceReimbursementFiles.length; i++) {
+					  numbers.push(this.inputForm.invoiceReimbursementFiles[i].number)
 				  }
 				  const decide = await this.reimbursementService.getEffectiveDataByNumbers(numbers.join(","),this.inputForm.id)
 				  // .then((decide) => {