From 3972b80908ee08fb2f6c169f759337600a9448a5 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 1 Mar 2024 14:25:30 +0800
Subject: [PATCH] =?UTF-8?q?2024-3-1=20=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BE=9B=E5=BA=94=E5=95=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96+=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../faultInformation/itemFaultDescription.vue |   4 +-
 .../faultInformation/itemFaultMeasures.vue    |   4 +-
 .../faultInformation/itemFaultReason.vue      |   4 +-
 .../device/faultInformation/itemFaultType.vue |   4 +-
 src/views/device/item/index.vue               |   6 +-
 src/views/device/maintenanceWork/index.vue    |  11 +-
 src/views/device/outsourceWorkOrder/index.vue |   1 +
 src/views/device/repairOrderReport/index.vue  |  17 +-
 src/views/device/spotInspectionWork/index.vue |  11 +-
 src/views/device/upkeepOrder/index.vue        |   1 +
 src/views/device/upkeepPlan/index.vue         |   4 +-
 src/views/wms/customer/index.vue              | 978 ++++++++++--------
 src/views/wms/supplier/index.vue              | 808 ++++++++-------
 13 files changed, 1057 insertions(+), 796 deletions(-)

diff --git a/src/views/device/faultInformation/itemFaultDescription.vue b/src/views/device/faultInformation/itemFaultDescription.vue
index 25091d3..35761b8 100644
--- a/src/views/device/faultInformation/itemFaultDescription.vue
+++ b/src/views/device/faultInformation/itemFaultDescription.vue
@@ -191,13 +191,13 @@
       <el-table-column
         width="150"
         label="故障描述"
-        align="center"
+        align="left"
         prop="faultSubclass"
       />
       <el-table-column
         width="180"
         label="备注"
-        align="center"
+        align="left"
         prop="faultRemark"
       />
       <el-table-column
diff --git a/src/views/device/faultInformation/itemFaultMeasures.vue b/src/views/device/faultInformation/itemFaultMeasures.vue
index 5430e8a..343c40a 100644
--- a/src/views/device/faultInformation/itemFaultMeasures.vue
+++ b/src/views/device/faultInformation/itemFaultMeasures.vue
@@ -182,13 +182,13 @@
       <el-table-column
         width="150"
         label="故障措施"
-        align="center"
+        align="left"
         prop="faultSubclass"
       />
       <el-table-column
         width="180"
         label="备注"
-        align="center"
+        align="left"
         prop="faultRemark"
       />
       <el-table-column
diff --git a/src/views/device/faultInformation/itemFaultReason.vue b/src/views/device/faultInformation/itemFaultReason.vue
index 4f5a7f1..419e500 100644
--- a/src/views/device/faultInformation/itemFaultReason.vue
+++ b/src/views/device/faultInformation/itemFaultReason.vue
@@ -196,13 +196,13 @@
       <el-table-column
         width="200"
         label="故障原因"
-        align="center"
+        align="left"
         prop="faultSubclass"
       />
       <el-table-column
         width="180"
         label="备注"
-        align="center"
+        align="left"
         prop="faultRemark"
       />
       <el-table-column
diff --git a/src/views/device/faultInformation/itemFaultType.vue b/src/views/device/faultInformation/itemFaultType.vue
index defb74a..53fbea5 100644
--- a/src/views/device/faultInformation/itemFaultType.vue
+++ b/src/views/device/faultInformation/itemFaultType.vue
@@ -244,13 +244,13 @@
       <el-table-column
         width="150"
         label="故障子类"
-        align="center"
+        align="left"
         prop="faultSubclass"
       />
       <el-table-column
         width="180"
         label="备注"
-        align="center"
+        align="left"
         prop="faultRemark"
       />
       <el-table-column
diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue
index ee39906..b01ec06 100644
--- a/src/views/device/item/index.vue
+++ b/src/views/device/item/index.vue
@@ -205,9 +205,9 @@
       <el-table-column v-if="false" label="主键" align="center" prop="itemId"/>
       <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
       <el-table-column width="120" label="检查项编码" align="center" prop="itemCode"/>
-      <el-table-column width="200" label="部位" align="center" prop="itemName"/>
-      <el-table-column width="150" label="方法" align="center" prop="itemMethod"/>
-      <el-table-column width="150" label="工具" align="center" prop="itemTools"/>
+      <el-table-column width="200" label="部位" align="left" prop="itemName"/>
+      <el-table-column width="150" label="方法" align="left" prop="itemMethod"/>
+      <el-table-column width="150" label="工具" align="left" prop="itemTools"/>
       <el-table-column width="80" label="周期" align="center" prop="itemLoop"/>
       <el-table-column width="80" label="周期类型" align="center" prop="itemLoopType">
         <template slot-scope="scope">
diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index f10cf76..cfe7805 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -457,7 +457,7 @@
     >
       <el-tabs type="border-card">
         <el-tab-pane label="保养信息">
-          <el-descriptions title="" border :column="2">
+          <el-descriptions title="" border :column="2" :contentStyle="CS" :label-style="LS">
             <el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
             <el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
             <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
@@ -485,7 +485,7 @@
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="设备信息">
-          <el-descriptions class="my-margin-top" title="" :column="2" border>
+          <el-descriptions class="my-margin-top" title="" :column="2" border :contentStyle="CS" :label-style="LS">
             <el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
             <el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
             <el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
@@ -618,6 +618,13 @@ export default {
   dicts: ['device_order_status', 'device_loop_type','device_upkeep_type','device_inspect_status'],
   data() {
     return {
+      //表格样式
+      CS: {
+        width: "300px",
+      },
+      LS: {
+        width: "200px",
+      },
       standardListVo:[],
       workCenterList:[],
       // 日期范围选择快捷
diff --git a/src/views/device/outsourceWorkOrder/index.vue b/src/views/device/outsourceWorkOrder/index.vue
index 839aedf..83c90e1 100644
--- a/src/views/device/outsourceWorkOrder/index.vue
+++ b/src/views/device/outsourceWorkOrder/index.vue
@@ -216,6 +216,7 @@
         align="center"
         prop="workConnection"
         width="150"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
         label="委外原因"
diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue
index 7c4914e..738db6c 100644
--- a/src/views/device/repairOrderReport/index.vue
+++ b/src/views/device/repairOrderReport/index.vue
@@ -397,7 +397,7 @@
               <el-descriptions-item
                 label="维修前故障图片"
                 :contentStyle="CS_IMG"
-                :label-style="LS_BEFORE_IMG"
+                :label-style="LS_IMG"
               >
                 <div class="view_picture_body">
                   <el-image
@@ -478,7 +478,7 @@
               :column="1"
               border
               :contentStyle="CS_IMG"
-              :label-style="LS_AFTER_IMG"
+              :label-style="LS_IMG"
             >
               <el-descriptions-item label="故障原因">{{
                 form.orderDesc
@@ -491,7 +491,7 @@
               :column="1"
               border
               :contentStyle="CS_IMG"
-              :label-style="LS_AFTER_IMG"
+              :label-style="LS_IMG"
             >
               <el-descriptions-item label="维修后图片">
                 <div class="view_picture_body">
@@ -616,23 +616,16 @@ export default {
     return {
       //表格样式
       CS: {
-        "text-align": "center",
          width: "200px",
       },
       LS: {
-        "text-align": "center",
         width: "200px",
       },
       //表格样式
       CS_IMG: {
-        "text-align": "center",
+        "text-align": "left",
       },
-      LS_BEFORE_IMG: {
-        "text-align": "center",
-        width: "190px",
-      },
-      LS_AFTER_IMG: {
-        "text-align": "center",
+      LS_IMG: {
         width: "190px",
       },
       //检查项表格数据
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index d0c26c7..7d59fbf 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -422,7 +422,7 @@
     >
       <el-tabs type="border-card">
         <el-tab-pane label="点检信息">
-          <el-descriptions title="" border :column="2">
+          <el-descriptions title="" border :column="2" :contentStyle="CS" :label-style="LS">
             <el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
             <el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
             <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
@@ -438,7 +438,7 @@
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="设备信息">
-          <el-descriptions class="my-margin-top" title="" :column="2" border>
+          <el-descriptions title="" :column="2" border :contentStyle="CS" :label-style="LS">
             <el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
             <el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
             <el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
@@ -536,6 +536,13 @@ export default {
   dicts: ['device_order_status', 'device_loop_type'],
   data() {
     return {
+      //表格样式
+      CS: {
+        width: "300px",
+      },
+      LS: {
+        width: "200px",
+      },
       standardListVo:[],
       // 日期范围选择快捷
       pickerOptions: {
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index dfadbca..08007b6 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -352,6 +352,7 @@
 
     <el-table v-loading="loading" :data="upkeepOrderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column width="60" align="center" label="序号" type="index" fixed/>
       <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
       <el-table-column v-if="false" label="计划id" align="center" prop="planId" />
       <el-table-column width="150" label="计划编码" align="center" prop="planCode" />
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index 6e7b20a..a4bf18a 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -302,9 +302,9 @@
 
     <el-table v-loading="loading" :data="upkeepPlanList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
+      <el-table-column width="60" align="center" label="序号" type="index" fixed></el-table-column>
       <el-table-column v-if="false" label="主键" align="center" prop="planId"/>
-      <el-table-column width="150" label="计划编码" align="center" prop="planCode"/>
+      <el-table-column width="150" label="计划编码" align="center" prop="planCode" fixed/>
       <el-table-column width="150" label="计划名称" align="center" prop="planName"/>
       <el-table-column label="车间编码" align="center" prop="planWorkshop"/>
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
diff --git a/src/views/wms/customer/index.vue b/src/views/wms/customer/index.vue
index c2f4e94..cf953a8 100644
--- a/src/views/wms/customer/index.vue
+++ b/src/views/wms/customer/index.vue
@@ -1,84 +1,131 @@
 <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="clientCode">
-				<el-input
-					v-model="queryParams.clientCode"
-					placeholder="请输入客户编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="客户名称" prop="clientName">
-				<el-input
-					v-model="queryParams.clientName"
-					placeholder="请输入客户名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
+  <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="clientCode">
+        <el-input
+          v-model="queryParams.clientCode"
+          placeholder="请输入客户编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="clientName">
+        <el-input
+          v-model="queryParams.clientName"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
 
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['wms:customer:add']"
-				>新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['wms:customer:edit']"
-				>修改</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['wms:customer:remove']"
-				>删除</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['wms:customer:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['wms:customer:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wms:customer:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['wms:customer:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['wms:customer:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-		<el-table v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			<!-- 序号 -->
-			<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" />
-			<el-table-column label="客户编码" align="center" prop="clientCode" width="150"/>
-			<el-table-column label="客户名称" align="center" prop="clientName" width="270"/>
-			<!-- <el-table-column label="客户简介" align="center" prop="clientDes" /> -->
-			<!-- <el-table-column label="客户类型" align="center" prop="clientType" /> -->
-			<el-table-column label="客户地址" align="center" prop="address" width="300"/>
-			<!-- <el-table-column label="客户官网地址" align="center" prop="website" width="200"/>
+    <el-table
+      v-loading="loading"
+      :data="customerList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+      />
+      <el-table-column
+        label="客户编码"
+        align="center"
+        prop="clientCode"
+        width="150"
+      />
+      <el-table-column
+        label="客户名称"
+        align="left"
+        prop="clientName"
+        width="270"
+      />
+      <!-- <el-table-column label="客户简介" align="center" prop="clientDes" /> -->
+      <!-- <el-table-column label="客户类型" align="center" prop="clientType" /> -->
+      <el-table-column
+        label="客户地址"
+        align="left"
+        prop="address"
+        width="300"
+      />
+      <!-- <el-table-column label="客户官网地址" align="center" prop="website" width="200"/>
 			<el-table-column label="客户邮箱地址" align="center" prop="email" width="200"/>
 			<el-table-column label="客户电话" align="center" prop="tel" width="150"/>
 			<el-table-column label="联系人1" align="center" prop="contact1" />
@@ -88,373 +135,468 @@
 			<el-table-column label="联系人2-电话" align="center" prop="contact2Tel" width="150"/>
 			<el-table-column label="联系人2-邮箱" align="center" prop="contact2Email" width="150"/>
 			<el-table-column label="统一社会信用代码" align="center" prop="creditCode" width="200" /> -->
-			<el-table-column label="创建人" align="center" prop="createBy" width="200"/>
-			<el-table-column label="创建时间" align="center" prop="createTime" width="200"/>
-			<el-table-column label="是否启用" align="center" prop="enableFlag">
-			  <template slot-scope="scope">
+      <el-table-column
+        label="创建人"
+        align="center"
+        prop="createBy"
+        width="200"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="200"
+      />
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
+        <template slot-scope="scope">
           {{ scope.row.enableFlag == 1 ? "是" : "否" }}
         </template>
       </el-table-column>
-			<el-table-column label="备注" align="center" prop="remark" />
-		</el-table>
+      <el-table-column label="备注" align="center" prop="remark" />
+    </el-table>
 
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-		<!-- 添加或修改客户管理对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="130px">
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="客户编码" prop="clientCode">
-							<el-input v-model="form.clientCode" placeholder="请输入客户编码" />
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="客户名称" prop="clientName">
-							<el-input v-model="form.clientName" placeholder="请输入客户名称" />
-						</el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="客户简称" prop="clientNick">
-							<el-input v-model="form.clientNick" placeholder="请输入客户简称" />
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="客户英文名称" prop="clientEn">
-							<el-input v-model="form.clientEn" placeholder="请输入客户英文名称" />
-						</el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="客户简介" prop="clientDes">
-							<el-input v-model="form.clientDes" type="textarea" placeholder="请输入内容" />
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="客户LOGO地址" prop="clientLogo">
-							<el-input v-model="form.clientLogo" placeholder="请输入客户LOGO地址" />
-						</el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="客户地址" prop="address">
-							<el-input v-model="form.address" type="textarea" placeholder="请输入内容" />
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="客户官网地址" prop="website">
-							<el-input v-model="form.website" placeholder="请输入客户官网地址" />
-						</el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="客户邮箱地址" prop="email">
-							<el-input v-model="form.email" placeholder="请输入客户邮箱地址" />
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="客户电话" prop="tel">
-							<el-input v-model="form.tel" placeholder="请输入客户电话" />
-						</el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="联系人1" prop="contact1">
-							<el-input v-model="form.contact1" placeholder="请输入联系人1" />
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="联系人2" prop="contact2">
-            	<el-input v-model="form.contact2" placeholder="请输入联系人2" />
+    <!-- 添加或修改客户管理对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="客户编码" prop="clientCode">
+              <el-input
+                v-model="form.clientCode"
+                placeholder="请输入客户编码"
+              />
             </el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户名称" prop="clientName">
+              <el-input
+                v-model="form.clientName"
+                placeholder="请输入客户名称"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="客户简称" prop="clientNick">
+              <el-input
+                v-model="form.clientNick"
+                placeholder="请输入客户简称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户英文名称" prop="clientEn">
+              <el-input
+                v-model="form.clientEn"
+                placeholder="请输入客户英文名称"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="客户简介" prop="clientDes">
+              <el-input
+                v-model="form.clientDes"
+                type="textarea"
+                placeholder="请输入内容"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户LOGO地址" prop="clientLogo">
+              <el-input
+                v-model="form.clientLogo"
+                placeholder="请输入客户LOGO地址"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="客户地址" prop="address">
+              <el-input
+                v-model="form.address"
+                type="textarea"
+                placeholder="请输入内容"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户官网地址" prop="website">
+              <el-input
+                v-model="form.website"
+                placeholder="请输入客户官网地址"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="客户邮箱地址" prop="email">
+              <el-input v-model="form.email" placeholder="请输入客户邮箱地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户电话" prop="tel">
+              <el-input v-model="form.tel" placeholder="请输入客户电话" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="联系人1" prop="contact1">
+              <el-input v-model="form.contact1" placeholder="请输入联系人1" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人2" prop="contact2">
+              <el-input v-model="form.contact2" placeholder="请输入联系人2" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
             <el-form-item label="联系人1-电话" prop="contact1Tel">
-              <el-input v-model="form.contact1Tel" placeholder="请输入联系人1-电话" maxlength="11"/>
+              <el-input
+                v-model="form.contact1Tel"
+                placeholder="请输入联系人1-电话"
+                maxlength="11"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人2-电话" prop="contact2Tel">
+              <el-input
+                v-model="form.contact2Tel"
+                placeholder="请输入联系人2-电话"
+                maxlength="11"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="联系人1-邮箱" prop="contact1Email">
+              <el-input
+                v-model="form.contact1Email"
+                placeholder="请输入联系人1-邮箱"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人2-邮箱" prop="contact2Email">
+              <el-input
+                v-model="form.contact2Email"
+                placeholder="请输入联系人2-邮箱"
+                maxlength="50"
+              />
             </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-			      <el-form-item label="联系人2-电话" prop="contact2Tel">
-              <el-input v-model="form.contact2Tel" placeholder="请输入联系人2-电话" maxlength="11"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码" prop="creditCode">
+              <el-input
+                v-model="form.creditCode"
+                placeholder="请输入统一社会信用代码"
+                maxlength="50"
+              />
             </el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="联系人1-邮箱" prop="contact1Email">
-							<el-input v-model="form.contact1Email" placeholder="请输入联系人1-邮箱" />
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="联系人2-邮箱" prop="contact2Email">
-							<el-input v-model="form.contact2Email" placeholder="请输入联系人2-邮箱" maxlength="50"/>
-						</el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                  	<el-col :span="12">
-						<el-form-item label="统一社会信用代码" prop="creditCode">
-							<el-input v-model="form.creditCode" placeholder="请输入统一社会信用代码" maxlength="50"/>
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="是否启用" prop="enableFlag">
-							<el-select v-model="form.enableFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:350px">
-                <el-option v-for="item in options" :key="item.enableFlag" :label="item.label" :value="item.enableFlag"></el-option>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enableFlag">
+              <el-select
+                v-model="form.enableFlag"
+                placeholder="请选择是否启用"
+                @change="$forceUpdate()"
+                clearable
+                style="width: 350px"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.enableFlag"
+                  :label="item.label"
+                  :value="item.enableFlag"
+                ></el-option>
               </el-select>
-						</el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-				  <el-col :span="12">
-				    <el-form-item label="客户类型" prop="clientType">
-            	<el-input v-model="form.clientType" placeholder="请输入客户类型" />
             </el-form-item>
           </el-col>
-                  	<el-col :span="12">
-						<el-form-item label="备注" prop="remark">
-							<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-						</el-form-item>
-                    </el-col>
-                </el-row>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="12">
+            <el-form-item label="客户类型" prop="clientType">
+              <el-input
+                v-model="form.clientType"
+                placeholder="请输入客户类型"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { listCustomer, getCustomer, delCustomer, addCustomer, updateCustomer } from "@/api/wms/customer";
+import {
+  listCustomer,
+  getCustomer,
+  delCustomer,
+  addCustomer,
+  updateCustomer,
+} from "@/api/wms/customer";
 export default {
-	name: "Customer",
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 客户管理表格数据
-			customerList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				clientCode: null,
-				clientName: null,
-				clientNick: null,
-				clientEn: null,
-				clientDes: null,
-				clientLogo: null,
-				clientType: null,
-				address: null,
-				website: null,
-				email: null,
-				tel: null,
-				contact1: null,
-				contact1Tel: null,
-				contact1Email: null,
-				contact2: null,
-				contact2Tel: null,
-				contact2Email: null,
-				creditCode: null,
-				enableFlag: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-			},
-			// 表单参数
-			form: {},
-			options: [{
-        enableFlag: "1",
-        label: '是'
-      }, {
-        enableFlag: "0",
-        label: '否'
-      }],
-			// 表单校验
-			rules: {
-				clientCode: [
-					{ required: true, message: "客户编码不能为空", trigger: "blur" }
-				],
-				clientName: [
-					{ required: true, message: "客户名称不能为空", trigger: "blur" }
-				],
-				enableFlag: [
-					{ required: true, message: "是否启用不能为空", trigger: "blur" }
-				],
+  name: "Customer",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户管理表格数据
+      customerList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        clientCode: null,
+        clientName: null,
+        clientNick: null,
+        clientEn: null,
+        clientDes: null,
+        clientLogo: null,
+        clientType: null,
+        address: null,
+        website: null,
+        email: null,
+        tel: null,
+        contact1: null,
+        contact1Tel: null,
+        contact1Email: null,
+        contact2: null,
+        contact2Tel: null,
+        contact2Email: null,
+        creditCode: null,
+        enableFlag: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+      },
+      // 表单参数
+      form: {},
+      options: [
+        {
+          enableFlag: "1",
+          label: "是",
+        },
+        {
+          enableFlag: "0",
+          label: "否",
+        },
+      ],
+      // 表单校验
+      rules: {
+        clientCode: [
+          { required: true, message: "客户编码不能为空", trigger: "blur" },
+        ],
+        clientName: [
+          { required: true, message: "客户名称不能为空", trigger: "blur" },
+        ],
+        enableFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
+        ],
         contact2Tel: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
+            trigger: "blur",
+          },
         ],
         contact1Tel: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
+            trigger: "blur",
+          },
         ],
-			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		// 生成表头序号
-  	indexMethod(index) {
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 生成表头序号
+    indexMethod(index) {
       return index + 1;
     },
-		/** 查询客户管理列表 */
-		getList() {
-			this.loading = true;
-			listCustomer(this.queryParams).then(response => {
-				this.customerList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				clientId: null,
-				clientCode: null,
-				clientName: null,
-				clientNick: null,
-				clientEn: null,
-				clientDes: null,
-				clientLogo: null,
-				clientType: null,
-				address: null,
-				website: null,
-				email: null,
-				tel: null,
-				contact1: null,
-				contact1Tel: null,
-				contact1Email: null,
-				contact2: null,
-				contact2Tel: null,
-				contact2Email: null,
-				creditCode: null,
-				enableFlag: null,
-				remark: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.clientId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加客户管理";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const clientId = this.ids;
-			console.log('客户ID',this.ids);
-			getCustomer(clientId).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改客户管理";
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.clientId != null) {
-						updateCustomer(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addCustomer(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const clientIds = row.clientId || this.ids;
-			this.$modal.confirm('是否确认删除客户管理编号为"' + clientIds + '"的数据项？').then(function() {
-				return delCustomer(clientIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('wms/customer/export', {
-				...this.queryParams
-			}, `customer_${new Date().getTime()}.xlsx`)
-		}
-	}
+    /** 查询客户管理列表 */
+    getList() {
+      this.loading = true;
+      listCustomer(this.queryParams).then((response) => {
+        this.customerList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        clientId: null,
+        clientCode: null,
+        clientName: null,
+        clientNick: null,
+        clientEn: null,
+        clientDes: null,
+        clientLogo: null,
+        clientType: null,
+        address: null,
+        website: null,
+        email: null,
+        tel: null,
+        contact1: null,
+        contact1Tel: null,
+        contact1Email: null,
+        contact2: null,
+        contact2Tel: null,
+        contact2Email: null,
+        creditCode: null,
+        enableFlag: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.clientId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加客户管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const clientId = this.ids;
+      console.log("客户ID", this.ids);
+      getCustomer(clientId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改客户管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.clientId != null) {
+            updateCustomer(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCustomer(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const clientIds = row.clientId || this.ids;
+      this.$modal
+        .confirm('是否确认删除客户管理编号为"' + clientIds + '"的数据项？')
+        .then(function () {
+          return delCustomer(clientIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "wms/customer/export",
+        {
+          ...this.queryParams,
+        },
+        `customer_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue
index d838b39..475b553 100644
--- a/src/views/wms/supplier/index.vue
+++ b/src/views/wms/supplier/index.vue
@@ -1,23 +1,30 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
-			<el-form-item label="供应商代码" prop="supplierCode">
-				<el-input
-					v-model="queryParams.supplierCode"
-					placeholder="请输入供应商代码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="供应商名称" prop="zhDesc">
-				<el-input
-					v-model="queryParams.zhDesc"
-					placeholder="请输入供应商名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<!-- <el-form-item label="英文描述" prop="enDesc">
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="88px"
+    >
+      <el-form-item label="供应商代码" prop="supplierCode">
+        <el-input
+          v-model="queryParams.supplierCode"
+          placeholder="请输入供应商代码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="供应商名称" prop="zhDesc">
+        <el-input
+          v-model="queryParams.zhDesc"
+          placeholder="请输入供应商名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="英文描述" prop="enDesc">
 				<el-input
 					v-model="queryParams.enDesc"
 					placeholder="请输入英文描述"
@@ -73,15 +80,15 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item> -->
-			<el-form-item label="联系人电话" prop="contactPhone">
-				<el-input
-					v-model="queryParams.contactPhone"
-					placeholder="请输入联系人电话"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<!-- <el-form-item label="联系人电话" prop="contactPhone">
+      <el-form-item label="联系人电话" prop="contactPhone">
+        <el-input
+          v-model="queryParams.contactPhone"
+          placeholder="请输入联系人电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="联系人电话" prop="contactPhone">
 				<el-input
 					v-model="queryParams.contactPhone"
 					placeholder="请输入联系人电话"
@@ -137,66 +144,101 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item> -->
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
 
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['wms:supplier:add']"
-				>新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['wms:supplier:edit']"
-				>修改</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['wms:supplier:remove']"
-				>删除</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['wms:supplier:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['wms:supplier:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wms:supplier:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['wms:supplier:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['wms:supplier:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-		<el-table v-loading="loading" :data="supplierList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			<!-- <el-table-column label="主键uuid" align="center" prop="supplierId" /> -->
-			<!-- 序号 -->
-			<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" ></el-table-column>
-			<el-table-column label="供应商编码" align="center" prop="supplierCode" width="100" />
-			<el-table-column label="供应商名字" align="center" prop="zhDesc" width="350" />
-			<!-- <el-table-column label="英文描述" align="center" prop="enDesc" />
+    <el-table
+      v-loading="loading"
+      :data="supplierList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="主键uuid" align="center" prop="supplierId" /> -->
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+      ></el-table-column>
+      <el-table-column
+        label="供应商编码"
+        align="center"
+        prop="supplierCode"
+        width="100"
+      />
+      <el-table-column
+        label="供应商名字"
+        align="left"
+        prop="zhDesc"
+        width="350"
+      />
+      <!-- <el-table-column label="英文描述" align="center" prop="enDesc" />
 			<el-table-column label="供应商类型" align="center" prop="supplierType" width="100"/>
 			<el-table-column label="账号" align="center" prop="accountNumber" width="100"/>
 			<el-table-column label="证照编码" align="center" prop="licenceNumber" width="200"/>
@@ -205,60 +247,96 @@
 			<el-table-column label="省" align="center" prop="province" />
 			<el-table-column label="市" align="center" prop="city" />
 			<el-table-column label="区" align="center" prop="area" /> -->
-			<el-table-column label="详细地址" align="center" prop="address" width="300"/>
-			<!-- <el-table-column label="邮编" align="center" prop="postcode" /> -->
-			<!-- <el-table-column label="联系人" align="center" prop="contact" />-->
-			<el-table-column label="联系人电话" align="center" prop="contactPhone" width="150"/>
-			<el-table-column label="创建人" align="center" prop="createBy" width="150"/>
-			<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
-			<!-- <el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/>
+      <el-table-column
+        label="详细地址"
+        align="left"
+        prop="address"
+        width="300"
+      />
+      <!-- <el-table-column label="邮编" align="center" prop="postcode" /> -->
+      <!-- <el-table-column label="联系人" align="center" prop="contact" />-->
+      <el-table-column
+        label="联系人电话"
+        align="left"
+        prop="contactPhone"
+        width="150"
+      />
+      <el-table-column
+        label="创建人"
+        align="center"
+        prop="createBy"
+        width="150"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="150"
+      />
+      <!-- <el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/>
 			<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="200"/> -->
-			<el-table-column label="是否启用" align="center" prop="activeFlag">
-			<template slot-scope="scope">
-              {{ scope.row.activeFlag == 1 ? "是" : "否" }}
-            </template>
-		    </el-table-column>
-			<!-- <el-table-column label="税号" align="center" prop="userDefined2" width="200"/> -->
-			<!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" />
+      <el-table-column label="是否启用" align="center" prop="activeFlag">
+        <template slot-scope="scope">
+          {{ scope.row.activeFlag == 1 ? "是" : "否" }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="税号" align="center" prop="userDefined2" width="200"/> -->
+      <!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" />
 			<el-table-column label="备注" align="center" prop="remark" /> -->
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:supplier:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:supplier:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        fixed="right"
+		width="150"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['wms:supplier:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['wms:supplier:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-		<!-- 添加或修改供应商管理对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="110px">
-						<el-form-item label="供应商代码" prop="supplierCode">
-							<el-input v-model="form.supplierCode" placeholder="请输入供应商代码" style="width:320px"/>
-						</el-form-item>
-						<el-form-item label="供应商名字" prop="zhDesc">
-							<el-input v-model="form.zhDesc" placeholder="请输入供应商名字" style="width:320px"/>
-						</el-form-item>
-				<!-- <el-row :gutter="10" class="mb8">
+    <!-- 添加或修改供应商管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="供应商代码" prop="supplierCode">
+          <el-input
+            v-model="form.supplierCode"
+            placeholder="请输入供应商代码"
+            style="width: 320px"
+          />
+        </el-form-item>
+        <el-form-item label="供应商名字" prop="zhDesc">
+          <el-input
+            v-model="form.zhDesc"
+            placeholder="请输入供应商名字"
+            style="width: 320px"
+          />
+        </el-form-item>
+        <!-- <el-row :gutter="10" class="mb8">
                   	<el-col :span="12">
 						<el-form-item label="英文描述" prop="enDesc">
 							<el-input v-model="form.enDesc" placeholder="请输入英文描述" />
@@ -318,20 +396,35 @@
 						</el-form-item>
                     </el-col>
                 </el-row> -->
-                  	<!-- <el-col :span="12"> -->
-						<!-- <el-form-item label="联系人" prop="contact">
+        <!-- <el-col :span="12"> -->
+        <!-- <el-form-item label="联系人" prop="contact">
 							<el-input v-model="form.contact" placeholder="请输入联系人" />
 						</el-form-item>
                     </el-col> -->
-  						<el-form-item label="是否启用" prop="activeFlag">
-                  			<el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:320px">
-             						<el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
-            					</el-select>
-          				</el-form-item>
-						<el-form-item label="联系人电话" prop="contactPhone">
-							<el-input v-model="form.contactPhone" placeholder="请输入联系人电话" style="width:320px"/>
-						</el-form-item>
-				<!-- <el-row :gutter="10" class="mb8">
+        <el-form-item label="是否启用" prop="activeFlag">
+          <el-select
+            v-model="form.activeFlag"
+            placeholder="请选择是否启用"
+            @change="$forceUpdate()"
+            clearable
+            style="width: 320px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.activeFlag"
+              :label="item.label"
+              :value="item.activeFlag"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="联系人电话" prop="contactPhone">
+          <el-input
+            v-model="form.contactPhone"
+            placeholder="请输入联系人电话"
+            style="width: 320px"
+          />
+        </el-form-item>
+        <!-- <el-row :gutter="10" class="mb8">
                   	<el-col :span="12">
 						<el-form-item label="联系人职务" prop="contactPosition">
 							<el-input v-model="form.contactPosition" placeholder="请输入联系人职务" />
@@ -343,7 +436,7 @@
 						</el-form-item>
                     </el-col>
                 </el-row> -->
-                    <!-- <el-col :span="12">
+        <!-- <el-col :span="12">
 						<el-form-item label="经营范围" prop="businessScope">
             				<el-input v-model="form.businessScope" type="textarea" placeholder="请输入内容" />
             			</el-form-item>
@@ -356,217 +449,234 @@
 				</el-form-item>
                     </el-col>
                     <el-col :span="12"> -->
-						<!-- <el-form-item label="用户自定义3" prop="userDefined3">
+        <!-- <el-form-item label="用户自定义3" prop="userDefined3">
 					<el-input v-model="form.userDefined3" placeholder="请输入用户自定义3" />
 				</el-form-item>
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="form.remark" placeholder="请输入备注" />
 				</el-form-item> -->
-                    <!-- </el-col>-->
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
+        <!-- </el-col>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { listSupplier, getSupplier, delSupplier, addSupplier, updateSupplier } from "@/api/wms/supplier";
+import {
+  listSupplier,
+  getSupplier,
+  delSupplier,
+  addSupplier,
+  updateSupplier,
+} from "@/api/wms/supplier";
 
 export default {
-	name: "Supplier",
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 供应商管理表格数据
-			supplierList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				supplierCode: null,
-				zhDesc: null,
-				enDesc: null,
-				supplierType: null,
-				accountNumber: null,
-				licenceNumber: null,
-				businessScope: null,
-				province: null,
-				city: null,
-				area: null,
-				address: null,
-				postcode: null,
-				contact: null,
-				contactPhone: null,
-				contactPosition: null,
-				contactEmail: null,
-				activeFlag: null,
-				userDefined1: null,
-				userDefined2: null,
-				userDefined3: null,
-			},
-			options: [{
-        activeFlag: "1",
-        label: '是'
-        }, {
-        activeFlag: "0",
-        label: '否'
-        }],
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-				supplierCode: [
-					{ required: true, message: "供应商代码不能为空", trigger: "blur" }
-				],
-				zhDesc: [
-					{ required: true, message: "供应商名字不能为空", trigger: "blur" }
-				],
-				activeFlag: [
-					{ required: true, message: "是否启用不能为空", trigger: "blur" }
-				],
-			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		// 生成表头序号
-		indexMethod(index) {
-        return index + 1;
+  name: "Supplier",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 供应商管理表格数据
+      supplierList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        supplierCode: null,
+        zhDesc: null,
+        enDesc: null,
+        supplierType: null,
+        accountNumber: null,
+        licenceNumber: null,
+        businessScope: null,
+        province: null,
+        city: null,
+        area: null,
+        address: null,
+        postcode: null,
+        contact: null,
+        contactPhone: null,
+        contactPosition: null,
+        contactEmail: null,
+        activeFlag: null,
+        userDefined1: null,
+        userDefined2: null,
+        userDefined3: null,
+      },
+      options: [
+        {
+          activeFlag: "1",
+          label: "是",
+        },
+        {
+          activeFlag: "0",
+          label: "否",
+        },
+      ],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        supplierCode: [
+          { required: true, message: "供应商代码不能为空", trigger: "blur" },
+        ],
+        zhDesc: [
+          { required: true, message: "供应商名字不能为空", trigger: "blur" },
+        ],
+        activeFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+    /** 查询供应商管理列表 */
+    getList() {
+      this.loading = true;
+      listSupplier(this.queryParams).then((response) => {
+        this.supplierList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        supplierId: null,
+        supplierCode: null,
+        zhDesc: null,
+        enDesc: null,
+        supplierType: null,
+        accountNumber: null,
+        licenceNumber: null,
+        businessScope: null,
+        province: null,
+        city: null,
+        area: null,
+        address: null,
+        postcode: null,
+        contact: null,
+        contactPhone: null,
+        contactPosition: null,
+        contactEmail: null,
+        activeFlag: null,
+        userDefined1: null,
+        userDefined2: null,
+        userDefined3: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.supplierId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加供应商管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const supplierId = row.supplierId || this.ids;
+      getSupplier(supplierId).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改供应商管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.supplierId != null) {
+            updateSupplier(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSupplier(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const supplierIds = row.supplierId || this.ids;
+      this.$modal
+        .confirm('是否确认删除供应商管理编号为"' + supplierIds + '"的数据项？')
+        .then(function () {
+          return delSupplier(supplierIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "wms/supplier/export",
+        {
+          ...this.queryParams,
         },
-		/** 查询供应商管理列表 */
-		getList() {
-			this.loading = true;
-			listSupplier(this.queryParams).then(response => {
-				this.supplierList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				supplierId: null,
-				supplierCode: null,
-				zhDesc: null,
-				enDesc: null,
-				supplierType: null,
-				accountNumber: null,
-				licenceNumber: null,
-				businessScope: null,
-				province: null,
-				city: null,
-				area: null,
-				address: null,
-				postcode: null,
-				contact: null,
-				contactPhone: null,
-				contactPosition: null,
-				contactEmail: null,
-				activeFlag: null,
-				userDefined1: null,
-				userDefined2: null,
-				userDefined3: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
-				remark: null
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.supplierId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加供应商管理";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const supplierId = row.supplierId || this.ids
-			getSupplier(supplierId).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改供应商管理";
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.supplierId != null) {
-						updateSupplier(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addSupplier(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const supplierIds = row.supplierId || this.ids;
-			this.$modal.confirm('是否确认删除供应商管理编号为"' + supplierIds + '"的数据项？').then(function() {
-				return delSupplier(supplierIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('wms/supplier/export', {
-				...this.queryParams
-			}, `supplier_${new Date().getTime()}.xlsx`)
-		}
-	}
+        `supplier_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>