瀏覽代碼

修改bug

chenrui 2 年之前
父節點
當前提交
270ddaa653

+ 0 - 1
src/views/reportData/billingBackReport/list.vue

@@ -52,7 +52,6 @@
         rowKeyName="no"
         :columns="columns"
         :data="loadData"
-        :showPagination="false"
         :scroll="{ x: 1550 }"
         bordered>
         <template slot="footer" v-if="countLabel.length||countBrandLabel.length">

+ 5 - 23
src/views/reportData/billingOrderReport/list.vue

@@ -11,27 +11,22 @@
           :model="queryParam"
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成时间" prop="time">
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="供应商名称">
                 <supplier id="billingBackReport-supplierName" v-model="queryParam.supplier.supplierSn" @change="getSupplierName" placeholder="请输入供应商名称"></supplier>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="采购退货单号" >
                 <a-input id="billingBackReport-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
-              <a-form-model-item label="所在区域/分区">
-                <subarea id="billingOrderReport-subareaSn" ref="subarea" @change="subareaChange"></subarea>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="地区">
                 <AreaList id="returnSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
               </a-form-model-item>
@@ -62,7 +57,6 @@
         rowKeyName="no"
         :columns="columns"
         :data="loadData"
-        :showPagination="false"
         :scroll="{ x: 1550 }"
         bordered>
         <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
@@ -98,7 +92,6 @@ import { STable, VSelect } from '@/components'
 import getDate from '@/libs/getDate.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import AreaList from '@/views/common/areaList.js'
-import subarea from '@/views/common/subarea.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import reportModal from '@/views/common/reportModal.vue'
 import supplier from '@/views/common/supplier.js'
@@ -106,7 +99,7 @@ import { queryBillNoPage, queryBillNoCount, queryBillNoTitle, billNoExport } fro
 export default {
   name: 'BillingOrderReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, reportModal, AreaList, supplier },
+  components: { STable, VSelect, rangeDate, reportModal, AreaList, supplier },
   data () {
     return {
       spinning: false,
@@ -118,10 +111,6 @@ export default {
         ],
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
-        subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined
-        },
         sparePartsReturnNo: undefined,
         supplier: {
           supplierSn: undefined,
@@ -201,10 +190,6 @@ export default {
         }
       })
     },
-    subareaChange (val) {
-      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
-    },
     //  重置
     resetSearchForm () {
       this.$refs.ruleForm.resetFields()
@@ -218,12 +203,9 @@ export default {
       this.queryParam.supplier.provinceSn = undefined
       this.queryParam.supplier.citySn = undefined
       this.queryParam.supplier.districtSn = undefined
-      this.queryParam.subareaArea.subareaSn = undefined
-      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.sparePartsReturnNo = undefined
       this.queryParam.supplier.supplierName = undefined
       this.queryParam.supplier.supplierSn = undefined
-      this.$refs.subarea.clearData()
       this.$refs.areaList.clearData()
       this.$refs.table.clearTable()
     },

+ 3 - 3
src/views/setting/erpMessageManagement/list.vue

@@ -106,12 +106,12 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '同步时间', dataIndex: 'lastHandleDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '同步时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '处理时间', dataIndex: 'lastHandleDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务模块', scopedSlots: { customRender: 'workModule' }, width: '10%', align: 'center' },
         { title: '业务编码', dataIndex: 'bizId', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '同步次数', dataIndex: 'handleNum', width: '7%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '同步状态', scopedSlots: { customRender: 'syncStatus' }, width: '10%', align: 'center' },
+        { title: '处理状态', scopedSlots: { customRender: 'syncStatus' }, width: '10%', align: 'center' },
         { title: '错误信息', scopedSlots: { customRender: 'errInfo' }, width: '15%', align: 'center', ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ],