Browse Source

开票添加邮箱功能

user5 1 năm trước cách đây
mục cha
commit
5c47d42797

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

@@ -420,12 +420,13 @@
           </el-form-item>
         </el-col>
 		  <el-col :span="12">
-			  <el-form-item label="邮箱" prop="actualDrawerEmailAddress"
+			  <el-form-item label="接收邮箱" prop="actualDrawerEmailAddress"
 							:rules="[
+							{required: true, message:'邮箱不能为空', trigger:'blur'},
 							{required: true, message:'邮箱不能为空', trigger:'change'}
                ]">
-				  <el-input v-model="inputForm.actualDrawerEmailAddress" placeholder="请输入邮箱" show-word-limit style="width: 86%" @blur="checkEmail"></el-input>
-				  <el-button type="primary" @click="openDia">邮箱</el-button>
+				  <el-input v-model="inputForm.actualDrawerEmailAddress" placeholder="请输入接收邮箱" show-word-limit @blur="checkEmail" maxlength="50"></el-input>
+				  <el-button  type="primary" style="position: absolute;right: 0px;" @click="openDia">完善邮箱</el-button>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">
@@ -949,8 +950,11 @@
 			  this.$nextTick(() => {
 				  var user = this.$TOOL.data.get("USER_INFO")
 				  this.inputForm.tenantId = user.tenantDTO.id
-				  this.userPhone = user.mobile
-				  this.userEmail = user.email
+				  userService.queryById(user.id).then((data) => {
+					  this.userPhone = data.mobile
+					  this.userEmail = data.email
+
+				  });
 				  this.$refs.inputForm.resetFields()
 				  this.loading = true
 				  financeInvoiceService.queryById(this.inputForm.id).then((data) => {
@@ -1241,6 +1245,10 @@
 							  throw new Error('需上传开票明细相关文件')
 						  }
 					  }
+
+					  //验证邮箱
+				      this.checkEmail()
+
 					  financeInvoiceService.saveForm(this.inputForm).then((data) => {
 						  if (status === 'start' || status === 'reapply') {
 							  this.inputForm.title = `${this.$store.state.user.name} 发起了 ${data.no} [财务-发票申请]`
@@ -1266,7 +1274,6 @@
 				  programName: '',
 				  contractName: '',
 				  programNo: '',
-				  reportNo: '',
 				  clientName: '',
 				  reportNo: '',
 				  type: '1',
@@ -1732,9 +1739,9 @@
 		  checkEmail() {
 			  if (this.commonJS.isNotEmpty(this.inputForm.actualDrawerEmailAddress)){
 				  if (!this.validateXG.isEmail(this.inputForm.actualDrawerEmailAddress)) {
-					  this.$message.error("邮箱格式错误")
+					  this.$message.error("请输入正确的邮箱地址")
 					  this.loading = false
-					  throw new Error("邮箱格式错误")
+					  throw new Error("请输入正确的邮箱地址")
 				  }
 			   }
 		  }

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

@@ -159,7 +159,7 @@
 					<!--            </vxe-table-column>-->
 					<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						<template #default="scope">
-							<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -237,7 +237,7 @@
 					<!--            </vxe-table-column>-->
 					<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						<template #default="scope">
-							<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -315,7 +315,7 @@
 					</vxe-table-column>
 					<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						<template #default="scope">
-							<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -393,7 +393,7 @@
 					<!--            </vxe-table-column>-->
 					<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						<template #default="scope">
-							<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -471,7 +471,7 @@
 					<!--            </vxe-table-column>-->
 					<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						<template #default="scope">
-							<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">

+ 8 - 7
src/views/cw/reimbursementApproval/info/InfoUpdateForm.vue

@@ -162,7 +162,7 @@
 				  <!--            </vxe-table-column>-->
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -239,7 +239,7 @@
 				  <!--            </vxe-table-column>-->
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -316,7 +316,7 @@
 				  </vxe-table-column>
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -393,7 +393,7 @@
 				  <!--            </vxe-table-column>-->
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -470,7 +470,7 @@
 				  <!--            </vxe-table-column>-->
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -528,12 +528,12 @@
 				</vxe-table-column>
 				<vxe-table-column field="amount" title="金额" :edit-render="{}">
 					<template v-slot:edit="scope">
-						<el-input maxlength="15" v-model="scope.row.amount" @keyup.native="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
+						<el-input maxlength="15" 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="{}">
 					<template v-slot:edit="scope">
-						<el-input maxlength="15" v-model="scope.row.taxAmount" @keyup.native="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
+						<el-input maxlength="15" 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="{}">
@@ -1141,6 +1141,7 @@
       },
       twoDecimalPlaces (num) {
         let str = num.toString()
+		  str=str.replace(/\s+/g,"");
         var len1 = str.substr(0, 1)
         var len2 = str.substr(1, 1)
         // eslint-disable-next-line eqeqeq

+ 8 - 7
src/views/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -190,7 +190,7 @@
 				  <!--            </vxe-table-column>-->
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -267,7 +267,7 @@
 				  <!--            </vxe-table-column>-->
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -344,7 +344,7 @@
 				  </vxe-table-column>
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -421,7 +421,7 @@
 				  <!--            </vxe-table-column>-->
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -498,7 +498,7 @@
 				  <!--            </vxe-table-column>-->
 				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 					  <template v-slot:edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+						  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -556,12 +556,12 @@
 				</vxe-table-column>
 				<vxe-table-column field="amount" title="金额" :edit-render="{}">
 					<template v-slot:edit="scope">
-						<el-input maxlength="15" v-model="scope.row.amount" @keyup.native="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
+						<el-input maxlength="15" 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="{}">
 					<template v-slot:edit="scope">
-						<el-input maxlength="15" v-model="scope.row.taxAmount" @keyup.native="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
+						<el-input maxlength="15" 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="{}">
@@ -1195,6 +1195,7 @@
       },
       twoDecimalPlaces (num) {
         let str = num.toString()
+		  str=str.replace(/\s+/g,"");
         var len1 = str.substr(0, 1)
         var len2 = str.substr(1, 1)
         // eslint-disable-next-line eqeqeq

+ 0 - 12
src/views/cw/reportManagement/ReportSignatureForm.vue

@@ -691,18 +691,6 @@
 						</el-tab-pane>
 					</el-tabs>
 				</el-form>
-				<el-form :model="inputForm" :class="method==='view'?'readonly':''">
-					<el-row :gutter="15">
-					<el-col style="margin-top: 15px">
-						<el-form-item label="修改原因" prop="sigReason"
-									  :rules="[
-							  {required: true, message:'修改原因不能为空', trigger:'blur'}
-                   ]">
-							<el-input type="textarea" :disabled="status === 'audit' || status === 'taskFormDetail'" v-model="inputForm.sigReason" placeholder="请填写修改签字注师原因" clearable></el-input>
-						</el-form-item>
-					</el-col>
-					</el-row>
-				</el-form>
 			</el-col>
 		</el-row>
 		<ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>

+ 20 - 5
src/views/finance/invoice/InvoiceFormTask.vue

@@ -350,12 +350,13 @@
           </el-form-item>
         </el-col>
 		  <el-col :span="12">
-			  <el-form-item label="邮箱" prop="actualDrawerEmailAddress"
+			  <el-form-item label="接收邮箱" prop="actualDrawerEmailAddress"
 							:rules="[
+							{required: true, message:'邮箱不能为空', trigger:'blur'},
 							{required: true, message:'邮箱不能为空', trigger:'change'}
                ]">
-				  <el-input v-model="inputForm.actualDrawerEmailAddress" placeholder="请输入邮箱" show-word-limit style="width: 84%" @blur="checkEmail"></el-input>
-				  <el-button type="primary" @click="openDia">邮箱</el-button>
+				  <el-input v-model="inputForm.actualDrawerEmailAddress" placeholder="请输入接收邮箱" show-word-limit @blur="checkEmail" maxlength="50"></el-input>
+				  <el-button  type="primary" style="position: absolute;right: 0px;" @click="openDia">完善邮箱</el-button>
 			  </el-form-item>
 		  </el-col>
         <el-col :span="12">
@@ -865,10 +866,21 @@
         this.visible = true
         this.loading = false
         this.$nextTick(() => {
+			var user = this.$TOOL.data.get("USER_INFO")
+			this.inputForm.tenantId = user.tenantDTO.id
+			userService.queryById(user.id).then((data) => {
+				this.userPhone = data.mobile
+				this.userEmail = data.email
+
+			});
           this.$refs.inputForm.resetFields()
+		  this.loading = true
           this.financeInvoiceService.queryById(this.inputForm.id).then(async (data) => {
             await this.$refs.uploadComponent.clearUpload()
             this.inputForm = this.recover(this.inputForm, data)
+			  if (this.commonJS.isEmpty(this.inputForm.actualDrawerEmailAddress)) {
+				  this.inputForm.actualDrawerEmailAddress = this.userEmail
+			  }
             this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
             if (!this.commonJS.isEmpty(this.inputForm.billingWorkplaceRealId)) {
               this.workClientService.findById(this.inputForm.billingWorkplaceRealId).then((data) => {
@@ -1097,6 +1109,9 @@
                 throw new Error('需上传开票明细相关文件')
               }
             }
+			//验证邮箱
+			this.checkEmail()
+
             this.financeInvoiceService.saveForm(this.inputForm).then((data) => {
               this.inputForm.id = data.businessId
               callback(data.businessTable, data.businessId, this.inputForm)
@@ -1540,9 +1555,9 @@
 		checkEmail() {
 			if (this.commonJS.isNotEmpty(this.inputForm.actualDrawerEmailAddress)){
 				if (!this.validateXG.isEmail(this.inputForm.actualDrawerEmailAddress)) {
-					this.$message.error("邮箱格式错误")
+					this.$message.error("请输入正确的邮箱地址")
 					this.loading = false
-					throw new Error("邮箱格式错误")
+					throw new Error("请输入正确的邮箱地址")
 				}
 			}
 		}

+ 8 - 7
src/views/reimbursement/info/InfoForm.vue

@@ -169,7 +169,7 @@
 					  </vxe-table-column>
 					  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						  <template #edit="scope">
-							  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						  </template>
 					  </vxe-table-column>
 					  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -250,7 +250,7 @@
 					  <!--            </vxe-table-column>-->
 					  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						  <template #edit="scope">
-							  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						  </template>
 					  </vxe-table-column>
 					  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -331,7 +331,7 @@
 					  </vxe-table-column>
 					  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						  <template #edit="scope">
-							  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						  </template>
 					  </vxe-table-column>
 					  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -412,7 +412,7 @@
 					  <!--            </vxe-table-column>-->
 					  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						  <template #edit="scope">
-							  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						  </template>
 					  </vxe-table-column>
 					  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -493,7 +493,7 @@
 					  <!--            </vxe-table-column>-->
 					  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						  <template #edit="scope">
-							  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						  </template>
 					  </vxe-table-column>
 					  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -555,12 +555,12 @@
 					</vxe-table-column>
 					<vxe-table-column field="amount" title="金额" :edit-render="{}">
 						<template #edit="scope">
-							<el-input maxlength="15" v-model="scope.row.amount" @keyup.native="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
+							<el-input maxlength="15" 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="{}">
 						<template #edit="scope">
-							<el-input maxlength="15" v-model="scope.row.taxAmount" @keyup.native="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
+							<el-input maxlength="15" 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="{}">
@@ -814,6 +814,7 @@
       },
       twoDecimalPlaces (num) {
         let str = num.toString()
+		  str=str.replace(/\s+/g,"");
         var len1 = str.substr(0, 1)
         var len2 = str.substr(1, 1)
         // eslint-disable-next-line eqeqeq

+ 8 - 7
src/views/reimbursement/info/ReimbursementForm.vue

@@ -201,7 +201,7 @@
 							</vxe-table-column>
 							<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 								<template #edit="scope">
-									<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+									<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -283,7 +283,7 @@
 							<!--            </vxe-table-column>-->
 							<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 								<template #edit="scope">
-									<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+									<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -364,7 +364,7 @@
 							</vxe-table-column>
 							<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 								<template #edit="scope">
-									<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+									<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -445,7 +445,7 @@
 							<!--            </vxe-table-column>-->
 							<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 								<template #edit="scope">
-									<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+									<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -526,7 +526,7 @@
 							<!--            </vxe-table-column>-->
 							<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 								<template #edit="scope">
-									<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+									<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -587,12 +587,12 @@
 						</vxe-table-column>
 						<vxe-table-column field="amount" title="金额" :edit-render="{}">
 							<template #edit="scope">
-								<el-input maxlength="15" v-model="scope.row.amount" @keyup.native="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
+								<el-input maxlength="15" 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="{}">
 							<template #edit="scope">
-								<el-input maxlength="15" v-model="scope.row.taxAmount" @keyup.native="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
+								<el-input maxlength="15" 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="{}">
@@ -1216,6 +1216,7 @@
 			},
 			twoDecimalPlaces (num) {
 				let str = num.toString()
+				str=str.replace(/\s+/g,"");
 				var len1 = str.substr(0, 1)
 				var len2 = str.substr(1, 1)
 				// eslint-disable-next-line eqeqeq

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

@@ -155,7 +155,7 @@
 <!--                          </vxe-table-column>-->
               <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
                 <template #edit="scope">
-                  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+                  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
                 </template>
               </vxe-table-column>
               <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -233,7 +233,7 @@
               <!--            </vxe-table-column>-->
               <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
                 <template #edit="scope">
-                  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+                  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
                 </template>
               </vxe-table-column>
               <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -311,7 +311,7 @@
               </vxe-table-column>
               <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
                 <template #edit="scope">
-                  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+                  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
                 </template>
               </vxe-table-column>
               <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -388,7 +388,7 @@
 					  <!--            </vxe-table-column>-->
 					  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						  <template #edit="scope">
-							  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						  </template>
 					  </vxe-table-column>
 					  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -468,7 +468,7 @@
               <!--            </vxe-table-column>-->
               <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
                 <template #edit="scope">
-                  <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+                  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
                 </template>
               </vxe-table-column>
               <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">

+ 8 - 7
src/views/zs/reimbursement/info/ReimbursementForm.vue

@@ -151,7 +151,7 @@
 <!--            </vxe-table-column>-->
             <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
               <template #edit="scope">
-                <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+                <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -227,7 +227,7 @@
 <!--            </vxe-table-column>-->
             <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
               <template #edit="scope">
-                <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+                <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -303,7 +303,7 @@
             </vxe-table-column>
             <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
               <template #edit="scope">
-                <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+                <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -380,7 +380,7 @@
 					<!--            </vxe-table-column>-->
 					<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
 						<template #edit="scope">
-							<el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+							<el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -457,7 +457,7 @@
             <!--            </vxe-table-column>-->
             <vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
               <template #edit="scope">
-                <el-input maxlength="15" v-model="scope.row.number" @keyup.native="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+                <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}">
@@ -514,12 +514,12 @@
 				  </vxe-table-column>
 				  <vxe-table-column field="amount" title="金额" :edit-render="{}">
 					  <template #edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.amount" @keyup.native="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
+						  <el-input maxlength="15" 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="{}">
 					  <template #edit="scope">
-						  <el-input maxlength="15" v-model="scope.row.taxAmount" @keyup.native="scope.row.taxAmount = twoDecimalPlaces(scope.row.taxAmount)" @change="countAmount(scope.row)"></el-input>
+						  <el-input maxlength="15" 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="{}">
@@ -1083,6 +1083,7 @@
       },
       twoDecimalPlaces (num) {
         let str = num.toString()
+		  str=str.replace(/\s+/g,"");
         var len1 = str.substr(0, 1)
         var len2 = str.substr(1, 1)
         // eslint-disable-next-line eqeqeq