Forráskód Böngészése

fix:发票上传表格高度

snow 1 éve
szülő
commit
36edb3b760

+ 4 - 25
src/components/approval-node/src/uploadInvoice/index.vue

@@ -4,10 +4,8 @@
       <el-button size="mini" @click="onDownloadTemplate">下载发票模板</el-button>
       <el-button size="mini" type="primary" @click="xlsxVisible = true">上传发票信息</el-button>
     </div>
-    <el-table size="mini" style="margin-top:10px" border :data="tableData" height="400px">
+    <el-table size="mini" style="margin-top:10px" border :data="tableData" max-height="400px">
       <el-table-column label="序号" :type="'index'" width="45px"></el-table-column>
-      <!-- <el-table-column label="发票申请编号" prop="invoiceNo"></el-table-column> -->
-      <!-- <el-table-column label="发票状态" :prop="mapFields/invoiceStatus']"></el-table-column> -->
       <el-table-column label="发票类型" :prop="mapFields.invoiceType">
         <template slot-scope="scope">
           {{invoiceTypeList.find(({value}) => value === scope.row[mapFields.invoiceType]).label}}
@@ -19,27 +17,8 @@
       <el-table-column label="税前金额" :prop="'subtotal_amount'"></el-table-column>
       <el-table-column label="税后金额" :prop="'total_amount'"></el-table-column>
       <el-table-column label="校验码" :prop="'check_code'"></el-table-column> 
-      <!-- <el-table-column label="操作">
-        <template #header>
-          <div style="display:flex;justify-content:space-between;">
-            <span>操作</span>
-            <el-button size="mini" type="text" @click="onCreateItem">添加</el-button>
-          </div>
-        </template>
-
-        <template slot-scope="scope">
-          <el-button @click="deleteItem(scope.$index)" size="mini" type="text">删除</el-button>
-          <el-button @click="onUpdateItem(scope.$index)" size="mini" type="text">编辑</el-button>
-        </template>
-      </el-table-column> -->
     </el-table>
 
-    <!-- <div style="display:flex;justify-content:flex-end;padding:10px 0px">
-      <el-button size="mini" type="primary" @click="onSave">
-        保存
-      </el-button>
-    </div> -->
-
     <manually-upload-modal 
       :visible.sync="manuallyVisible"
       :updateItem="updateItem"
@@ -106,10 +85,10 @@ export default {
       manuallyVisible: false,
       xlsxVisible: false,
       loading: false,
-      list: [],
       updateIndex: -1,
       updateItem:null,
-      tableData:[]
+      tableData:[],
+      list: []
     }
   },
   methods:{
@@ -163,7 +142,7 @@ export default {
     onDownloadTemplate(){
       const workBook = utils.book_new()
       const workSheet = utils.json_to_sheet(template)
-      utils.book_append_sheet(workBook,workSheet,"sheet")
+      utils.book_append_sheet(workBook,workSheet, "sheet")
       writeFile(workBook,"开票模板.xlsx",{
         bookType:'xlsx'
       })

+ 23 - 18
src/components/approval-node/src/uploadInvoice/manuallyUploadModal.vue

@@ -147,32 +147,37 @@ export default {
         this.scanValue = ""
         this.$message.error("扫码枪识别数据格式不正确,请重新扫描")
       }
+
+      /**
+       * @param iT 发票类型
+       * @param iC 发票代码
+       * @param iN 发票号码
+       * @param bT 税前金额
+       * @param oT 发票日期
+       * @param cC 校验码
+       * */     
+      const [ _, iT, iC, iN, bT, oT, cC ] = result
+      let _oT = ""
       
-      const [_1,invoiceType,invCode,invNumber,subtotal_amount,open_time,checkNumber] = result
-      let _open_time = ""
-      
-      if(open_time){
-        const year = open_time.slice(0, 4);
-        const month = open_time.slice(4, 6);
-        const day = open_time.slice(6);
-        _open_time = dayjs(`${year}-${month}-${day}`).format("YYYY-MM-DD HH:mm:ss");
+      if(oT){
+        const year = oT.slice(0, 4);
+        const month = oT.slice(4, 6);
+        const day = oT.slice(6);
+        _oT = dayjs(`${year}-${month}-${day}`).format("YYYY-MM-DD HH:mm:ss");
       }
 
       // 1,01,3,4,5,6,7,8,9
 
-      const invoice = invoiceTypeList.find(({scanValue}) => scanValue === String(invoiceType))
-      
+      const _iT = invoiceTypeList.find(({scanValue}) => scanValue === String(iT))
 
-      console.log(invoice)
       this.scanValue = ""
-      // const { invoice } = mapPropertys
       this.ruleForm = {
-        [mapFields.invoiceType]:invoice ? invoice.value : "",
-        [mapFields.invoiceCode]:invCode,
-        [mapFields.beforeTax]:subtotal_amount,
-        [mapFields.openTime]: _open_time,
-        [mapFields.invoiceNumber]:invNumber,
-        [mapFields.checkNumber]:checkNumber
+        [mapFields.beforeTax]: bT,
+        [mapFields.openTime]: _oT,
+        [mapFields.invoiceCode]: iC,
+        [mapFields.checkNumber]: cC,
+        [mapFields.invoiceNumber]: iN,
+        [mapFields.invoiceType]: _iT ? _iT.value : "",
       }
     },
     initData(){