user5 3 роки тому
батько
коміт
0ddffe8f3d

+ 1 - 1
src/views/modules/reimbursementSys/reimbursementInvoiceForm.vue

@@ -35,7 +35,7 @@
         <el-col :span="12">
           <el-form-item label="开票日期" prop="makeTime"
                         :rules="[
-                  {required: true, message:'收款日期不能为空', trigger:'blur'}
+                  {trigger:'blur'}
                  ]">
             <el-date-picker
               style="width: 100%;"

+ 7 - 5
src/views/modules/reimbursementSys/reimbursementList.vue

@@ -81,6 +81,13 @@
           <vxe-column  width="100px" title="税额" field="tax" align="center"></vxe-column>
           <vxe-column  width="100px" title="收入" field="income" align="center"></vxe-column>
           <vxe-column  width="100px" title="报销比例%" field="reimbursementRatio" align="center"></vxe-column>
+          <vxe-column  width="100px"  title="状态" field="reimbursementStatus">
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.reimbursementStatus === '1'"> 已完成</el-tag>
+            </template>
+          </vxe-column>
+          <vxe-column  width="100px" title="可报金额" field="canReimbursementAmount" align="center"></vxe-column>
+          <vxe-column  width="100px" title="已报金额" field="allAlreadyReimbursementQuota" align="center"></vxe-column>
           <vxe-column  width="200px" title="购方企业名称" field="firmName" align="center"></vxe-column>
           <vxe-column  width="100px" title="开票日期" field="makeTime" align="center"></vxe-column>
           <vxe-column  width="150px" title="商品名称" field="name" align="center"></vxe-column>
@@ -88,11 +95,6 @@
           <vxe-column  width="100px" title="部门" field="partner" align="center"></vxe-column>
           <vxe-column  width="100px" title="业务类型" field="businessType" align="center"></vxe-column>
           <vxe-column  width="100px" title="收款日期" field="gatheringTime" align="center"></vxe-column>
-          <vxe-column  width="100px"  title="状态" field="reimbursementStatus">
-            <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.reimbursementStatus === '1'"> 已完成</el-tag>
-            </template>
-          </vxe-column>
 
 
           <vxe-column title="操作" width="300px" fixed="right" align="center">