zhangdan 4 rokov pred
rodič
commit
87c1c32188

+ 3 - 3
src/views/cleanManage/cleanDetail.vue

@@ -39,10 +39,10 @@
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
-            <a-form-model-item label="操作人" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+            <a-form-model-item label="清运司机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-select
                 id="cleanDetail-operatorUserId"
-                placeholder="请选择操作人"
+                placeholder="请选择清运司机"
                 allowClear
                 v-model="queryParam.operatorUserId"
                 showSearch
@@ -120,7 +120,7 @@ export default {
       columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '清运时间', dataIndex: 'cleanTime', width: 100, align: 'center' },
         { title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '设备编号', dataIndex: 'deviceNo', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '可回收物清运量(kg)', dataIndex: 'cleanWeight', width: 100, align: 'center', sorter: true, customRender: (text) => { return text || 0 } },
         { title: '清运司机', dataIndex: 'driverName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '操作人', dataIndex: 'operatorName', width: 100, align: 'center' },

+ 1 - 1
src/views/cleanManage/netWorkCleanModal.vue

@@ -47,7 +47,7 @@ export default {
       isShow: this.visible, // 弹窗的状态
       columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '清运时间', dataIndex: 'cleanTime', width: 100, align: 'center' },
-        { title: '设备编号', dataIndex: 'deviceNo', width: 100, align: 'center' },
+        { title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center' },
         { title: '清运重量(kg)', dataIndex: 'cleanWeight', width: 100, align: 'center' },
         { title: '清运司机', dataIndex: 'driverName', width: 100, align: 'center' }],
       // 加载数据方法 必须为 Promise 对象

+ 1 - 1
src/views/cleanManage/notCleanNetwork.vue

@@ -376,7 +376,7 @@ export default {
     reset () {
       this.queryParam.srcDeviceCode = undefined
       this.queryParam.stationNo = undefined
-      this.queryParam.orderType = ''
+      this.queryParam.orderType = 'max'
       this.queryParam.beginDate = null
       this.queryParam.endDate = null
       this.queryParam.provinceCode = undefined