0412 新看板

src/views/modules/query/hlQuery.vue

@@ -220,7 +220,7 @@
         dataList3: [],
         searchData: {
           page: 1,
-          limit: 100,
+          limit: 20,
           taskNo:'',
           partNo:'',
           startDate:'',
@@ -230,7 +230,7 @@
         wareHouseList:[],
         exportList:[],
         pageIndex: 1,
-        pageSize: 100,
+        pageSize: 20,
         totalPage: 0,
         dataListLoading: false,
         currentRow:'',
@@ -549,7 +549,7 @@
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
-        await searchTransHeader(this.searchData).then(({data}) => {
+        await getHunlianTaskList(this.searchData).then(({data}) => {
           this.exportList= data.page.list;
         })
 

src/views/modules/query/liuhuaIssureAndReport.vue

@@ -28,7 +28,7 @@
       <el-form-item label="差异超过1KG">
         <el-select v-model="searchData.sql" style="width: 120px">
           <el-option label="全部" value=""></el-option>
-          <el-option label="是" value="( Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -QtyReported*dbo.Get_Part_NetWeight(a.Site,a.partNo),2) >1 or -1>Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -QtyReported*dbo.Get_Part_NetWeight(a.Site,a.partNo),2))"></el-option>
+          <el-option label="是" value="( Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -QtyReported*dbo.Get_PartWeightFactorForReport(a.Site,a.partNo,null),2) >1 or -1>Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -QtyReported*dbo.Get_PartWeightFactorForReport(a.Site,a.partNo,null),2))"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="' '">
@@ -99,7 +99,7 @@
         dataList: [],
         searchData: {
           page: 1,
-          limit: 100,
+          limit: 20,
           site:this.$store.state.user.site,
           username: this.$store.state.user.name,
           seqNo: '',
@@ -110,7 +110,7 @@
         },
         exportList:[],
         pageIndex: 1,
-        pageSize: 100,
+        pageSize: 20,
         totalPage: 0,
         visible:false,
         dataListLoading: false,
@@ -339,12 +339,12 @@
       sizeChangeHandle (val) {
         this.pageSize = val
         this.pageIndex = 1
-        this.search()
+        this.searchTable()
       },
       // 当前页
       currentChangeHandle (val) {
         this.pageIndex = val
-        this.search()
+        this.searchTable()
       },
       searchTable(){
         this.searchData.limit = this.pageSize
@@ -364,7 +364,7 @@
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
-        await soFinalRollSearch(this.searchData).then(({data}) => {
+        await liuhuaIssureAndReport(this.searchData).then(({data}) => {
           this.exportList= data.page.list;
         })