Explorar el Código

feature(*): 1、首页增加当年已开票金额统计
2、项目详情中发票信息新建发票增加开票信息填写,修改审批流表单信息增加开票信息

likai hace 2 años
padre
commit
4eed312a9b

+ 21 - 0
src/views/contract/components/DetailsInvoice.vue

@@ -56,6 +56,12 @@
           <span v-else-if="item.prop == 'actualInvoiceDate'">
             {{ parseTime(row.actualInvoiceDate, '{y}-{m}-{d}') }}
           </span>
+          <span v-else-if="item.prop == 'address'">
+            {{ row.address + '、' + row.phone }}
+          </span>
+          <span v-else-if="item.prop == 'bank'">
+            {{ row.bank + '、' + row.accountNo }}
+          </span>
           <span v-else-if="item.prop == 'invoiceAmount'">
             {{ formatPrice(row.invoiceAmount) }}
           </span>
@@ -133,6 +139,21 @@
             width: 'auto',
             prop: 'courierCode',
           },
+          {
+            label: '税号',
+            width: 'auto',
+            prop: 'taxNo',
+          },
+          {
+            label: '地址、电话',
+            width: 'auto',
+            prop: 'address',
+          },
+          {
+            label: '开户行、账号',
+            width: 'auto',
+            prop: 'bank',
+          },
           {
             label: '审核状态',
             prop: 'approStatus',

+ 39 - 0
src/views/contract/components/EditInvoice.vue

@@ -44,6 +44,37 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="税号" prop="taxNo">
+            <el-input v-model="editForm.taxNo" placeholder="请输入税号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="地址" prop="address">
+            <el-input v-model="editForm.address" placeholder="请输入地址" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="电话" prop="phone">
+            <el-input v-model="editForm.phone" placeholder="请输入电话" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开户行" prop="bank">
+            <el-input v-model="editForm.bank" placeholder="请输入开户行" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="账号" prop="accountNo">
+            <el-input v-model="editForm.accountNo" placeholder="请输入账号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="备注" prop="remark">
@@ -84,6 +115,11 @@
           contractId: null, //合同id
           invoiceAmount: '', //开票金额
           invoiceType: '', //开票类型
+          taxNo: '', // 税号
+          address: '', // 地址
+          phone: '', // 电话
+          bank: '', // 开户行
+          accountNo: '', // 账号
           remark: '', //备注
         },
         editRules: {
@@ -91,6 +127,9 @@
           invoiceAmount: [{ required: true, trigger: 'blur', message: '请输入开票金额' }],
           invoiceDate: [{ required: true, trigger: 'change', message: '请选择开票日期' }],
           invoiceType: [{ required: true, trigger: 'chgange', message: '请输入开票类型' }],
+          taxNo: [{ required: true, trigger: 'blur', message: '请输入税号' }],
+          address: [{ required: true, trigger: 'blur', message: '请输入地址' }],
+          phone: [{ required: true, trigger: 'blur', message: '请输入电话' }],
         },
       }
     },

+ 3 - 0
src/views/contract/components/Invoicing.vue

@@ -68,6 +68,9 @@
           invoiceCode: [{ required: true, trigger: 'blur', message: '请输入发票号码' }],
           actualInvoiceDate: [{ required: true, trigger: 'change', message: '请选择实际开票日期' }],
           courierCode: [{ required: true, trigger: 'blur', message: '请输入快递单号' }],
+          taxNo: [{ required: true, trigger: 'blur', message: '请输入税号' }],
+          address: [{ required: true, trigger: 'blur', message: '请输入地址' }],
+          phone: [{ required: true, trigger: 'blur', message: '请输入电话' }],
         },
       }
     },

+ 22 - 1
src/views/contract/invoice.vue

@@ -50,7 +50,7 @@
         :sortable="item.sortable">
         <template #default="{ row }">
           <span v-if="item.prop == 'invoiceType'">
-            {{ selectDictLabel(invoiceTypeData, row.collectionType) }}
+            {{ selectDictLabel(invoiceTypeData, row.invoiceType) }}
           </span>
           <span v-else-if="item.prop == 'approStatus'">
             {{
@@ -74,6 +74,12 @@
           <span v-else-if="item.prop == 'actualInvoiceDate'">
             {{ parseTime(row.actualInvoiceDate, '{y}-{m}-{d}') }}
           </span>
+          <span v-else-if="item.prop == 'address'">
+            {{ row.address + '、' + row.phone }}
+          </span>
+          <span v-else-if="item.prop == 'bank'">
+            {{ row.bank + '、' + row.accountNo }}
+          </span>
           <span v-else-if="item.prop == 'invoiceAmount'">
             {{ formatPrice(row.invoiceAmount) }}
           </span>
@@ -184,6 +190,21 @@
             width: 'auto',
             prop: 'courierCode',
           },
+          {
+            label: '税号',
+            width: 'auto',
+            prop: 'taxNo',
+          },
+          {
+            label: '地址、电话',
+            width: 'auto',
+            prop: 'address',
+          },
+          {
+            label: '开户行、账号',
+            width: 'auto',
+            prop: 'bank',
+          },
           {
             label: '审核状态',
             prop: 'approStatus',