Bladeren bron

报销调整

huangguoce 1 maand geleden
bovenliggende
commit
2a0d57926b

+ 13 - 3
src/views/common/NewDigitalInvoiceUploadComponent.vue

@@ -218,7 +218,7 @@ export default {
 				"IssuItemInformationTotaltaxIncludedAmount",//
 				"InvoiceNumber",// 发票号
 				// "TaxBureauCode",
-				"IssuItemInformationComTaxAm",//
+				"IssuItemInformationComTaxAm", //
 				// "EIid",
 				"IssuItemInformationItemName",//项目名
 				//"SellerInformationSellerBankName",//
@@ -405,8 +405,14 @@ export default {
 					this.showDivider = true
 				}
 			}
+			console.log(this.isConfirm);
+			console.log(this.isConfirm);
+			console.log(this.isConfirm);
+			console.log(this.isConfirm);
+			console.log(this.isConfirm);
+
 			// 如果是综合管理部主任,可以拖拽发票顺序
-			if (this.isConfirm == 1) {
+			if (this.isConfirm == 1 || this.isConfirm == 4) {
 				const tbody = this.$refs.uploadTable.$el.querySelector('.el-table__body-wrapper tbody');
 				Sortable.create(tbody, {
 					group: 'shared',
@@ -753,7 +759,11 @@ export default {
 				obj.IssuItemInformationItemName = obj.SpecificInformationMotorVehicleSalesVehicleModel
 			}
 			//--------------------------
-
+			if (labelCode == '02') {
+				if (!obj.IssuItemInformationComTaxAm) {
+					obj.IssuItemInformationComTaxAm = 0
+				}
+			}
 			// 遍历字段数组,检查每个字段名是否在对象中存在
 			for (let field of fields) {
 				// 忽略大小写来匹配属性名

+ 16 - 11
src/views/common/reimbursement/ReimbursementComponent.vue

@@ -97,7 +97,7 @@
                             </template>
                         </vxe-table-column>
                         <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}" show-overflow="title"
-                            width="180">
+                            min-width="180">
                             <template #edit="scope">
                                 <el-input :readonly="true" v-model="scope.row.reportNumber"></el-input>
                             </template>
@@ -146,7 +146,7 @@
                             </vxe-table-column>
                         </vxe-colgroup>
                         <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title"
-                            width="150">
+                            min-width="180">
                             <template #edit="scope">
                                 <el-input v-model="scope.row.content"></el-input>
                             </template>
@@ -232,7 +232,7 @@
                             </template>
                         </vxe-table-column>
                         <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}" show-overflow="title"
-                            width="180">
+                            min-width="180">
                             <template v-slot:edit="scope">
                                 <el-input :readonly="true" v-model="scope.row.reportNumber"
                                     @focus="openReportNoPageFormCwProject(scope.$rowIndex, scope.row)"></el-input>
@@ -281,7 +281,7 @@
                             </vxe-table-column>
                         </vxe-colgroup>
                         <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title"
-                            width="150">
+                            min-width="180">
                             <template #edit="scope">
                                 <el-input v-model="scope.row.content"></el-input>
                             </template>
@@ -411,7 +411,7 @@
                             </vxe-table-column>
                         </vxe-colgroup>
                         <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title"
-                            width="150">
+                            min-width="180">
                             <template #edit="scope">
                                 <el-input v-model="scope.row.content"></el-input>
                             </template>
@@ -525,7 +525,8 @@
                         <vxe-table-column field="receiptNumberCount" title="汇总" show-overflow="title" width="120">
                         </vxe-table-column>
                     </vxe-colgroup>
-                    <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title" width="150">
+                    <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title"
+                        min-width="180">
                         <template #edit="scope">
                             <el-input v-model="scope.row.content"></el-input>
                         </template>
@@ -610,7 +611,7 @@
                             </template>
                         </vxe-table-column>
                         <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}" show-overflow="title"
-                            width="180">
+                            min-width="180">
                             <template v-slot:edit="scope">
                                 <el-input :readonly="true" v-model="scope.row.reportNumber"
                                     @focus="openReportNoPageForm(scope.$rowIndex, scope.row)"></el-input>
@@ -660,7 +661,7 @@
                             </vxe-table-column>
                         </vxe-colgroup>
                         <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title"
-                            width="150">
+                            min-width="180">
                             <template #edit="scope">
                                 <el-input v-model="scope.row.content"></el-input>
                             </template>
@@ -789,7 +790,7 @@
                             </vxe-table-column>
                         </vxe-colgroup>
                         <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title"
-                            width="150">
+                            min-width="180">
                             <template #edit="scope">
                                 <el-input v-model="scope.row.content"></el-input>
                             </template>
@@ -921,7 +922,7 @@
                             </vxe-table-column>
                         </vxe-colgroup>
                         <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title"
-                            width="150">
+                            min-width="180">
                             <template #edit="scope">
                                 <el-input v-model="scope.row.content"></el-input>
                             </template>
@@ -1183,7 +1184,7 @@
                             </vxe-table-column>
                         </vxe-colgroup>
                         <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title"
-                            width="150">
+                            min-width="180">
                             <template #edit="scope">
                                 <el-input v-model="scope.row.content"></el-input>
                             </template>
@@ -1521,6 +1522,10 @@ export default {
                 this.inputForm = inputForm
             }
             if (this.commonJS.isNotEmpty(isConfirm)) {
+                if (this.inputForm.userId == this.$store.state.user.id) {
+                    isConfirm = 4
+                }
+
                 this.isConfirm = isConfirm
             }
             if (this.commonJS.isNotEmpty(status)) {