From 15837ce5d629a3c8939d24e72ea2457047713306 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Tue, 29 Oct 2024 14:29:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/deliveryOrder/index.vue | 17 +++++------------
 src/views/system/detail/index.vue        | 10 ++++++----
 src/views/system/device/index.vue        | 14 +++++++-------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/views/system/deliveryOrder/index.vue b/src/views/system/deliveryOrder/index.vue
index 3d85bd3..449e8ce 100644
--- a/src/views/system/deliveryOrder/index.vue
+++ b/src/views/system/deliveryOrder/index.vue
@@ -9,17 +9,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="代理商" prop="agentId">
+      <el-form-item label="代理商" prop="agentName">
         <el-input
-          v-model="queryParams.agentId"
+          v-model="queryParams.agentName"
           placeholder="请输入代理商"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="配送员" prop="deliverymanId">
+      <el-form-item label="配送员" prop="deliveryman">
         <el-input
-          v-model="queryParams.deliverymanId"
+          v-model="queryParams.deliveryman"
           placeholder="请输入配送员"
           clearable
           @keyup.enter.native="handleQuery"
@@ -35,14 +35,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="配送员名称" label-width="90" prop="deliveryman">
-        <el-input
-          v-model="queryParams.deliveryman"
-          placeholder="请输入配送员名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="配送员电话" label-width="90" prop="deliverymanPhone">
         <el-input
           v-model="queryParams.deliverymanPhone"
@@ -238,6 +230,7 @@ export default {
         pageSize: 10,
         orderNo: null,
         agentId: null,
+        agentName: null,
         deliverymanId: null,
         deliverymanType: null,
         deliveryman: null,
diff --git a/src/views/system/detail/index.vue b/src/views/system/detail/index.vue
index 3cef81d..ff95c0a 100644
--- a/src/views/system/detail/index.vue
+++ b/src/views/system/detail/index.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="代理商" prop="agentId">
+      <el-form-item label="代理商" prop="agentName">
         <el-input
-          v-model="queryParams.agentId"
+          v-model="queryParams.agentName"
           placeholder="请输入代理商"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="收款人" prop="partnerId">
+      <el-form-item label="收款人" prop="partnerPhone">
         <el-input
-          v-model="queryParams.partnerId"
+          v-model="queryParams.partnerPhone"
           placeholder="请输入收款人"
           clearable
           @keyup.enter.native="handleQuery"
@@ -160,7 +160,9 @@ export default {
         pageNum: 1,
         pageSize: 10,
         agentId: null,
+        agentName: null,
         partnerId: null,
+        partnerPhone: null,
         orderNo: null,
         totalAmount: null,
         dividendAmount: null,
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index 6dfffb5..926ce7f 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -630,11 +630,13 @@ export default {
     window.removeEventListener('scroll', this.handleScroll, true)
   },
   created() {
-
-    listHardwareVersion(this.queryParams).then(response => {
-      this.hardwareVersionOptions = response.rows;
-      this.loading2 = false;
-    });
+    this.userName = this.$store.state.user.name;
+    if (this.userName === "admin") {
+      listHardwareVersion(this.queryParams).then(response => {
+        this.hardwareVersionOptions = response.rows;
+        this.loading2 = false;
+      });
+    }
     console.log("当前用户信息：",this.$store.state.user.name)
     const sn = this.$route.params && this.$route.params.sn;
     const vehicleNum = this.$route.params && this.$route.params.vehicleNum;
@@ -656,9 +658,7 @@ export default {
       });
       options.splice(4, 0, mergedObj);
       this.statusOptions = options;
-      // console.log("statusOptions------",this.statusOptions)
     });
-    this.userName = this.$store.state.user.name;
     this.getList();
     this.getlistModel()
     this.getlistStore()