瀏覽代碼

评估归档后项目数据补充,电子发票调整为数电发票

user5 1 年之前
父節點
當前提交
54e05dc0dc

+ 7 - 0
src/api/program/ProgramProjectListInfoService.js

@@ -218,4 +218,11 @@ export default class ProgramProjectListInfoService {
       params: {programId: programId, auditLevel: auditLevel}
     })
   }
+	supplementSave (inputForm) {
+		return request({
+			url: prefix + `/program/projectList/supplementSave`,
+			method: 'post',
+			data: inputForm
+		})
+	}
 }

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

@@ -16,7 +16,7 @@
 			<el-button :loading="loading" type="primary" size="default" :disabled="true"> 点击上传 </el-button>
 		</template>
 		<template v-else #trigger>
-			<el-button :loading="loading" type="primary" size="default"> 点击上传 </el-button> <span style="margin-left: 20px;font-size:14px;font-weight:normal;color:red;" type="primary"> 上传报销的电发票xml文件</span>
+			<el-button :loading="loading" type="primary" size="default"> 点击上传 </el-button> <span style="margin-left: 20px;font-size:14px;font-weight:normal;color:red;" type="primary"> 上传报销的电发票xml文件</span>
 		</template>
     </el-upload>
     <div style="height: calc(100% - 80px);margin-top: 10px">

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

@@ -633,7 +633,7 @@
 		  </div>
 		  <div v-if="inputForm.reimbursementType === '1'">
 			  <el-divider content-position="left"><i class="el-icon-document"></i>
-				  <span style="color: red;border-top: 20px">* </span>电发票信息
+				  <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>-->

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

@@ -107,7 +107,7 @@
         <template #buttons>
           <el-button v-if="hasPermission('cw:reimbursement:info:add')" type="primary" icon="el-icon-plus" @click="add()">新建</el-button>
           <el-button v-if="hasPermission('cw:reimbursement:info:del')" type="danger"  icon="el-icon-delete" @click="del()" :disabled="$refs.infoTable && $refs.infoTable.getCheckboxRecords().length === 0" plain>删除</el-button>
-			<el-button type="warning" icon="el-icon-download" @click="exportInvoiceReimbursementFile()" plain>电发票报销</el-button>
+			<el-button type="warning" icon="el-icon-download" @click="exportInvoiceReimbursementFile()" plain>电发票报销</el-button>
 		</template>
 		  <template #tools>
 			  <vxe-button
@@ -636,7 +636,7 @@
 				...this.searchForm
 			}).then((res) => {
 				// 将二进制流文件写入excel表,以下为重要步骤
-				this.$utils.downloadExcel(res, '会计-报销电发票报销列表')
+				this.$utils.downloadExcel(res, '会计-报销电发票报销列表')
 				this.loading = false
 			}).catch(function (err) {
 				this.loading = false

+ 23 - 23
src/views/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -664,7 +664,7 @@
 		<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>-->
@@ -1174,44 +1174,44 @@
 				for (let j = 0; j < i; j++) {
 					let k = j + 1
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceType)) {
-						this.$message.error('电发票信息 第' + k + '行请选择发票类型')
+						this.$message.error('电发票信息 第' + k + '行请选择发票类型')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请选择发票类型')
+						throw new Error('电发票信息 第' + k + '行请选择发票类型')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceProjectName)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票项目名')
+						this.$message.error('电发票信息 第' + k + '行请填写发票项目名')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票项目名')
+						throw new Error('电发票信息 第' + k + '行请填写发票项目名')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].number)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票号')
+						this.$message.error('电发票信息 第' + k + '行请填写发票号')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票号')
+						throw new Error('电发票信息 第' + k + '行请填写发票号')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceDate)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票日期')
+						this.$message.error('电发票信息 第' + k + '行请填写发票日期')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票日期')
+						throw new Error('电发票信息 第' + k + '行请填写发票日期')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票单位')
+						this.$message.error('电发票信息 第' + k + '行请填写发票单位')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票单位')
+						throw new Error('电发票信息 第' + k + '行请填写发票单位')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票单位')
+						this.$message.error('电发票信息 第' + k + '行请填写发票单位')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票单位')
+						throw new Error('电发票信息 第' + k + '行请填写发票单位')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
-						this.$message.error('电发票信息 第' + k + '行请填写金额')
+						this.$message.error('电发票信息 第' + k + '行请填写金额')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写金额')
+						throw new Error('电发票信息 第' + k + '行请填写金额')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].taxAmount)) {
-						this.$message.error('电发票信息 第' + k + '行请填写税额')
+						this.$message.error('电发票信息 第' + k + '行请填写税额')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写税额')
+						throw new Error('电发票信息 第' + k + '行请填写税额')
 					}
 
 				}
@@ -1524,9 +1524,9 @@
 			  this.inputForm.files = this.$refs.uploadComponent.getDataList()
 			  this.dataFiltering()
 			  if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
-				  this.$message.error("请上传电发票发票xml文件!")
+				  this.$message.error("请上传电发票发票xml文件!")
 				  this.loading = false
-				  throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
+				  throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
 			  }
 			  //判定附件中xml文件数量是否小于电子发票报销行数量
 			  if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
@@ -1547,9 +1547,9 @@
 						  }
 					  }
 					  if(!flag){
-						  this.$message.error("已填写电发票信息,请上传对应发票的xml文件!")
+						  this.$message.error("已填写电发票信息,请上传对应发票的xml文件!")
 						  this.loading = false
-						  throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
+						  throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
 					  }
 				  }
 			  }
@@ -1739,9 +1739,9 @@
 				  if(item.number === row.number) {
 					  count ++;
 					  if(count === 2){
-						  this.$message.error('电发票号:' + row.number + ' 已存在')
+						  this.$message.error('电发票号:' + row.number + ' 已存在')
 						  row.number = ''
-						  throw new Error('电发票号:' + row.number + ' 已存在')
+						  throw new Error('电发票号:' + row.number + ' 已存在')
 					  }
 				  }
 			  }

+ 1 - 1
src/views/human/depart/handover/HandoverRecoveryAddForm.vue

@@ -1,6 +1,6 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
 	<div>
-		<span style="color: red;">因离职,需将门禁卡上交</span>
+		<span style="color: red;">因离职,需将门禁卡上交至信息部陈强处</span>
 	</div>
 </template>
 

+ 1 - 1
src/views/human/enrollment/registration/KeyCardPopup.vue

@@ -9,7 +9,7 @@
 		append-to-body
 		v-model="visible">
 		<div style="height: calc(100% - 80px);">
-			门卡办理成功!请及时到办公室黄丽处领取门禁卡,并到物业处开通大楼门禁权限及获取餐补卡号,具体办理方法参考附件。获取餐补卡号后请及时在系统待办中填写!<br>
+			门卡办理成功!请及时到信息部陈强处领取门禁卡,并到物业处开通大楼门禁权限及获取餐补卡号,具体办理方法参考附件。获取餐补卡号后请及时在系统待办中填写!<br>
 			另:请到刘芸或崇祝艳处开通打印权限。(9楼10楼南边到刘芸处开通权限,北边到崇祝艳处开通权限,9楼前台位于北边)
 
 			<el-button type="primary" @click="downloadFirstAuditTpl">门禁开通注意事项</el-button>

+ 1 - 1
src/views/human/practice/logwrite/LogWriteAddForm.vue

@@ -6,7 +6,7 @@
 			<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 			<el-row :gutter="26">
 				<el-col :span="12">
-					<el-form-item label="工作日志名称" prop="workName" :rules="[{required: true, message: '工作日志名称不能为空', trigger: 'blur'}]">
+					<el-form-item label="日志名称" prop="workName" :rules="[{required: true, message: '工作日志名称不能为空', trigger: 'blur'}]">
 						<el-input v-model="inputForm.workName"></el-input>
 					</el-form-item>
 				</el-col>

+ 1 - 1
src/views/human/practice/logwrite/LogWriteEditForm.vue

@@ -16,7 +16,7 @@
 						<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
 						<el-row :gutter="26">
 							<el-col :span="12">
-								<el-form-item label="工作日志名称" prop="workName" :rules="[]">
+								<el-form-item label="日志名称" prop="workName" :rules="[]">
 									<el-input v-model="inputForm.workName"></el-input>
 								</el-form-item>
 							</el-col>

+ 1 - 1
src/views/human/practice/reimburseRegister/ProgramPageForm.vue

@@ -12,7 +12,7 @@
       <div>
           <el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
             <!-- 搜索框-->
-            <el-form-item label="工作日志名称" prop="workName">
+            <el-form-item label="日志名称" prop="workName">
               <el-input v-model="searchForm.workName" placeholder="请输入工作日志名称" clearable></el-input>
             </el-form-item>
 

+ 549 - 0
src/views/program/registered/ProjectAdditionalInformationForm.vue

@@ -0,0 +1,549 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+	  draggable
+      width="1300px"
+      @close="close"
+      @keyup.enter.native=""
+	  v-model="visible">
+      <el-row>
+        <el-col :span="24">
+          <el-tabs>
+              <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading"
+                       label-width="180px" @submit.native.prevent>
+                <el-divider content-position="left"><i class="el-icon-document"></i> 项目基本情况信息</el-divider>
+                <el-row  :gutter="15">
+                  <el-col :span="12">
+                    <el-form-item label="项目名称" prop="name"
+                                  :rules="[
+                          {required: true, message:'项目名称不能为空', trigger:'blur'}
+                 ]">
+                      <el-input maxlength="64" :disabled="true" v-model="inputForm.name" placeholder="请输入项目名称" clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="项目编号" prop="no"
+                                  :rules="[
+                          {required: true, message:'项目编号不能为空', trigger:'blur'}
+                 ]">
+                      <el-input :disabled="true" :desabled="true" v-model="inputForm.no" placeholder="请输入项目编号" clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+
+					<el-col :span="12">
+						<el-form-item label="年份" prop="year"
+									  :rules="[
+                          {required: true, message:'年份不能为空', trigger:'blur'}
+                 ]">
+							<el-input size="large" :disabled="yearFlag" v-model="inputForm.year" placeholder="请输入年份" clearable></el-input>
+
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="项目类型" prop="projectMould"
+									  :rules="[
+                          {required: true, message:'项目类型不能为空', trigger:'blur'}
+                 ]">
+							<el-select v-model="inputForm.projectMould" placeholder="请选择项目类型" clearable style="width: 100%;"  :disabled="projectMouldFlag">
+								<el-option
+									v-for="item in $dictUtils.getDictList('program_registered_type')"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value">
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+
+                  <el-col :span="12">
+                    <el-form-item label="评估目的" prop="assessmentObjective"
+                                  :rules="[
+                                  {required: true, message:'评估目的不能为空', trigger:'change'}
+                 ]">
+                      <el-input v-model="inputForm.assessmentObjective" :disabled="assessmentObjectiveFlag" placeholder="请输入评估目的" clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="12">
+                    <el-form-item label="评估基准日" prop="assessmentDate"
+                                  :rules="[
+                          {required: true, message:'评估基准日不能为空', trigger:'blur'}
+                 ]">
+                      <el-date-picker
+						  disabled="assessmentDateFlag"
+                        v-model="inputForm.assessmentDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="选择评估基准日"
+                        style="width:100%"
+                        placement="bottom-start"
+                        clearable>
+                      </el-date-picker>
+                    </el-form-item>
+                  </el-col>
+
+
+                  <el-col :span="12">
+                    <el-form-item label="评估对象" prop="assessmentObject"
+                                  :rules="[
+                          {required: true, message:'评估对象不能为空', trigger:'blur'}
+                 ]">
+                      <el-input v-model="inputForm.assessmentObject" :disabled="assessmentObjectFlag" placeholder="请输入评估对象" clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+
+
+                  <el-col :span="12">
+                    <el-form-item label="评估范围" prop="assessmentRange"
+                                  :rules="[
+                          {required: true, message:'评估范围不能为空', trigger:'blur'}
+                 ]">
+                      <el-input v-model="inputForm.assessmentRange" :disabled="assessmentRangeFlag" placeholder="请输入评估范围" clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+
+				<el-col :span="12">
+					<el-form-item label="项目负责人" prop="projectManager"
+								  :rules="[
+									  {required: true, message:'项目负责人不能为空', trigger:'blur'}
+									]">
+						<SelectUserTree
+							ref="companyTree"
+							size="large"
+							:props="{
+							  value: 'id',             // ID字段名
+							  label: 'name',         // 显示名称
+							  children: 'children'    // 子级字段名
+							}"
+							:url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
+							:value="inputForm.projectManager"
+							:clearable="true"
+							:disabled="projectManagerFlag"
+							:accordion="true"
+							@getValue="(value) => {inputForm.projectManager=value}"/>
+					</el-form-item>
+				</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="评估报告日" prop="evaluationReportDate"
+									  :rules="[
+                        {required: true, message:'评估报告日不能为空', trigger:'blur'}
+                 ]">
+							<el-date-picker
+								style="width:100%;"
+								v-model="inputForm.evaluationReportDate"
+								disabled="evaluationReportDateFlag"
+								type="date"
+								placement="bottom-start"
+								value-format="YYYY-MM-DD"
+								placeholder="选择日期" clearable>
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="签字评估师1" prop="signatureEvaluatorFirst"
+									  :rules=" [
+                        {required: true, message:'签字评估师1不能为空', trigger:'blur'}
+                        ]" >
+							<UserSelect
+								:readonly="true"
+								:limit='1'
+								:modelValue="inputForm.signatureEvaluatorFirst"
+								:disabled="signatureEvaluatorFirstFlag"
+								@update:modelValue='(value) => {inputForm.signatureEvaluatorFirst = value}'></UserSelect>
+						</el-form-item>
+					</el-col>
+
+
+					<el-col :span="12">
+						<el-form-item label="签字评估师2" prop="signatureEvaluatorSecond"
+									  :rules=" [
+                        {required: true, message:'签字评估师2不能为空', trigger:'blur'}
+                        ]" >
+							<UserSelect
+								:readonly="true"
+								:limit='1'
+								:modelValue="inputForm.signatureEvaluatorSecond"
+								:disabled="signatureEvaluatorSecondFlag"
+								@update:modelValue='(value) => {inputForm.signatureEvaluatorSecond = value}'></UserSelect>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="废旧物资评估值(万元)" prop="waystEvaluation"
+									  :rules="[
+                 ]">
+							<el-input-number
+								v-model="inputForm.waystEvaluation"
+								:disabled="feeFlag"
+								controls-position="right"
+								:controls="false"
+								:max="999999999999999"
+								style="width:100%;"
+								:precision="2"
+								placeholder="请填写废旧物资评估"
+								:step="0.01"
+								:min="0"
+								clearable>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="固定资产评估值(万元)" prop="fixedAssetsEvaluation"
+									  :rules="[
+                 ]">
+							<el-input-number
+								v-model="inputForm.fixedAssetsEvaluation"
+								:disabled="feeFlag"
+								controls-position="right"
+								:controls="false"
+								:max="999999999999999"
+								style="width:100%;"
+								:precision="2"
+								placeholder="请填写固定资产评估"
+								:step="0.01"
+								:min="0"
+								clearable>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="净资产评估值(万元)" prop="netAssetsEvaluation"
+									  :rules="[
+                 ]">
+							<el-input-number
+								v-model="inputForm.netAssetsEvaluation"
+								:disabled="feeFlag"
+								controls-position="right"
+								:controls="false"
+								:max="999999999999999"
+								style="width:100%;"
+								:precision="2"
+								placeholder="请填写净资产评估"
+								:step="0.01"
+								:min="0"
+								clearable>
+							</el-input-number>
+							<!--                <el-input v-model="inputForm.netAssetsEvaluation" maxlength="64" placeholder="请填写净资产评估" @keyup.native="inputForm.netAssetsEvaluation = twoDecimalPlaces(inputForm.netAssetsEvaluation)"clearable></el-input>-->
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="租金评估(万元)" prop="rentEvaluation"
+									  :rules="[
+                 ]">
+							<el-input-number
+								v-model="inputForm.rentEvaluation"
+								:disabled="feeFlag"
+								controls-position="right"
+								:controls="false"
+								:max="999999999999999"
+								style="width:100%;"
+								:precision="2"
+								placeholder="请填写租金评估"
+								:step="0.01"
+								:min="0"
+								clearable>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="报告收费(元)" prop="reportCharges"
+									  :rules="[
+                        {required: true, message:'报告收费不能为空', trigger:'blur'}
+                 ]">
+							<el-input-number
+								v-model="inputForm.reportCharges"
+								:disabled="reportChargesFlag"
+								controls-position="right"
+								:controls="false"
+								:max="999999999999999"
+								style="width:100%;"
+								:precision="2"
+								placeholder="请填写报告收费"
+								:step="0.01"
+								:min="0"
+								clearable>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+
+
+					<el-col :span="12">
+						<el-form-item label="是否开票" prop="isInvoice"
+									  :rules="[
+                        {required: true, message:'是否开票不能为空', trigger:'blur'}
+                 ]">
+							<el-radio-group v-model="inputForm.isInvoice">
+								<el-radio v-for="item in $dictUtils.getDictList('yes_no')" :disabled="isInvoiceFlag" :label="item.value" :key="item.id">{{item.label}}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="合同是否存档" prop="isContractArchive"
+									  :rules="[
+                        {required: true, message:'合同是否存档不能为空', trigger:'blur'}
+                 ]">
+							<el-radio-group v-model="inputForm.isContractArchive">
+								<el-radio v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" :disabled="isContractArchiveFlag" :key="item.id">{{item.label}}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="12">
+						<el-form-item label="底稿是否归档" prop="isPapersArchive"
+									  :rules="[
+                        {required: true, message:'底稿是否归档不能为空', trigger:'blur'}
+                 ]">
+							<el-radio-group v-model="inputForm.isPapersArchive">
+								<el-radio v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" :disabled="isPapersArchiveFlag" :key="item.id">{{item.label}}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+
+
+
+				</el-row>
+
+              </el-form>
+
+          </el-tabs>
+        </el-col>
+      </el-row>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button  @click="close()" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button  type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+		</template>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import UserSelect from '@/components/userSelect'
+  import SelectUserTree from '@/views/utils/treeUserSelect'
+  import ProgramProjectListInfoService from '@/api/program/ProgramProjectListInfoService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        typeDictList: [],
+
+		  yearFlag: false,
+		  projectMouldFlag: false,
+		  assessmentObjectiveFlag: false,
+		  assessmentDateFlag: false,
+		  assessmentObjectFlag: false,
+		  assessmentRangeFlag: false,
+		  projectManagerFlag: false,
+		  evaluationReportDateFlag: false,
+		  signatureEvaluatorFirstFlag: false,
+		  signatureEvaluatorSecondFlag: false,
+
+		  feeFlag: false,
+
+		  reportChargesFlag: false,
+		  isInvoiceFlag: false,
+		  isContractArchiveFlag: false,
+		  isPapersArchiveFlag: false,
+
+        inputForm: {
+          id: '', // 主键值(新增不传,修改必传)
+          no: '', // 编号(新增不传,修改必传)
+          projectMould: '', // 项目类型
+          name: '', // 项目名称
+          projectManager: '', // 项目经理
+          assessmentObjective: '', // 评估目的
+          assessmentDate: '', // 评估基准日
+          assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
+
+		  evaluationReportDate:'',	//评估报告日
+			signatureEvaluatorFirst:'',	//签字评估师1
+			signatureEvaluatorSecond:'',	//签字评估师2
+			waystEvaluation:'',	//废旧物资评估值
+			fixedAssetsEvaluation:'',	//固定资产评估值
+			netAssetsEvaluation:'',	//净资产评估值
+			rentEvaluation:'',	//租金评估
+			reportCharges:'',	//报告收费
+			isInvoice:'',	//是否开票
+			isContractArchive:'',	//合同是否存档
+			isPapersArchive:'',	//底稿是否存档
+			year:'',	//年份
+        }
+      }
+    },
+    programProjectListInfoService: null,
+    created () {
+      this.programProjectListInfoService = new ProgramProjectListInfoService()
+    },
+    components: {
+      SelectUserTree,
+		UserSelect
+    },
+    computed: {
+    },
+    methods: {
+      init (method, id) {
+        this.method = method
+        this.inputForm = {
+          id: '', // 主键值(新增不传,修改必传)
+          no: '', // 编号(新增不传,修改必传)
+          name: '', // 项目名称
+          projectMould: '', // 项目类型
+          projectManager: '', // 项目经理
+          assessmentObjective: '', // 评估目的
+          assessmentDate: '', // 评估基准日
+          assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
+
+			evaluationReportDate:'',	//评估报告日
+			signatureEvaluatorFirst:'',	//签字评估师1
+			signatureEvaluatorSecond:'',	//签字评估师2
+			waystEvaluation:'',	//废旧物资评估值
+			fixedAssetsEvaluation:'',	//固定资产评估值
+		  netAssetsEvaluation:'',	//净资产评估值
+		  rentEvaluation:'',	//租金评估
+			reportCharges:'',	//报告收费
+			isInvoice:'',	//是否开票
+			isContractArchive:'',	//合同是否存档
+			isPapersArchive:'',	//底稿是否存档
+			year:'',	//年份
+        }
+        if (method === 'edit') {
+          this.inputForm.id = id
+          this.title = '补充项目数据'
+        } else if (method === 'view') {
+          this.inputForm.id = id
+          this.title = '查看项目数据'
+        }
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          this.$refs.inputForm.resetFields()
+          if (method === 'edit' || method === 'view') { // 修改或者查看
+            this.loading = true
+            this.programProjectListInfoService.queryById(this.inputForm.id).then((data) => {
+              this.inputForm = this.recover(this.inputForm, data)
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+
+				if(data.year){
+					this.yearFlag = true
+				}
+				if(data.projectMould){
+					this.projectMouldFlag = true
+				}
+				if(data.assessmentObjective){
+					this.assessmentObjectiveFlag = true
+				}
+				if(data.assessmentDate){
+					this.assessmentDateFlag = true
+				}
+				if(data.assessmentObject){
+					this.assessmentObjectFlag = true
+				}
+				if(data.assessmentRange){
+					this.assessmentRangeFlag = true
+				}
+				if(data.projectManager){
+					this.projectManagerFlag = true
+				}
+				if(data.evaluationReportDate){
+					this.evaluationReportDateFlag = true
+				}
+				if(data.signatureEvaluatorFirst){
+					this.signatureEvaluatorFirstFlag = true
+				}
+				if(data.signatureEvaluatorSecond){
+					this.signatureEvaluatorSecondFlag = true
+				}
+
+				if(data.waystEvaluation){
+					this.feeFlag = true
+				}
+				if(data.fixedAssetsEvaluation){
+					this.feeFlag = true
+				}
+				if(data.netAssetsEvaluation){
+					this.feeFlag = true
+				}
+				if(data.rentEvaluation){
+					this.feeFlag = true
+				}
+
+				if(data.reportCharges){
+					this.reportChargesFlag = true
+				}
+				if(data.isInvoice){
+					this.isInvoiceFlag = true
+				}
+				if(data.isContractArchive){
+					this.isContractArchiveFlag = true
+				}
+				if(data.isPapersArchive){
+					this.isPapersArchiveFlag = true
+				}
+
+              this.loading = false
+            })
+          }
+        })
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            this.programProjectListInfoService.supplementSave(this.inputForm).then((data) => {
+              this.close()
+              this.$message.success(data)
+				this.$parent.refreshList()
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+          }
+        })
+      },
+      close () {
+        this.$refs.inputForm.resetFields()
+        this.visible = false
+        this.yearFlag = false
+        this.projectMouldFlag = false
+        this.assessmentObjectiveFlag = false
+        this.assessmentDateFlag = false
+        this.assessmentObjectFlag = false
+        this.assessmentRangeFlag = false
+        this.projectManagerFlag = false
+        this.evaluationReportDateFlag = false
+        this.signatureEvaluatorFirstFlag = false
+        this.signatureEvaluatorSecondFlag = false
+        this.feeFlag = false
+        this.reportChargesFlag = false
+        this.isInvoiceFlag = false
+        this.isContractArchiveFlag = false
+        this.isPapersArchiveFlag = false
+      },
+
+  }
+  }
+</script>
+<style scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
+  .el-divider__text {
+    font-size: 16px;
+    font-weight: bold;
+  }
+</style>

+ 7 - 4
src/views/program/registered/ProjectList.vue

@@ -107,7 +107,8 @@
       <vxe-toolbar ref="toolbarRef" :refresh="{query: refreshList}" export custom>
         <template #buttons>
 <!--          <el-button v-if="hasPermission('program:registered:add')" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>-->
-          <el-button  v-if="(hasPermission('program:registered:add') && overArchiveFlag === 0)" v-show="isOver" type="primary" icon="el-icon-plus" @click="start()">新建</el-button> <a style="color:red;" v-show="!isOver">已登记项目存在信息未填写完成情况,请补充完整</a>
+          <el-button  v-if="(hasPermission('program:registered:add') && overArchiveFlag === 0)" v-show="isOver" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>
+			<a style="color:red;" v-show="!isOver">已登记项目存在信息未填写完成情况,请补充完整(可通过筛选项筛选归档状态为:已归档、超期已归档。进行查看)</a>
         </template>
       </vxe-toolbar>
       <div class="jp-table-body">
@@ -289,6 +290,7 @@
       </div>
     </div>
     <ProjectForm  ref="projectForm" @refreshDataList="refreshList"></ProjectForm>
+    <ProjectAdditionalInformationForm  ref="projectAdditionalInformationForm" @refreshDataList="refreshList"></ProjectAdditionalInformationForm>
     <ProjectFormUpdate ref="projectFormUpdate" @refreshDataList="refreshList"></ProjectFormUpdate>
     <ProofreadForm  ref="proofreadForm" @refreshDataList="refreshList"></ProofreadForm>
     <ProofreadBrowseForm  ref="proofreadBrowseForm" @refreshDataList="refreshList"></ProofreadBrowseForm>
@@ -299,6 +301,7 @@
 <script>
   import ProgramProjectListInfoService from '@/api/program/ProgramProjectListInfoService'
   import ProjectForm from './ProjectForm'
+  import ProjectAdditionalInformationForm from './ProjectAdditionalInformationForm'
   import ProjectFormUpdate from './ProjectFormUpdate'
   import ProofreadForm from './ProofreadForm'
   import ProofreadBrowseForm from './ProofreadBrowseForm'
@@ -374,6 +377,7 @@
     },
     components: {
       ProjectForm,
+	  ProjectAdditionalInformationForm,
       WorkContractForm2,
       ProofreadForm,
       ProofreadBrowseForm,
@@ -430,7 +434,7 @@
         this.$refs.projectForm.init('view', row.id, row.auditId1, row.auditId2, row.auditId3, row.archiveId)
       },
 		editInfo(row){
-			this.$refs.projectForm.init('edit', row.id, row.auditId1, row.auditId2, row.auditId3, row.archiveId)
+			this.$refs.projectAdditionalInformationForm.init('edit', row.id)
 		},
       // 获取数据列表
       refreshList () {
@@ -450,14 +454,13 @@
 		  this.programProjectListInfoService.getOverArchiveFlag().then((data) => {
 			  if (this.commonJS.isNotEmpty(data)) {
 				  this.overArchiveFlag = data
-				  console.log('this.overArchiveFlag', this.overArchiveFlag)
 			  }
 		  })
+		  this.isOver = true
 		  //获取当前登陆人所有的项目
 		  this.programProjectListInfoService.allList().then((data)=>{
 			  data.forEach((data)=>{
 				  if (this.commonJS.isNotEmpty(data.isOver)){
-					  console.log('data.isOver',data.isOver)
 					  this.isOver =data.isOver
 				  }
 			  })

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

@@ -592,7 +592,7 @@
 		  </div>
 		  <div v-if="inputForm.reimbursementType === '1'">
 			  <el-divider content-position="left"><i class="el-icon-document"></i>
-				  <span style="color: red;border-top: 20px">* </span>电发票信息
+				  <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>-->

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

@@ -99,7 +99,7 @@
         <template #buttons>
           <el-button v-if="hasPermission('reimbursement:info:add')" type="primary" icon="el-icon-plus" @click="add()">新建</el-button>
           <el-button v-if="hasPermission('reimbursement:info:del')" type="danger" icon="el-icon-delete" @click="del()" :disabled="$refs.infoTable && $refs.infoTable.getCheckboxRecords().length === 0" plain>删除</el-button>
-		  <el-button type="warning" icon="el-icon-download" @click="exportInvoiceReimbursementFile()" plain>电发票报销</el-button>
+		  <el-button type="warning" icon="el-icon-download" @click="exportInvoiceReimbursementFile()" plain>电发票报销</el-button>
         </template>
       </vxe-toolbar>
       <div class="jp-table-body">
@@ -620,7 +620,7 @@
           ...this.searchForm
         }).then((res) => {
           // 将二进制流文件写入excel表,以下为重要步骤
-          this.$utils.downloadExcel(res, '评估-报销电发票报销列表')
+          this.$utils.downloadExcel(res, '评估-报销电发票报销列表')
           this.loading = false
         }).catch(function (err) {
           this.loading = false

+ 23 - 23
src/views/reimbursement/info/ReimbursementForm.vue

@@ -626,7 +626,7 @@
 
 			<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>电发票信息
+					<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>-->
@@ -1127,44 +1127,44 @@
 					for (let j = 0; j < i; j++) {
 						let k = j + 1
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceType)) {
-							this.$message.error('电发票信息 第' + k + '行请选择发票类型')
+							this.$message.error('电发票信息 第' + k + '行请选择发票类型')
 							this.loading = false
-							throw new Error('电发票信息 第' + k + '行请选择发票类型')
+							throw new Error('电发票信息 第' + k + '行请选择发票类型')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceProjectName)) {
-							this.$message.error('电发票信息 第' + k + '行请填写发票项目名')
+							this.$message.error('电发票信息 第' + k + '行请填写发票项目名')
 							this.loading = false
-							throw new Error('电发票信息 第' + k + '行请填写发票项目名')
+							throw new Error('电发票信息 第' + k + '行请填写发票项目名')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].number)) {
-							this.$message.error('电发票信息 第' + k + '行请填写发票号')
+							this.$message.error('电发票信息 第' + k + '行请填写发票号')
 							this.loading = false
-							throw new Error('电发票信息 第' + k + '行请填写发票号')
+							throw new Error('电发票信息 第' + k + '行请填写发票号')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceDate)) {
-							this.$message.error('电发票信息 第' + k + '行请填写发票日期')
+							this.$message.error('电发票信息 第' + k + '行请填写发票日期')
 							this.loading = false
-							throw new Error('电发票信息 第' + k + '行请填写发票日期')
+							throw new Error('电发票信息 第' + k + '行请填写发票日期')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-							this.$message.error('电发票信息 第' + k + '行请填写发票单位')
+							this.$message.error('电发票信息 第' + k + '行请填写发票单位')
 							this.loading = false
-							throw new Error('电发票信息 第' + k + '行请填写发票单位')
+							throw new Error('电发票信息 第' + k + '行请填写发票单位')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-							this.$message.error('电发票信息 第' + k + '行请填写发票单位')
+							this.$message.error('电发票信息 第' + k + '行请填写发票单位')
 							this.loading = false
-							throw new Error('电发票信息 第' + k + '行请填写发票单位')
+							throw new Error('电发票信息 第' + k + '行请填写发票单位')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
-							this.$message.error('电发票信息 第' + k + '行请填写金额')
+							this.$message.error('电发票信息 第' + k + '行请填写金额')
 							this.loading = false
-							throw new Error('电发票信息 第' + k + '行请填写金额')
+							throw new Error('电发票信息 第' + k + '行请填写金额')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].taxAmount)) {
-							this.$message.error('电发票信息 第' + k + '行请填写税额')
+							this.$message.error('电发票信息 第' + k + '行请填写税额')
 							this.loading = false
-							throw new Error('电发票信息 第' + k + '行请填写税额')
+							throw new Error('电发票信息 第' + k + '行请填写税额')
 						}
 
 					}
@@ -1442,9 +1442,9 @@
 
 						this.dataFiltering()
 						if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
-							this.$message.error("请上传电发票发票xml文件!")
+							this.$message.error("请上传电发票发票xml文件!")
 							this.loading = false
-							throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
+							throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
 						}
 						//判定附件中xml文件数量是否小于电子发票报销行数量
 						if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
@@ -1465,9 +1465,9 @@
 									}
 								}
 								if(!flag){
-									this.$message.error("已填写电发票信息,请上传对应发票的xml文件!")
+									this.$message.error("已填写电发票信息,请上传对应发票的xml文件!")
 									this.loading = false
-									throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
+									throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
 								}
 							}
 						}
@@ -1662,9 +1662,9 @@
 						if(item.number === row.number) {
 							count ++;
 							if(count === 2){
-								this.$message.error('电发票号:' + row.number + ' 已存在')
+								this.$message.error('电发票号:' + row.number + ' 已存在')
 								row.number = ''
-								throw new Error('电发票号:' + row.number + ' 已存在')
+								throw new Error('电发票号:' + row.number + ' 已存在')
 							}
 						}
 					}

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

@@ -563,7 +563,7 @@
 		  </div>
 		  <div v-if="inputForm.reimbursementType === '1'">
 			  <el-divider content-position="left"><i class="el-icon-document"></i>
-				  <span style="color: red;border-top: 20px">* </span>电发票信息
+				  <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>-->

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

@@ -108,7 +108,7 @@
         <template #buttons>
           <el-button v-if="hasPermission('zsReimbursement:info:add')" type="primary" icon="el-icon-plus" @click="add()">新建</el-button>
           <el-button v-if="hasPermission('zsReimbursement:info:del')" type="danger" icon="el-icon-delete" @click="del()" :disabled="$refs.infoTable && $refs.infoTable.getCheckboxRecords().length === 0" plain>删除</el-button>
-			<el-button type="warning" icon="el-icon-download" @click="exportInvoiceReimbursementFile()" plain>电发票报销</el-button>
+			<el-button type="warning" icon="el-icon-download" @click="exportInvoiceReimbursementFile()" plain>电发票报销</el-button>
         </template>
       </vxe-toolbar>
       <div  class="jp-table-body">
@@ -657,7 +657,7 @@
 				...this.searchForm
 			}).then((res) => {
 				// 将二进制流文件写入excel表,以下为重要步骤
-				this.$utils.downloadExcel(res, '中审-报销电发票报销列表')
+				this.$utils.downloadExcel(res, '中审-报销电发票报销列表')
 				this.loading = false
 			}).catch(function (err) {
 				this.loading = false

+ 23 - 23
src/views/zs/reimbursement/info/ReimbursementForm.vue

@@ -552,7 +552,7 @@
 		<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>-->
@@ -1041,44 +1041,44 @@
 				for (let j = 0; j < i; j++) {
 					let k = j + 1
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceType)) {
-						this.$message.error('电发票信息 第' + k + '行请选择发票类型')
+						this.$message.error('电发票信息 第' + k + '行请选择发票类型')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请选择发票类型')
+						throw new Error('电发票信息 第' + k + '行请选择发票类型')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceProjectName)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票项目名')
+						this.$message.error('电发票信息 第' + k + '行请填写发票项目名')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票项目名')
+						throw new Error('电发票信息 第' + k + '行请填写发票项目名')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].number)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票号')
+						this.$message.error('电发票信息 第' + k + '行请填写发票号')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票号')
+						throw new Error('电发票信息 第' + k + '行请填写发票号')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceDate)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票日期')
+						this.$message.error('电发票信息 第' + k + '行请填写发票日期')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票日期')
+						throw new Error('电发票信息 第' + k + '行请填写发票日期')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票单位')
+						this.$message.error('电发票信息 第' + k + '行请填写发票单位')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票单位')
+						throw new Error('电发票信息 第' + k + '行请填写发票单位')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-						this.$message.error('电发票信息 第' + k + '行请填写发票单位')
+						this.$message.error('电发票信息 第' + k + '行请填写发票单位')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写发票单位')
+						throw new Error('电发票信息 第' + k + '行请填写发票单位')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
-						this.$message.error('电发票信息 第' + k + '行请填写金额')
+						this.$message.error('电发票信息 第' + k + '行请填写金额')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写金额')
+						throw new Error('电发票信息 第' + k + '行请填写金额')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].taxAmount)) {
-						this.$message.error('电发票信息 第' + k + '行请填写税额')
+						this.$message.error('电发票信息 第' + k + '行请填写税额')
 						this.loading = false
-						throw new Error('电发票信息 第' + k + '行请填写税额')
+						throw new Error('电发票信息 第' + k + '行请填写税额')
 					}
 
 				}
@@ -1347,9 +1347,9 @@
 			  this.inputForm.files = this.$refs.uploadComponent.getDataList()
 			  this.dataFiltering()
 			  if(this.inputForm.invoiceReimbursementFiles<=0 && "1" === this.inputForm.reimbursementType){
-				  this.$message.error("请上传电发票发票xml文件!")
+				  this.$message.error("请上传电发票发票xml文件!")
 				  this.loading = false
-				  throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
+				  throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
 			  }
 			  //判定附件中xml文件数量是否小于电子发票报销行数量
 			  if (this.commonJS.isNotEmpty(this.inputForm.invoiceReimbursements) && "1" === this.inputForm.reimbursementType) {
@@ -1370,9 +1370,9 @@
 						  }
 					  }
 					  if(!flag){
-						  this.$message.error("已填写电发票信息,请上传对应发票的xml文件!")
+						  this.$message.error("已填写电发票信息,请上传对应发票的xml文件!")
 						  this.loading = false
-						  throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
+						  throw new Error("已填写电发票信息,请上传对应发票的xml文件!")
 					  }
 				  }
 			  }
@@ -1519,9 +1519,9 @@
 				  if(item.number === row.number) {
 					  count ++;
 					  if(count === 2){
-						  this.$message.error('电发票号:' + row.number + ' 已存在')
+						  this.$message.error('电发票号:' + row.number + ' 已存在')
 						  row.number = ''
-						  throw new Error('电发票号:' + row.number + ' 已存在')
+						  throw new Error('电发票号:' + row.number + ' 已存在')
 					  }
 				  }
 			  }