From 500f62aae862504f7aae9201b14f3c31fe632f98 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Tue, 23 Jul 2024 10:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E9=80=92=E6=B8=85=E8=BF=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/recyclecleanorder/index.vue     | 1242 +++++++++--------
 .../src/views/recycledeliveryorder/index.vue  |   28 +-
 2 files changed, 717 insertions(+), 553 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue
index 6f114e7..b98dae3 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue
@@ -1,569 +1,711 @@
 <template>
-    <div class="JNPF-common-layout">
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                    <el-col :span="6">
-                        <el-form-item label="清运单号">
-                            <el-input v-model="query.orderNo" placeholder="请输入" clearable> </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="设备编码">
-                            <el-input v-model="query.deviceCode" placeholder="请输入" clearable> </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="桶编码">
-                            <el-input v-model="query.bucketCode" placeholder="请输入" clearable> </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                        <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-                            @click="addOrUpdateHandle()">新增
-                        </el-button>
-                        <el-button type="success" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-                            @click="showDialog = true">批量审核
-                        </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip content="高级查询" placement="top" v-if="true">
-                            <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                @click="openSuperQuery()" />
-                        </el-tooltip>
-                        <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                @click="initData()" />
-                        </el-tooltip>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
-                    :span-method="arraySpanMethod" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="40"></el-table-column>
-                    <el-table-column prop="orderNo" label="清运单号" align="left" width="150">
-                    </el-table-column>
-                    <el-table-column prop="deviceCode" label="设备名称" align="left">
-                    </el-table-column>
-                    <el-table-column prop="bucketCode" label="桶编码" align="left">
-                    </el-table-column>
-                    <el-table-column prop="doorNum" label="门号" align="left">
-                    </el-table-column>
-                    <el-table-column prop="productCode" label="回收品大类" align="left">
-                    </el-table-column>
-                    <el-table-column prop="productSubCode" label="回收品子类" align="left">
-                    </el-table-column>
-                    <el-table-column prop="deviceOrderNo" label="机柜清运单号" align="left" width="100">
-                    </el-table-column>
-                    <el-table-column prop="price" label="单价" align="left">
-                        <template slot-scope="scope" v-if="scope.row.price">
-                            <JnpfNumber v-model="scope.row.price" :thousands="false" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="weight" label="清运重量" align="left">
-                        <template slot-scope="scope" v-if="scope.row.weight">
-                            <JnpfNumber v-model="scope.row.weight" :thousands="false" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="totalPrice" label="总价" align="left">
-                        <template slot-scope="scope" v-if="scope.row.totalPrice">
-                            <JnpfNumber v-model="scope.row.totalPrice" :thousands="false" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="adjustWeight" label="审核后重量" align="left">
-                        <template slot-scope="scope" v-if="scope.row.adjustWeight">
-                            <JnpfNumber v-model="scope.row.adjustWeight" :thousands="false" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="adjustPrice" label="审核后总价" align="left">
-                        <template slot-scope="scope" v-if="scope.row.adjustPrice">
-                            <JnpfNumber v-model="scope.row.adjustPrice" :thousands="false" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="cleanUserId" label="清运员" align="left">
-                    </el-table-column>
-                    <el-table-column prop="phone" label="清运员手机号" align="left" width="100">
-                    </el-table-column>
-                    <el-table-column label="入库状态" prop="entryStatus" algin="left">
-                        <template slot-scope="scope">
-                            {{ scope.row.entryStatus }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="bagNo" label="垃圾袋号" align="left">
-                    </el-table-column>
-                    <el-table-column label="审核状态" prop="adjustStatus" algin="left">
-                        <template slot-scope="scope">
-                            {{ scope.row.adjustStatus }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="adjustComm" label="审核说明" align="left">
-                    </el-table-column>
-                    <!-- <el-table-column prop="tenantId" label="租户id" align="left">
-                    </el-table-column> -->
-                    <el-table-column label="操作" fixed="right" width="180">
-                        <template slot-scope="scope">
-                            <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
-                            </el-button>
-                            <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
-                                @click="handleDel(scope.row.id)">删除
-                            </el-button>
-                            <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
-                            </el-button>
-                            <el-button type="text" v-show="scope.row.adjustStatus === '未审核'"
-                                @click="auditHandle(scope.row)" v-has="'btn_edit'">审核
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </JNPF-table>
-                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData" />
-            </div>
+  <div class="JNPF-common-layout">
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="清运单号">
+              <el-input v-model="query.orderNo" placeholder="请输入" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编码">
+              <el-input
+                v-model="query.deviceCode"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="桶编码">
+              <el-input
+                v-model="query.bucketCode"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="reset()"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <el-button
+              type="primary"
+              icon="icon-ym icon-ym-btn-add"
+              v-has="'btn_add'"
+              @click="addOrUpdateHandle()"
+              >新增
+            </el-button>
+            <el-button
+              type="success"
+              icon="icon-ym icon-ym-btn-add"
+              v-has="'btn_add'"
+              @click="showDialog = true"
+              >批量审核
+            </el-button>
+          </div>
+          <div class="JNPF-common-head-right">
+            <el-tooltip content="高级查询" placement="top" v-if="true">
+              <el-link
+                icon="icon-ym icon-ym-filter JNPF-common-head-icon"
+                :underline="false"
+                @click="openSuperQuery()"
+              />
+            </el-tooltip>
+            <el-tooltip
+              effect="dark"
+              :content="$t('common.refresh')"
+              placement="top"
+            >
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="initData()"
+              />
+            </el-tooltip>
+          </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
-        <Audit v-if="auditHandleVisible" ref="Audit" @refresh="refresh" />
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
-        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-        <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-            @superQuery="superQuery" />
-        <DialogComponent :showDialog.sync="showDialog" @update:showDialog="showDialog = $event"
-            :onSubmit="handleSubmit" />
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          :span-method="arraySpanMethod"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="40"></el-table-column>
+          <el-table-column
+            prop="orderNo"
+            label="清运单号"
+            align="left"
+            width="180"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="deviceCode"
+            label="设备名称"
+            align="left"
+            width="130"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="bucketCode"
+            label="桶编码"
+            align="left"
+            width="140"
+          >
+          </el-table-column>
+          <el-table-column prop="doorNum" label="门号" align="left">
+          </el-table-column>
+          <el-table-column prop="productCode" label="回收品大类" align="left">
+          </el-table-column>
+          <el-table-column
+            prop="productSubCode"
+            label="回收品子类"
+            align="left"
+          >
+          </el-table-column>
+
+          <el-table-column prop="price" label="单价" align="left">
+            <template slot-scope="scope" v-if="scope.row.price">
+              <JnpfNumber v-model="scope.row.price" :thousands="false" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="weight" label="清运重量" align="left">
+            <template slot-scope="scope" v-if="scope.row.weight">
+              <JnpfNumber v-model="scope.row.weight" :thousands="false" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalPrice" label="总价" align="left">
+            <template slot-scope="scope" v-if="scope.row.totalPrice">
+              <JnpfNumber v-model="scope.row.totalPrice" :thousands="false" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="adjustWeight" label="审核后重量" align="left">
+            <template slot-scope="scope" v-if="scope.row.adjustWeight">
+              <JnpfNumber v-model="scope.row.adjustWeight" :thousands="false" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="adjustPrice" label="审核后总价" align="left">
+            <template slot-scope="scope" v-if="scope.row.adjustPrice">
+              <JnpfNumber v-model="scope.row.adjustPrice" :thousands="false" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="cleanUserId" label="清运员" align="left">
+          </el-table-column>
+          <el-table-column
+            prop="phone"
+            label="清运员手机号"
+            align="left"
+            width="100"
+          >
+          </el-table-column>
+          <el-table-column label="入库状态" prop="entryStatus" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.entryStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="bagNo" label="垃圾袋号" align="left">
+          </el-table-column>
+          <el-table-column label="审核状态" prop="adjustStatus" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.adjustStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="adjustComm" label="审核说明" align="left">
+          </el-table-column>
+          <el-table-column prop="startTime" label="开始时间" align="left" width="140">
+            <template slot-scope="scope">
+              {{ fnDateFmt(scope.row.startTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="reportTime" label="报告时间" align="left" width="140">
+            <template slot-scope="scope">
+              {{ fnDateFmt(scope.row.reportTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="finishTime" label="结束时间" align="left" width="140">
+            <template slot-scope="scope">
+              {{ fnDateFmt(scope.row.finishTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="creatorTime" label="创建时间" align="left" width="140">
+            <template slot-scope="scope">
+              {{ fnDateFmt(scope.row.creatorTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="deviceOrderNo"
+            label="机柜清运单号"
+            align="left"
+            width="300"
+          >
+          </el-table-column>
+          <!-- <el-table-column prop="tenantId" label="租户id" align="left">
+                    </el-table-column> -->
+          <el-table-column label="操作" fixed="right" width="180">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click="addOrUpdateHandle(scope.row)"
+                v-has="'btn_edit'"
+                >编辑
+              </el-button>
+              <el-button
+                type="text"
+                class="JNPF-table-delBtn"
+                v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)"
+                >删除
+              </el-button>
+              <el-button
+                type="text"
+                v-has="'btn_detail'"
+                @click="goDetail(scope.row.id)"
+                >详情
+              </el-button>
+              <el-button
+                type="text"
+                v-show="scope.row.adjustStatus === '未审核'"
+                @click="auditHandle(scope.row)"
+                v-has="'btn_edit'"
+                >审核
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
+      </div>
     </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <Audit v-if="auditHandleVisible" ref="Audit" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
+    <ToFormDetail
+      v-if="toFormDetailVisible"
+      ref="toFormDetail"
+      @close="toFormDetailVisible = false"
+    />
+    <SuperQuery
+      v-if="superQueryVisible"
+      ref="SuperQuery"
+      :columnOptions="superQueryJson"
+      @superQuery="superQuery"
+    />
+    <DialogComponent
+      :showDialog.sync="showDialog"
+      @update:showDialog="showDialog = $event"
+      :onSubmit="handleSubmit"
+    />
+  </div>
 </template>
 
 <script>
-
-import request from '@/utils/request'
+import request from "@/utils/request";
+import dayjs from "dayjs";
 import { mapGetters } from "vuex";
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-import JNPFForm from './form'
-import Detail from './Detail'
-import Audit from './cleanAudit'
-import ExportBox from '@/components/ExportBox'
-import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-import { getConfigData } from '@/api/onlineDev/visualDev'
-import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-import columnList from './columnList'
-import { thousandsFormat } from "@/components/Generator/utils/index"
-import SuperQuery from '@/components/SuperQuery'
-import superQueryJson from './superQueryJson'
-import DialogComponent from './DialogComponent.vue';
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./form";
+import Detail from "./Detail";
+import Audit from "./cleanAudit";
+import ExportBox from "@/components/ExportBox";
+import ToFormDetail from "@/views/basic/dynamicModel/list/detail";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import { getConfigData } from "@/api/onlineDev/visualDev";
+import { getDefaultCurrentValueUserIdAsync } from "@/api/permission/user";
+import { getDefaultCurrentValueDepartmentIdAsync } from "@/api/permission/organize";
+import columnList from "./columnList";
+import { thousandsFormat } from "@/components/Generator/utils/index";
+import SuperQuery from "@/components/SuperQuery";
+import superQueryJson from "./superQueryJson";
+import DialogComponent from "./DialogComponent.vue";
 
 export default {
-    components: {
-        JNPFForm,
-        Detail,
-        Audit,
-        DialogComponent,
-        ExportBox, ToFormDetail, SuperQuery
+  components: {
+    JNPFForm,
+    Detail,
+    Audit,
+    DialogComponent,
+    ExportBox,
+    ToFormDetail,
+    SuperQuery
+  },
+  data() {
+    return {
+      selectedWeights: [],
+      selectedRows: [],
+      selectedIds: [],
+      showDialog: false,
+      keyword: "",
+      expandsTree: true,
+      refreshTree: true,
+      toFormDetailVisible: false,
+      expandObj: {},
+      columnOptions: [],
+      mergeList: [],
+      exportList: [],
+      columnList,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        orderNo: undefined,
+        bucketCode: undefined,
+        deviceCode: undefined
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+        isLeaf: "isLeaf"
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: "",
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: ""
+      },
+      formVisible: false,
+      auditHandleVisible: false,
+      auditVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      productCodeOptions: [],
+      productCodeProps: { label: "name", value: "id" },
+      productSubCodeOptions: [],
+      productSubCodeProps: { label: "name", value: "id" },
+      entryStatusOptions: [
+        { fullName: "未入库", id: "0" },
+        { fullName: "已入库", id: "1" }
+      ],
+      entryStatusProps: { label: "fullName", value: "id" },
+      adjustStatusOptions: [
+        { fullName: "未审核", id: "0" },
+        { fullName: "已审核", id: "1" }
+      ],
+      adjustStatusProps: { label: "fullName", value: "id" },
+      interfaceRes: {
+        deviceCode: []
+      }
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
+    menuId() {
+      return this.$route.meta.modelId || "";
+    }
+  },
+  created() {
+    this.query.deviceCode = this.$route.query.deviceCode;
+    console.log(this.query);
+    this.getColumnList(), this.initSearchDataAndListData();
+    this.queryData = JSON.parse(JSON.stringify(this.query));
+  },
+  methods: {
+    fnDateFmt(val) {
+      let dateStr = dayjs(val).format("YYYY-MM-DD HH:mm");
+      return dateStr;
     },
-    data() {
-        return {
-            selectedWeights: [],
-            selectedRows: [],
-            selectedIds: [],
-            showDialog: false,
-            keyword: '',
-            expandsTree: true,
-            refreshTree: true,
-            toFormDetailVisible: false,
-            expandObj: {},
-            columnOptions: [],
-            mergeList: [],
-            exportList: [],
-            columnList,
-            superQueryVisible: false,
-            superQueryJson,
-            uploadBoxVisible: false,
-            detailVisible: false,
-            query: {
-                orderNo: undefined,
-                bucketCode: undefined,
-                deviceCode: undefined,
-            },
-            treeProps: {
-                children: 'children',
-                label: 'fullName',
-                value: 'id',
-                isLeaf: 'isLeaf'
-            },
-            list: [],
-            listLoading: true,
-            total: 0,
-            queryData: {},
-            listQuery: {
-                superQueryJson: '',
-                currentPage: 1,
-                pageSize: 20,
-                sort: "desc",
-                sidx: "",
-            },
-            formVisible: false,
-            auditHandleVisible: false,
-            auditVisible: false,
-            flowVisible: false,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-            productCodeOptions: [],
-            productCodeProps: { "label": "name", "value": "id" },
-            productSubCodeOptions: [],
-            productSubCodeProps: { "label": "name", "value": "id" },
-            entryStatusOptions: [{ "fullName": "未入库", "id": "0" }, { "fullName": "已入库", "id": "1" }],
-            entryStatusProps: { "label": "fullName", "value": "id" },
-            adjustStatusOptions: [{ "fullName": "未审核", "id": "0" }, { "fullName": "已审核", "id": "1" }],
-            adjustStatusProps: { "label": "fullName", "value": "id" },
-            interfaceRes: {
-                deviceCode: [],
-            },
-        }
+    handleSelectionChange(val) {
+      this.selectedRows = val;
+      this.selectedIds = this.selectedRows.map(row => row.id);
+      this.selectedWeights = this.selectedRows.map(row => row.weight);
+    },
+    toDetail(defaultValue, modelId) {
+      if (!defaultValue) return;
+      getConfigData(modelId).then(res => {
+        if (!res.data || !res.data.formData) return;
+        let formData = JSON.parse(res.data.formData);
+        formData.popupType = "general";
+        this.toFormDetailVisible = true;
+        this.$nextTick(() => {
+          this.$refs.toFormDetail.init(formData, modelId, defaultValue);
+        });
+      });
+    },
+    toggleTreeExpand(expands) {
+      this.refreshTree = false;
+      this.expandsTree = expands;
+      this.$nextTick(() => {
+        this.refreshTree = true;
+        this.$nextTick(() => {
+          this.$refs.treeBox.setCurrentKey(null);
+        });
+      });
     },
-    computed: {
-        ...mapGetters(['userInfo']),
-        menuId() {
-            return this.$route.meta.modelId || ''
+    filterNode(value, data) {
+      if (!value) return true;
+      return data[this.treeProps.label].indexOf(value) !== -1;
+    },
+    loadNode(node, resolve) {
+      const nodeData = node.data;
+      const config = {
+        treeInterfaceId: "",
+        treeTemplateJson: []
+      };
+      if (config.treeInterfaceId) {
+        //这里是为了拿到参数中关联的字段的值，后端自行拿
+        if (config.treeTemplateJson && config.treeTemplateJson.length) {
+          for (let i = 0; i < config.treeTemplateJson.length; i++) {
+            const element = config.treeTemplateJson[i];
+            element.defaultValue = nodeData[element.relationField] || "";
+          }
         }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || []
+        };
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+          let data = res.data;
+          if (Array.isArray(data)) {
+            resolve(data);
+          } else {
+            resolve([]);
+          }
+        });
+      }
     },
-    created() {
-        this.query.deviceCode = this.$route.query.deviceCode
-        console.log(this.query)
-        this.getColumnList(),
-            this.initSearchDataAndListData()
-        this.queryData = JSON.parse(JSON.stringify(this.query))
+    getColumnList() {
+      // 没有开启权限
+      this.columnOptions = this.transformColumnList(this.columnList);
     },
-    methods: {
-        handleSelectionChange(val) {
-            this.selectedRows = val;
-            this.selectedIds = this.selectedRows.map(row => row.id);
-            this.selectedWeights = this.selectedRows.map(row => row.weight);
-        },
-        toDetail(defaultValue, modelId) {
-            if (!defaultValue) return
-            getConfigData(modelId).then(res => {
-                if (!res.data || !res.data.formData) return
-                let formData = JSON.parse(res.data.formData)
-                formData.popupType = 'general'
-                this.toFormDetailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-                })
-            })
-        },
-        toggleTreeExpand(expands) {
-            this.refreshTree = false
-            this.expandsTree = expands
-            this.$nextTick(() => {
-                this.refreshTree = true
-                this.$nextTick(() => {
-                    this.$refs.treeBox.setCurrentKey(null)
-                })
-            })
-        },
-        filterNode(value, data) {
-            if (!value) return true;
-            return data[this.treeProps.label].indexOf(value) !== -1;
-        },
-        loadNode(node, resolve) {
-            const nodeData = node.data
-            const config = {
-                treeInterfaceId: "",
-                treeTemplateJson: []
-            }
-            if (config.treeInterfaceId) {
-                //这里是为了拿到参数中关联的字段的值，后端自行拿
-                if (config.treeTemplateJson && config.treeTemplateJson.length) {
-                    for (let i = 0; i < config.treeTemplateJson.length; i++) {
-                        const element = config.treeTemplateJson[i];
-                        element.defaultValue = nodeData[element.relationField] || ''
-                    }
-                }
-                //参数
-                let query = {
-                    paramList: config.treeTemplateJson || [],
-                }
-                //接口
-                getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-                    let data = res.data
-                    if (Array.isArray(data)) {
-                        resolve(data);
-                    } else {
-                        resolve([]);
-                    }
-                })
+    transformColumnList(columnList) {
+      let list = [];
+      for (let i = 0; i < columnList.length; i++) {
+        const e = columnList[i];
+        if (!e.prop.includes("-")) {
+          list.push(e);
+        } else {
+          let prop = e.prop.split("-")[0];
+          let label = e.label.split("-")[0];
+          let vModel = e.prop.split("-")[1];
+          let newItem = {
+            align: "center",
+            jnpfKey: "table",
+            prop,
+            label,
+            children: []
+          };
+          e.vModel = vModel;
+          if (!this.expandObj.hasOwnProperty(`${prop}Expand`))
+            this.$set(this.expandObj, `${prop}Expand`, false);
+          if (!list.some(o => o.prop === prop)) list.push(newItem);
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].prop === prop) {
+              list[i].children.push(e);
+              break;
             }
-        },
-        getColumnList() {
-            // 没有开启权限
-            this.columnOptions = this.transformColumnList(this.columnList)
-        },
-        transformColumnList(columnList) {
-            let list = []
-            for (let i = 0; i < columnList.length; i++) {
-                const e = columnList[i];
-                if (!e.prop.includes('-')) {
-                    list.push(e)
-                } else {
-                    let prop = e.prop.split('-')[0]
-                    let label = e.label.split('-')[0]
-                    let vModel = e.prop.split('-')[1]
-                    let newItem = {
-                        align: "center",
-                        jnpfKey: "table",
-                        prop,
-                        label,
-                        children: []
-                    }
-                    e.vModel = vModel
-                    if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-                    if (!list.some(o => o.prop === prop)) list.push(newItem)
-                    for (let i = 0; i < list.length; i++) {
-                        if (list[i].prop === prop) {
-                            list[i].children.push(e)
-                            break
-                        }
-                    }
-                }
-            }
-            this.getMergeList(list)
-            this.getExportList(list)
-            return list
-        },
-        arraySpanMethod({ column }) {
-            for (let i = 0; i < this.mergeList.length; i++) {
-                if (column.property == this.mergeList[i].prop) {
-                    return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
-                }
-            }
-        },
-        getMergeList(list) {
-            let newList = JSON.parse(JSON.stringify(list))
-            newList.forEach(item => {
-                if (item.children && item.children.length) {
-                    let child = {
-                        prop: item.prop + '-child-first'
-                    }
-                    item.children.unshift(child)
-                }
-            })
-            newList.forEach(item => {
-                if (item.children && item.children.length) {
-                    item.children.forEach((child, index) => {
-                        if (index == 0) {
-                            this.mergeList.push({
-                                prop: child.prop,
-                                rowspan: 1,
-                                colspan: item.children.length
-                            })
-                        } else {
-                            this.mergeList.push({
-                                prop: child.prop,
-                                rowspan: 0,
-                                colspan: 0
-                            })
-                        }
-                    })
-                } else {
-                    this.mergeList.push({
-                        prop: item.prop,
-                        rowspan: 1,
-                        colspan: 1
-                    })
-                }
-            })
-        },
-        getExportList(list) {
-            let exportList = []
-            for (let i = 0; i < list.length; i++) {
-                if (list[i].jnpfKey === 'table') {
-                    for (let j = 0; j < list[i].children.length; j++) {
-                        exportList.push(list[i].children[j])
-                    }
-                } else {
-                    exportList.push(list[i])
-                }
+          }
+        }
+      }
+      this.getMergeList(list);
+      this.getExportList(list);
+      return list;
+    },
+    arraySpanMethod({ column }) {
+      for (let i = 0; i < this.mergeList.length; i++) {
+        if (column.property == this.mergeList[i].prop) {
+          return [this.mergeList[i].rowspan, this.mergeList[i].colspan];
+        }
+      }
+    },
+    getMergeList(list) {
+      let newList = JSON.parse(JSON.stringify(list));
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          let child = {
+            prop: item.prop + "-child-first"
+          };
+          item.children.unshift(child);
+        }
+      });
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          item.children.forEach((child, index) => {
+            if (index == 0) {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 1,
+                colspan: item.children.length
+              });
+            } else {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 0,
+                colspan: 0
+              });
             }
-            this.exportList = exportList
-        },
-        goDetail(id) {
-            this.detailVisible = true
-            this.$nextTick(() => {
-                this.$refs.Detail.init(id)
-            })
-        },
-        sortChange({ column, prop, order }) {
-            this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-            this.listQuery.sidx = !order ? '' : prop
-            this.initData()
-        },
-        async initSearchDataAndListData() {
-            await this.initSearchData()
-            this.initData()
-        },
-        //初始化查询的默认数据
-        async initSearchData() {
-        },
-        initData() {
-            this.listLoading = true;
-            let _query = {
-                ...this.listQuery,
-                ...this.query,
-                keyword: this.keyword,
-                dataType: 0,
-                menuId: this.menuId,
-                moduleId: '564710229816651141',
-                type: 1,
-            };
-            request({
-                url: `/api/scm/RecycleCleanOrder/getList`,
-                method: 'post',
-                data: _query
-            }).then(res => {
-                var _list = res.data.list;
-                this.list = _list.map(o => ({
-                    ...o,
-                    ...this.expandObj,
-                }))
-                this.total = res.data.pagination.total
-                this.listLoading = false
-            })
-        },
-        handleDel(id) {
-            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                type: 'warning'
-            }).then(() => {
-                request({
-                    url: `/api/scm/RecycleCleanOrder/${id}`,
-                    method: 'DELETE'
-                }).then(res => {
-                    this.$message({
-                        type: 'success',
-                        message: res.msg,
-                        onClose: () => {
-                            this.initData()
-                        }
-                    });
-                })
-            }).catch(() => {
+          });
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          });
+        }
+      });
+    },
+    getExportList(list) {
+      let exportList = [];
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === "table") {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j]);
+          }
+        } else {
+          exportList.push(list[i]);
+        }
+      }
+      this.exportList = exportList;
+    },
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
+    },
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
+    },
+    async initSearchDataAndListData() {
+      await this.initSearchData();
+      this.initData();
+    },
+    //初始化查询的默认数据
+    async initSearchData() {},
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        keyword: this.keyword,
+        dataType: 0,
+        menuId: this.menuId,
+        moduleId: "564710229816651141",
+        type: 1
+      };
+      request({
+        url: `/api/scm/RecycleCleanOrder/getList`,
+        method: "post",
+        data: _query
+      }).then(res => {
+        var _list = res.data.list;
+        this.list = _list.map(o => ({
+          ...o,
+          ...this.expandObj
+        }));
+        this.total = res.data.pagination.total;
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          request({
+            url: `/api/scm/RecycleCleanOrder/${id}`,
+            method: "DELETE"
+          }).then(res => {
+            this.$message({
+              type: "success",
+              message: res.msg,
+              onClose: () => {
+                this.initData();
+              }
             });
-        },
-        handelUpload() {
-            this.uploadBoxVisible = true
-            this.$nextTick(() => {
-                this.$refs.UploadBox.init("", "scm/RecycleCleanOrder")
-            })
-        },
-        openSuperQuery() {
-            this.superQueryVisible = true
-            this.$nextTick(() => {
-                this.$refs.SuperQuery.init()
-            })
-        },
-        superQuery(queryJson) {
-            this.listQuery.superQueryJson = queryJson
-            this.listQuery.currentPage = 1
-            this.initData()
-        },
-        addOrUpdateHandle(row, isDetail) {
-            let id = row ? row.id : ""
-            this.formVisible = true
-            this.$nextTick(() => {
-                this.$refs.JNPFForm.init(id, isDetail, this.list)
-            })
-        },
-        auditHandle(row, isDetail) {
-            let id = row ? row.id : ""
-            this.auditHandleVisible = true
-            this.$nextTick(() => {
-                this.$refs.Audit.init(id, isDetail, this.list)
-            })
-        },
-        exportData() {
-            this.exportBoxVisible = true
-            this.$nextTick(() => {
-                this.$refs.ExportBox.init(this.exportList)
-            })
-        },
-        download(data) {
-            let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-            request({
-                url: `/api/scm/RecycleCleanOrder/Actions/Export`,
-                method: 'post',
-                data: query
-            }).then(res => {
-                if (!res.data.url) return
-                this.jnpf.downloadFile(res.data.url)
-                this.$refs.ExportBox.visible = false
-                this.exportBoxVisible = false
-            })
-        },
-        search() {
-            this.listQuery.currentPage = 1
-            this.listQuery.pageSize = 20
-            this.listQuery.sort = "desc"
-            this.listQuery.sidx = ""
-            this.initData()
-        },
-        refresh(isrRefresh) {
-            this.formVisible = false
-            this.auditHandleVisible = false
-            if (isrRefresh) this.reset()
-        },
-        reset() {
-            this.query = JSON.parse(JSON.stringify(this.queryData))
-            this.search()
-        },
-        colseFlow(isrRefresh) {
-            this.flowVisible = false
-            if (isrRefresh) this.reset()
-        },
-        handleSubmit(rows) {
-            if (this.selectedWeights.some(str => {
-                const num = parseFloat(str);
-                return !isNaN(num) && (num === 0 || num < 0);
-            })) {
-                console.log(1111111);
-                this.$message.error('清运重量存在异议！请检查所选数据');
-                return;
-            }
-            if (this.selectedIds.length == 0) {
-                this.$message.error('请选择要审核的单据！');
-                return;
-            }
-            if (rows.adjustComm == null || rows.adjustComm == '') {
-                this.$message.error('请填写您的审核意见！');
-                return;
-            }
-            let _query = {
-                adjustStatus: 1,
-                ids: this.selectedIds,
-                adjustComm: rows.adjustComm,
-                entryStatus: 1
-            };
-            request({
-                url: `/api/scm/RecycleCleanOrder/auditBatch`,
-                method: 'post',
-                data: _query
-            }).then(res => {
-                this.$message({
-                    message: res.msg,
-                    type: 'success',
-                    duration: 1000,
-                })
-                this.initData()
-            })
-        },
+          });
+        })
+        .catch(() => {});
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/RecycleCleanOrder");
+      });
+    },
+    openSuperQuery() {
+      this.superQueryVisible = true;
+      this.$nextTick(() => {
+        this.$refs.SuperQuery.init();
+      });
+    },
+    superQuery(queryJson) {
+      this.listQuery.superQueryJson = queryJson;
+      this.listQuery.currentPage = 1;
+      this.initData();
+    },
+    addOrUpdateHandle(row, isDetail) {
+      let id = row ? row.id : "";
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail, this.list);
+      });
+    },
+    auditHandle(row, isDetail) {
+      let id = row ? row.id : "";
+      this.auditHandleVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Audit.init(id, isDetail, this.list);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.exportList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId
+      };
+      request({
+        url: `/api/scm/RecycleCleanOrder/Actions/Export`,
+        method: "post",
+        data: query
+      }).then(res => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      this.listQuery.pageSize = 20;
+      this.listQuery.sort = "desc";
+      this.listQuery.sidx = "";
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      this.auditHandleVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      this.query = JSON.parse(JSON.stringify(this.queryData));
+      this.search();
+    },
+    colseFlow(isrRefresh) {
+      this.flowVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    handleSubmit(rows) {
+      if (
+        this.selectedWeights.some(str => {
+          const num = parseFloat(str);
+          return !isNaN(num) && (num === 0 || num < 0);
+        })
+      ) {
+        console.log(1111111);
+        this.$message.error("清运重量存在异议！请检查所选数据");
+        return;
+      }
+      if (this.selectedIds.length == 0) {
+        this.$message.error("请选择要审核的单据！");
+        return;
+      }
+      if (rows.adjustComm == null || rows.adjustComm == "") {
+        this.$message.error("请填写您的审核意见！");
+        return;
+      }
+      let _query = {
+        adjustStatus: 1,
+        ids: this.selectedIds,
+        adjustComm: rows.adjustComm,
+        entryStatus: 1
+      };
+      request({
+        url: `/api/scm/RecycleCleanOrder/auditBatch`,
+        method: "post",
+        data: _query
+      }).then(res => {
+        this.$message({
+          message: res.msg,
+          type: "success",
+          duration: 1000
+        });
+        this.initData();
+      });
     }
-}
+  }
+};
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue
index 3f00767..7c2f2c6 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue
@@ -111,7 +111,7 @@
           <el-table-column type="selection" width="40"></el-table-column>
           <el-table-column prop="companyId" label="公司id" align="left">
           </el-table-column>
-          <el-table-column prop="orderNo" label="投递单号" align="left" width="150">
+          <el-table-column prop="orderNo" label="投递单号" align="left" width="180">
           </el-table-column>
           <el-table-column prop="phone" label="投递人手机" align="left" width="100">
           </el-table-column>
@@ -160,10 +160,27 @@
           </el-table-column>
           <el-table-column prop="cleanerPhone" label="清运员手机号" align="left" width="100">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="修改用户" align="left">
+          <el-table-column prop="startTime" label="开始时间" align="left" width="140">
+            <template slot-scope="scope">
+              {{ fnDateFmt(scope.row.startTime) }}
+            </template>
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="修改时间" align="left">
+          <el-table-column prop="reportTime" label="报告时间" align="left" width="140">
+            <template slot-scope="scope">
+              {{ fnDateFmt(scope.row.reportTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="finishTime" label="结束时间" align="left" width="140">
+            <template slot-scope="scope">
+              {{ fnDateFmt(scope.row.finishTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="creatorTime" label="创建时间" align="left" width="140">
           </el-table-column>
+          <!-- <el-table-column prop="lastModifyUserId" label="修改用户" align="left">
+          </el-table-column>
+          <el-table-column prop="lastModifyTime" label="修改时间" align="left">
+          </el-table-column> -->
           <el-table-column label="操作" fixed="right" width="180">
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
@@ -194,6 +211,7 @@
 
 <script>
 import request from "@/utils/request";
+import dayjs from "dayjs";
 import { mapGetters } from "vuex";
 import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
 import JNPFForm from "./form";
@@ -339,6 +357,10 @@ export default {
     this.queryData = JSON.parse(JSON.stringify(this.query));
   },
   methods: {
+    fnDateFmt(val) {
+      let dateStr = dayjs(val).format("YYYY-MM-DD HH:mm");
+      return dateStr;
+    },
     handleSelectionChange(val) {
       this.selectedRows = val;
       this.selectedIds = this.selectedRows.map(row => row.id);