页面修改

src/config/index.ts

@@ -2,7 +2,7 @@ const config = {
     terminal: 1, //终端
     title: "后台管理系统", //网站默认标题
     version: "1.6.0", //版本号
-    baseUrl: `${import.meta.env.VITE_APP_BASE_URL || "https://preview-logistics.lihaink.cn"}/`, //请求接口域名
+    baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ""}/`, //请求接口域名
     urlPrefix: "adminapi", //请求默认前缀
     timeout: 10 * 1000, //请求超时时
 };

src/views/contract/index.vue

@@ -3,27 +3,12 @@
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <el-form class="mb-[-16px]" inline>
                 <el-form-item label="公司名称" prop="company_name">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.company_name" clearable placeholder="请输入公司名称" />
-            class="w-[280px]"
-            v-model="queryParams.company_name"
-            clearable
-            placeholder="请输入公司名称"
-          />
                 </el-form-item>
                 <el-form-item label="联系人" prop="contract_no">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.company_b_user" clearable placeholder="请输入联系人" />
-            class="w-[280px]"
+                </el-form-item><el-form-item label="联系方式" prop="status">
-            v-model="queryParams.company_b_user"
+                    <el-input class="w-[280px]" v-model="queryParams.company_b_phone" clearable placeholder="请输入联系方式" />
-            clearable
-            placeholder="请输入联系人"
-          /> </el-form-item
-        ><el-form-item label="联系方式" prop="status">
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.company_b_phone"
-            clearable
-            placeholder="请输入联系方式"
-          />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -31,70 +16,29 @@
                 </el-form-item>
             </el-form>
             <div class="mt-4">
-        <el-table
+                <el-table :data="pager.lists" :default-sort="{ prop: 'create_time', order: 'descending' }">
-          :data="pager.lists"
+                    <el-table-column label="公司名称" :width="250" prop="company_b_name" show-overflow-tooltip />
-          :default-sort="{ prop: 'create_time', order: 'descending' }"
+                    <el-table-column label="社会代码" prop="company_b_code" show-overflow-tooltip />
-        >
+                    <el-table-column label="主要联系人" prop="company_b_user" show-overflow-tooltip />
-          <el-table-column
+                    <el-table-column label="联系方式" prop="company_b_phone" align="center" show-overflow-tooltip />
-            label="公司名称"
+                    <el-table-column label="租车数量" prop="num" align="center" show-overflow-tooltip />
-            :width="250"
+                    <el-table-column label="合同状态" prop="num" align="center" show-overflow-tooltip>
-            prop="company_b_name"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="社会代码"
-            prop="company_b_code"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="主要联系人"
-            prop="company_b_user"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="联系方式"
-            prop="company_b_phone"
-            align="center"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="租车数量"
-            prop="num"
-            align="center"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="合同状态"
-            prop="num"
-            align="center"
-            show-overflow-tooltip
-          >
                         <template #default="{ row }">
                             {{ row.status >= 3 ? "已签约" : "未签约" }}
                         </template>
                     </el-table-column>
-          <el-table-column
+                    <el-table-column label="操作" align="center" width="auto" fixed="right">
-            label="操作"
-            align="center"
-            width="auto"
-            fixed="right"
-          >
                         <template #default="{ row }">
                             <el-button type="primary" link>
-                <router-link
+                                <router-link :to="{
-                  :to="{
                                     path: '/contract/detail',
                                     query: {
                                         id: row.id,
                                     },
-                  }"
+                                }">查看</router-link>
-                  >查看</router-link
-                >
                             </el-button>
-              <!-- <el-button type="primary" link @click="test(row.id)">
+
-                查看
+                            <!-- <el-button
-              </el-button> -->
-              <el-button
                 v-if="row.status == 1"
                 type="primary"
                 link
@@ -108,7 +52,7 @@
                 link
                 type="primary"
                 >重新发送{{ row.nums ? row.nums + "s" : "" }}</el-button
-              >
+              > -->
                         </template>
                     </el-table-column>
                 </el-table>
@@ -117,12 +61,7 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-    <edit-popup
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
-      v-if="showEdit"
-      ref="editRef"
-      @success="getLists"
-      @close="showEdit = false"
-    />
     </div>
 </template>
 

src/views/logistics/index.vue

@@ -3,77 +3,32 @@
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <el-form class="mb-[-16px]" inline>
                 <el-form-item label="订单编号" prop="company_id">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.order_sn" clearable placeholder="请输入订单编号" />
-            class="w-[280px]"
-            v-model="queryParams.order_sn"
-            clearable
-            placeholder="请输入订单编号"
-          />
                 </el-form-item>
                 <el-form-item label="商家名称" prop="company_id">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.shop_name" clearable placeholder="请输入商家名称" />
-            class="w-[280px]"
-            v-model="queryParams.shop_name"
-            clearable
-            placeholder="请输入商家名称"
-          />
                 </el-form-item>
                 <el-form-item label="商家电话" prop="company_id">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.shop_phone" clearable placeholder="请输入商家电话" />
-            class="w-[280px]"
-            v-model="queryParams.shop_phone"
-            clearable
-            placeholder="请输入商家电话"
-          />
                 </el-form-item>
                 <el-form-item label="商家地址" prop="company_id">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.shop_address" clearable placeholder="请输入商家地址" />
-            class="w-[280px]"
-            v-model="queryParams.shop_address"
-            clearable
-            placeholder="请输入商家地址"
-          />
                 </el-form-item>
                 <el-form-item label="收件人" prop="company_id">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.receiver_name" clearable placeholder="请输入收件人" />
-            class="w-[280px]"
-            v-model="queryParams.receiver_name"
-            clearable
-            placeholder="请输入收件人"
-          />
                 </el-form-item>
 
                 <el-form-item label="收件人电话" prop="company_id">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.receiver_phone" clearable placeholder="请输入收件人电话" />
-            class="w-[280px]"
-            v-model="queryParams.receiver_phone"
-            clearable
-            placeholder="请输入收件人电话"
-          />
                 </el-form-item>
                 <el-form-item label="配送人员" prop="company_id">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.courier_name" clearable placeholder="请输入配送人员姓名" />
-            class="w-[280px]"
-            v-model="queryParams.courier_name"
-            clearable
-            placeholder="请输入配送人员姓名"
-          />
                 </el-form-item>
                 <el-form-item label="所属公司" prop="company_id">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.courier_company" clearable placeholder="请输入所属公司地址" />
-            class="w-[280px]"
-            v-model="queryParams.courier_company"
-            clearable
-            placeholder="请输入所属公司地址"
-          />
                 </el-form-item>
                 <el-form-item label="村/镇/小队" prop="company_id">
-          <el-input
+                    <el-input class="w-[280px]" v-model="queryParams.receiver_address" clearable placeholder="请输入村/镇/小队" />
-            class="w-[280px]"
-            v-model="queryParams.receiver_address"
-            clearable
-            placeholder="请输入村/镇/小队"
-          />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -81,89 +36,32 @@
                 </el-form-item>
             </el-form>
             <div class="mt-4">
-        <el-table
+                <el-table :data="pager.lists" :default-sort="{ prop: 'create_time', order: 'descending' }"
-          :data="pager.lists"
+                    @selection-change="handleSelectionChange">
-          :default-sort="{ prop: 'create_time', order: 'descending' }"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            label="订单编号"
-            :width="250"
-            prop="order_sn"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="商户名称"
-            prop="shop_name"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="收货人"
-            prop="receiver_name"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="收货人号码"
-            prop="receiver_phone"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="收货地址"
-            prop="receiver_address"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="商品数量"
-            prop="product_count"
-            align="center"
-            show-overflow-tooltip
-          />
 
-          <el-table-column
+                    <el-table-column label="订单编号" :width="250" prop="order_sn" show-overflow-tooltip />
-            label="下单时间"
+                    <el-table-column label="商户名称" prop="shop_name" show-overflow-tooltip />
-            sortable
+                    <el-table-column label="收货人" prop="receiver_name" show-overflow-tooltip />
-            prop="create_time"
+                    <el-table-column label="收货人号码" prop="receiver_phone" show-overflow-tooltip />
-            show-overflow-tooltip
+                    <el-table-column label="收货地址" prop="receiver_address" show-overflow-tooltip />
-          />
+                    <el-table-column label="商品数量" prop="product_count" align="center" show-overflow-tooltip />
 
-          <el-table-column
+                    <el-table-column label="下单时间" sortable prop="create_time" show-overflow-tooltip />
-            label="订单状态"
+
-            :filters="[
+                    <el-table-column label="订单状态" :filters="[
                         { text: '待取货', value: '0' },
                         { text: '配送中', value: '1' },
                         { text: '已配送', value: '2' },
                         { text: '已取消', value: '3' },
-            ]"
+                    ]" :filter-method="filterHandler" prop="status_name" show-overflow-tooltip>
-            :filter-method="filterHandler"
-            prop="status_name"
-            show-overflow-tooltip
-          >
                     </el-table-column>
 
-          <el-table-column
+                    <el-table-column label="配送人员" prop="courier_name" show-overflow-tooltip />
-            label="配送人员"
+                    <el-table-column label="配送人员所属公司" prop="courier_company" show-overflow-tooltip />
-            prop="courier_name"
+                    <el-table-column label="操作" align="center" width="auto" fixed="right">
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="配送人员所属公司"
-            prop="courier_company"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            width="auto"
-            fixed="right"
-          >
                         <template #default="{ row }">
-              <el-button
+                            <el-button type="primary" v-perms="['logistics.logistics/detail']" link
-                type="primary"
+                                @click="handleView(row)">查看</el-button>
-                v-perms="['logistics.logistics/detail']"
-                link
-                @click="handleView(row)"
-                >查看</el-button
-              >
                         </template>
                     </el-table-column>
                 </el-table>
@@ -172,12 +70,7 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-    <edit-popup
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
-      v-if="showEdit"
-      ref="editRef"
-      @success="getLists"
-      @close="showEdit = false"
-    />
     </div>
 </template>
 
@@ -186,36 +79,6 @@ import { usePaging } from "@/hooks/usePaging";
 import { useDictData } from "@/hooks/useDictOptions";
 import { orderList } from "@/api/logistics";
 import EditPopup from "./edit.vue";
-// let obj = [
-//   {
-//     cunid: 1,
-//     zhgn: [
-//       {
-//         zhengid: 1,
-//         dui: [1, 2, 3],
-//       },
-
-//       {
-//         zhengid: 2,
-//         dui: [1, 2, 3],
-//       },
-//     ],
-//   },
-//   {
-//     cunid: 3,
-//     zhgn: [
-//       {
-//         zhengid: 1,
-//         dui: [1, 2, 3],
-//       },
-
-//       {
-//         zhengid: 2,
-//         dui: [1, 2, 3],
-//       },
-//     ],
-//   },
-// ];
 interface User {
     date: string;
     name: string;

src/views/vehicle/index.vue

@@ -43,7 +43,7 @@
                     <el-table-column label="当前使用人" prop="rent_info.use_user_name" show-overflow-tooltip />
                     <el-table-column label="联系方式" prop="rent_info.use_user_phone" show-overflow-tooltip />
 
-                    <el-table-column label="车辆使用情况" prop="status_name" show-overflow-tooltip />
+                    <el-table-column label="车辆使用情况" align="center" prop="status_name" show-overflow-tooltip />
 
                     <el-table-column label="当前运载货物" prop="create_time" show-overflow-tooltip />
                     <el-table-column label="车辆类型" prop="type_name" show-overflow-tooltip />