2023-3-29

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -80,7 +80,7 @@
         </template>
       </tableLayout>
     </div>
-    <div style="height: 35px;margin-top: 20px">
+    <!-- <div style="height: 35px;margin-top: 20px">
       <div v-if="$route.query.type != '框架'" style="float: left">金额(元)：{{ data.signamount ? tool.formatAmount(data.signamount,2) : '0.00'}}</div>
       <div style="float: right">
         <el-pagination
@@ -93,7 +93,7 @@
             layout="total,sizes, prev, pager, next, jumper"
             :total="total">
         </el-pagination>
-      </div>
+      </div> -->
 
     </div>
   </div>
@@ -131,7 +131,7 @@ export default {
           "content": {
               "sa_contractid": this.$route.query.id,
               "pageNumber": 1,
-              "pageSize": 100,
+              "pageSize": 30,
               "where": {
                   "condition": "",
               }
@@ -148,6 +148,7 @@ export default {
       tablecols:[],
       tablecolsAdd:[],
       total:0,
+      totalPage:0,
       editIndex:''
     };
   },
@@ -173,12 +174,17 @@ export default {
       res.data.forEach((e,index)=>{
         res.data[index].discountrate = Math.round((e.discountrate * 100)*100)/100
       })
-      this.list = res.data
+      this.list = this.params.content.pageNumber == 1 ? res.data : this.list.concat(res.data)
+      console.log(this.list,res.data);
       this.total = res.total
-      this.$emit('priceChange')
+      this.totalPage = res.pageTotal
+      // this.$emit('priceChange')
     },
     tableLoad () {
-
+      if (this.params.content.pageNumber == this.totalPage) return
+      this.params.content.pageNumber += 1
+      this.listData()
+      console.log('触底');
     },
     qtyChange (num,index,data) {
       data.qty = num

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTable.vue

@@ -53,8 +53,8 @@
         width="250">
         <template slot-scope="scope">
           <div class="inline-16" v-if="data.byhand == 0">
-            <a class="table_row_link inline-16" :href="scope.row.paperpdfurl" v-if="scope.row.paperpdfurl">纸票pdf</a>
-            <a class="table_row_link inline-16" :href="scope.row.pdfurl" v-if="scope.row.pdfurl">发票pdf</a>
+            <a class="table_row_link inline-16" target="_Blank" :href="scope.row.paperpdfurl" v-if="scope.row.paperpdfurl">纸票pdf</a>
+            <a class="table_row_link inline-16" target="_Blank" :href="scope.row.pdfurl" v-if="scope.row.pdfurl">发票pdf</a>
           </div>
           <div class="inline-16" v-else>
             <!-- <a class="table_row_link inline-16" :href="scope.row.paperpdfurl">上传发票</a> -->

src/HDrpManagement/invoiceapp/detail/tab/redInvoice/components/invoiceTable.vue

@@ -48,8 +48,8 @@
         label="操作"
         width="190">
         <template slot-scope="scope">
-          <a class="table_row_link inline-16" v-if="scope.row.paperpdfurl" :href="scope.row.paperpdfurl">纸票pdf</a>
-          <a class="table_row_link inline-16" v-if="scope.row.pdfurl" :href="scope.row.pdfurl">发票pdf</a>
+          <a class="table_row_link inline-16" target="_Blank" v-if="scope.row.paperpdfurl" :href="scope.row.paperpdfurl">纸票pdf</a>
+          <a class="table_row_link inline-16" target="_Blank" v-if="scope.row.pdfurl" :href="scope.row.pdfurl">发票pdf</a>
           <el-button v-if="tool.checkAuth($route.name,'editRedInvioce')" @click="deleteRow(scope.row)" type="text" size="mini">删 除</el-button>
         </template>
       </el-table-column>

src/HDrpManagement/orderManage/modules/edit.vue

@@ -586,7 +586,7 @@ export default {
           });
         }
       }else{
-        this.$message.error(res.msg);
+        this.$message.success(res.msg);
       }
     },
     // 查询站点是否使用返利金

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -556,7 +556,7 @@ export default {
           });
         }
       }else{
-        this.$message.error(res.msg);
+        this.$message.success(res.msg);
       }
 
     },

src/SDrpManagement/invoiceapp_saler/detail/tab/blueInvoice/components/invoiceTable.vue

@@ -53,8 +53,8 @@
         width="250">
         <template slot-scope="scope">
           <div class="inline-16" v-if="data.byhand == 0">
-            <a class="table_row_link inline-16" :href="scope.row.paperpdfurl" v-if="scope.row.paperpdfurl">纸票pdf</a>
-            <a class="table_row_link inline-16" :href="scope.row.pdfurl" v-if="scope.row.pdfurl">发票pdf</a>
+            <a class="table_row_link inline-16" target="_Blank" :href="scope.row.paperpdfurl" v-if="scope.row.paperpdfurl">纸票pdf</a>
+            <a class="table_row_link inline-16" target="_Blank" :href="scope.row.pdfurl" v-if="scope.row.pdfurl">发票pdf</a>
           </div>
           <div class="inline-16" v-else>
             <!-- <a class="table_row_link inline-16" :href="scope.row.paperpdfurl">上传发票</a> -->

src/SDrpManagement/invoiceapp_saler/detail/tab/redInvoice/components/invoiceTable.vue

@@ -48,8 +48,8 @@
         label="操作"
         width="190">
         <template slot-scope="scope">
-          <a class="table_row_link inline-16" :href="scope.row.paperpdfurl">纸票pdf</a>
-          <a class="table_row_link inline-16" :href="scope.row.pdfurl">发票pdf</a>
+          <a class="table_row_link inline-16" target="_Blank" :href="scope.row.paperpdfurl">纸票pdf</a>
+          <a class="table_row_link inline-16" target="_Blank" :href="scope.row.pdfurl">发票pdf</a>
           <el-button v-if="tool.checkAuth($route.name,'editRedInvioce')" @click="deleteRow(scope.row)" type="text" size="mini">删 除</el-button>
         </template>
       </el-table-column>

src/SDrpManagement/salerOrder/details/index.vue

@@ -56,8 +56,8 @@
                 </div>
                 <div v-if="(mainData.type === '标准订单' ||  mainData.type === '特殊订单') && isusedrebate === 1">
                   <div v-if="checked" class="flex-align-center">
-                    <p class="inline-16"><small>返利金余额:</small><b>{{tool.formatAmount(mainData.rebatebalance,2)}}</b></p>
-                    <p class="inline-16"><small>已使用返利金金额:</small><b>{{tool.formatAmount(mainData.rebateamount,2)}}</b></p>
+                    <p class="inline-16"><small>返利金余额:&nbsp;</small><b>{{tool.formatAmount(mainData.rebatebalance,2)}}</b></p>
+                    <p class="inline-16"><small>已使用返利金金额:&nbsp;</small><b>{{tool.formatAmount(mainData.rebateamount,2)}}</b></p>
                   </div>
                 </div>
               </div>

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -563,7 +563,7 @@ export default {
           });
         }
       }else{
-        this.$message.error(res.msg);
+        this.$message.success(res.msg);
       }
     },
     // 查询站点是否使用返利金

src/components/socketMessage/index.vue

@@ -84,6 +84,10 @@
           this.panelIsShow = true
           this.list = [JSON.parse(msg.data).message]
           this.getMessageList()
+          console.log(JSON.parse(msg.data),JSON.parse(msg.data).title,JSON.parse(msg.data).title == 'refresh')
+          if (JSON.parse(msg.data).message.title == 'refresh') {
+            this.$router.go(0)
+          }
         }
       },
       send: function (type,val,timsubjectid) {

src/main.js

@@ -70,14 +70,13 @@ ElementUI.Drawer.props.showClose.default = false;
 /* table懒加载 */
 Vue.directive('tableLoad',{
   bind (el,binding) {
-    let tableWarp = document.querySelector('.el-table__body-wrapper')
-
+    let tableWarp = el.querySelector('.el-table__body-wrapper')
     function handleFun (e) {
-      console.log(e);
+      if (tableWarp.scrollTop + tableWarp.clientHeight >= tableWarp.scrollHeight) {
+        binding.value()
+      }
     }
-    
     tableWarp.addEventListener('scroll',handleFun)
-
     el.tableWarp = tableWarp
     el.handleFun = handleFun
   },

vue.config.js

@@ -15,8 +15,8 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'http://192.168.3.9:8090',  // target host*!
-          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          // target: 'http://192.168.3.9:8090',  // target host*!
+          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites