Selaa lähdekoodia

开票bug修复

qymljy 1 viikko sitten
vanhempi
commit
c989dfd924

+ 4 - 4
src/HDrpManagement/invoiceapp/detail/tab/redInvoice/components/invoiceTable.vue

@@ -101,10 +101,10 @@ export default {
       folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
       folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
       param:{
       param:{
         "id": "20221223153403",
         "id": "20221223153403",
-        "pageNumber":1,
-        "pageSize":9999,
         "content": {
         "content": {
           "sa_invoiceapplyid":this.$route.query.id,
           "sa_invoiceapplyid":this.$route.query.id,
+          "pageNumber": 1,
+          "pageSize": 20,
           "where":{
           "where":{
             "rb":0
             "rb":0
           }
           }
@@ -165,8 +165,8 @@ export default {
       }
       }
 
 
     },
     },
-    clickRed(){
-      this.$emit('clickRed')
+    clickRed(val){
+      this.$emit('clickRed',val)
     }
     }
   },
   },
   mounted () {
   mounted () {

+ 55 - 8
src/HDrpManagement/invoiceapp/detail/tab/redInvoice/components/invoiceTablemx.vue

@@ -82,7 +82,7 @@
       </el-pagination>
       </el-pagination>
     </div>
     </div>
     <el-dialog :title="$t(`红冲明细`)" :visible.sync="redInvoice" append-to-body>
     <el-dialog :title="$t(`红冲明细`)" :visible.sync="redInvoice" append-to-body>
-      <el-table :data="list" max-height="300px" >
+      <el-table :data="listInfo" max-height="300px" >
         <el-table-column
         <el-table-column
             prop="goodscode"
             prop="goodscode"
             :label="$t(`商品编码`)"
             :label="$t(`商品编码`)"
@@ -108,7 +108,19 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
-      <div slot="footer" class="dialog-footer">
+      <div class="container" style="text-align:right">
+        <el-pagination
+            background
+            small
+            @size-change="handleSizeChange2"
+            @current-change="handleCurrentChange2"
+            :current-page="currentPageInfo"
+            :page-sizes="[20, 50, 100, 200]"
+            layout="total,sizes, prev, pager, next, jumper"
+            :total="totalInfo">
+        </el-pagination>
+      </div>
+      <div slot="footer" class="dialog-footer" style="margin-top: 0 !important;">
         <el-button @click="redInvoice = false" size="small" class="inline-16">{{$t('取 消')}}</el-button>
         <el-button @click="redInvoice = false" size="small" class="inline-16">{{$t('取 消')}}</el-button>
 <!--        <el-button type="primary" @click="centerDialogVisible = false" size="small">{{$t('确 定')}}</el-button>-->
 <!--        <el-button type="primary" @click="centerDialogVisible = false" size="small">{{$t('确 定')}}</el-button>-->
         <customBtn
         <customBtn
@@ -139,9 +151,10 @@ export default {
       dialogFormVisible:false,
       dialogFormVisible:false,
       param:{
       param:{
         "id": 20221228101203,
         "id": 20221228101203,
-        "pageSize":9999,
         "content": {
         "content": {
           "sa_invoicebillid":0,
           "sa_invoicebillid":0,
+          "pageNumber":1,
+          "pageSize":20,
           "where":{
           "where":{
               "condition":""
               "condition":""
           }
           }
@@ -151,7 +164,21 @@ export default {
       total:0,
       total:0,
       currentPage:0,
       currentPage:0,
       redInvoice:false,
       redInvoice:false,
-      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
+      paramInfo:{
+        "id": 20221228101203,
+        "content": {
+          "sa_invoicebillid":0,
+          "pageNumber":1,
+          "pageSize":20,
+          "where":{
+            "condition":""
+          }
+        }
+      },
+      listInfo:[],
+      totalInfo:0,
+      currentPageInfo:0,
     }
     }
   },
   },
   methods:{
   methods:{
@@ -165,12 +192,12 @@ export default {
     handleSizeChange(val) {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
       this.param.content.pageSize = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     },
     handleCurrentChange(val) {
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
       this.param.content.pageNumber = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     },
     // 删除明细
     // 删除明细
     async deleteRow (row) {
     async deleteRow (row) {
@@ -191,7 +218,24 @@ export default {
         this.$emit('onSuccess')
         this.$emit('onSuccess')
       }
       }
     },
     },
-
+    async listDataInfo (id) {
+      console.log('执行22222')
+      this.paramInfo.content.sa_invoicebillid = id
+      const res = await this.$api.requested(this.paramInfo)
+      this.listInfo = res.data
+      this.totalInfo = res.total
+      this.currentPageInfo = res.pageNumber
+    },
+    handleSizeChange2(val) {
+      // console.log(`每页 ${val} 条`);
+      this.paramInfo.content.pageSize = val
+      this.listDataInfo(this.paramInfo.content.sa_invoicebillid)
+    },
+    handleCurrentChange2(val) {
+      // console.log(`当前页: ${val}`);
+      this.paramInfo.content.pageNumber = val
+      this.listDataInfo(this.paramInfo.content.sa_invoicebillid)
+    },
 
 
   },
   },
   mounted () {
   mounted () {
@@ -199,5 +243,8 @@ export default {
 }
 }
 
 
 </script>
 </script>
-<style>
+<style scoped>
+/deep/ .el-dialog__body {
+  padding: 20px 20px 0 20px !important;
+}
 </style>
 </style>

+ 6 - 1
src/HDrpManagement/invoiceapp/detail/tab/redInvoice/index.vue

@@ -4,7 +4,7 @@
 <!--      <el-button size="small" type="primary" :disabled="selectData.length === 0 && status != '审核'" @click="clickCreateRedInvioce">勾选创建发票</el-button>-->
 <!--      <el-button size="small" type="primary" :disabled="selectData.length === 0 && status != '审核'" @click="clickCreateRedInvioce">勾选创建发票</el-button>-->
       <el-button size="small" type="primary" :disabled="selectData.length === 0" @click="clickInvioceQuery">{{$t(`发票创建查询`)}}</el-button>
       <el-button size="small" type="primary" :disabled="selectData.length === 0" @click="clickInvioceQuery">{{$t(`发票创建查询`)}}</el-button>
     </el-button-group>
     </el-button-group>
-    <invoiceTable class="normal-margin" :data="data" :status="status" ref="invoiceTable" @activeRow="activeRow" @selection="selection" @onSuccess="onSuccess" @clickRed="$refs.invoiceTablemx.redInvoice = true" @list="listEmit"></invoiceTable>
+    <invoiceTable class="normal-margin" :data="data" :status="status" ref="invoiceTable" @activeRow="activeRow" @selection="selection" @onSuccess="onSuccess" @clickRed="onClickRed" @list="listEmit"></invoiceTable>
     <invoiceTablemx :data="data" :status="status" ref="invoiceTablemx" @onSuccess="queryinvoiceTable" :isStatus="isStatus"></invoiceTablemx>
     <invoiceTablemx :data="data" :status="status" ref="invoiceTablemx" @onSuccess="queryinvoiceTable" :isStatus="isStatus"></invoiceTablemx>
   </div>
   </div>
 </template>
 </template>
@@ -79,6 +79,11 @@ export default {
     },
     },
     onSuccess(){
     onSuccess(){
       this.$refs.invoiceTable.listData()
       this.$refs.invoiceTable.listData()
+    },
+    onClickRed(val){
+      this.$refs.invoiceTablemx.redInvoice = true
+      this.$refs.invoiceTablemx.param.content.pageNumner = 1
+      this.$refs.invoiceTablemx.listDataInfo(val.sa_invoicebillid)
     }
     }
   }
   }
 }
 }

+ 2 - 2
src/SDrpManagement/invoiceapp_saler/detail/tab/redInvoice/components/invoiceTable.vue

@@ -76,10 +76,10 @@ export default {
     return {
     return {
       param:{
       param:{
         "id": "20221223153403",
         "id": "20221223153403",
-        "pageNumber":1,
-        "pageSize":9999,
         "content": {
         "content": {
           "sa_invoiceapplyid":this.$route.query.id,
           "sa_invoiceapplyid":this.$route.query.id,
+          "pageNumber": 1,
+          "pageSize": 20,
           "where":{
           "where":{
             "rb":0
             "rb":0
           }
           }

+ 4 - 3
src/SDrpManagement/invoiceapp_saler/detail/tab/redInvoice/components/invoiceTablemx.vue

@@ -93,9 +93,10 @@ export default {
       dialogFormVisible:false,
       dialogFormVisible:false,
       param:{
       param:{
         "id": 20221228101203,
         "id": 20221228101203,
-        "pageSize":9999,
         "content": {
         "content": {
           "sa_invoicebillid":0,
           "sa_invoicebillid":0,
+          "pageNumber":1,
+          "pageSize":20,
           "where":{
           "where":{
               "condition":""
               "condition":""
           }
           }
@@ -118,12 +119,12 @@ export default {
     handleSizeChange(val) {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
       this.param.content.pageSize = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     },
     handleCurrentChange(val) {
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
       this.param.content.pageNumber = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     },
     // 删除明细
     // 删除明细
     async deleteRow (row) {
     async deleteRow (row) {

+ 2 - 2
src/SDrpManagement/sinvoiceapp/detail/tab/redInvoice/components/invoiceTable.vue

@@ -80,10 +80,10 @@ export default {
     return {
     return {
       param: {
       param: {
         id: "20221223153403",
         id: "20221223153403",
-        pageNumber: 1,
-        pageSize: 20,
         content: {
         content: {
           sa_invoiceapplyid: this.$route.query.id,
           sa_invoiceapplyid: this.$route.query.id,
+          pageNumber: 1,
+          pageSize: 20,
           where: {
           where: {
             rb: 0,
             rb: 0,
           },
           },

+ 4 - 2
src/SDrpManagement/sinvoiceapp/detail/tab/redInvoice/components/invoiceTablemx.vue

@@ -69,6 +69,8 @@ export default {
         id: 20221228101203,
         id: 20221228101203,
         content: {
         content: {
           sa_invoicebillid: 0,
           sa_invoicebillid: 0,
+          "pageNumber":1,
+          "pageSize":20,
           where: {
           where: {
             condition: "",
             condition: "",
           },
           },
@@ -91,12 +93,12 @@ export default {
     handleSizeChange(val) {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val;
       this.param.content.pageSize = val;
-      this.listData();
+      this.listData(this.param.content.sa_invoicebillid);
     },
     },
     handleCurrentChange(val) {
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val;
       this.param.content.pageNumber = val;
-      this.listData();
+      this.listData(this.param.content.sa_invoicebillid);
     },
     },
     // 删除明细
     // 删除明细
     async deleteRow(row) {
     async deleteRow(row) {