From f6ab8064555f75a2ec471ff986911ee130f2c266 Mon Sep 17 00:00:00 2001
From: "DESKTOP-JT599KC\\Luan Shanshan" <xinyao.wang@le-it.com.cn>
Date: Mon, 17 Jan 2022 14:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=B8=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/factoryModel/customer/addOrEdit.vue |  7 +--
 src/views/factoryModel/customer/index.vue     | 56 ++++++++++++-------
 2 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/views/factoryModel/customer/addOrEdit.vue b/src/views/factoryModel/customer/addOrEdit.vue
index 3e61e58..96f0bc4 100644
--- a/src/views/factoryModel/customer/addOrEdit.vue
+++ b/src/views/factoryModel/customer/addOrEdit.vue
@@ -186,6 +186,9 @@ export default {
 	props: {
 		item: {
 			default: null,
+		},
+		getStatusArray: {
+			default: []
 		}
 	},
 	data() {
@@ -194,7 +197,6 @@ export default {
       formData: {
 				selectedOptions: [],
 			},
-			getStatusArray: [],
 			options: regionData,
       // 表单校验
       rules: {
@@ -224,9 +226,6 @@ export default {
 		}
 	},
 	created() {
-		this.getStanderOne({ statid: 'wm_clientstatus' }).then((res) => {
-      this.getStatusArray = res.data
-    })
 		get('/admin/ap/custdemandmodel/selectlist').then(({code, data=[]}) => {
 			if (code === 200) {
 				this.demandModelArray = data
diff --git a/src/views/factoryModel/customer/index.vue b/src/views/factoryModel/customer/index.vue
index dfd20f1..95d3fd6 100644
--- a/src/views/factoryModel/customer/index.vue
+++ b/src/views/factoryModel/customer/index.vue
@@ -21,12 +21,19 @@
 		</SearchTemplate>
     <ContentContainer>
 			<el-table v-if="tableHeight" :height="tableHeight" :data="tableData" v-loading="loading" size="mini" style="width: 100%" border>
-				<el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" :show-overflow-tooltip="true" width="180px">
+				<el-table-column 
+					v-for="(item, index) in headers" 
+					:key="index" 
+					:label="getColumnName(item)" 
+					:show-overflow-tooltip="true" 
+					width="120px">
 					<template #default="scope">
 						<span v-if="item === 'Customer-PlantNr'">{{ getWorkshopName(scope.row['Customer-PlantNr']) }}</span>
 						 <el-switch v-else-if="item === 'Customer-EnableDemandLockToggle'" 
                     disabled v-model="scope.row[item]" active-color="#35B0A6" inactive-color="#FF3B31"/>
-               
+						<span v-else-if="item === 'Customer-Status'">{{
+              mappingText(getStatusArray, scope.row["Customer-Status"], 'Stdef-StdefTyp', 'Stdef-Bez')
+            }}</span>
 						<span v-else>{{ scope.row[item] }}</span>
 					</template>
 				</el-table-column>
@@ -42,7 +49,12 @@
 			<!-- 分页 -->
 			<Pagination v-show="pagination.total>0" v-model:pagination="pagination" @change="getList" />
 		</ContentContainer>
-		<AddOrEdit v-if="isShowDialog === 'edit' || isShowDialog === 'add'" :item="item" v-model:isShowDialog="isShowDialog" @editCallBack="completeCallBack" />
+		<AddOrEdit 
+			v-if="isShowDialog === 'edit' || isShowDialog === 'add'" 
+			:item="item"
+			:getStatusArray="getStatusArray"
+			v-model:isShowDialog="isShowDialog" 
+			@editCallBack="completeCallBack" />
 		<AssociateUser v-if="isShowDialog === 'user'" :item="item" v-model:isShowDialog="isShowDialog" @editCallBack="completeCallBack" />
 		<AssociatePart v-if="isShowDialog === 'part'" :item="item" v-model:isShowDialog="isShowDialog" @editCallBack="completeCallBack" />
   </div>
@@ -67,34 +79,40 @@ export default {
         "Customer-PlantNr",
 				"Customer-CustomerId",
 				"Customer-Name1",
-				"Customer-Name2",
+				// "Customer-Name2",
 				"Customer-ValidStartDate",
-				"Customer-Country",
+				// "Customer-Country",
 				"Customer-Province",
 				"Customer-City",
 				"Customer-District",
-				"Customer-Street",
-				"Customer-Location",
-				"Customer-PostCode",
-				"Customer-Phone",
-				"Customer-Mobile",
-				"Customer-Fax",
-				"Customer-Email1",
-				"Customer-Email2",
-				"Customer-ContactPerson",
-				"Customer-PersonTitle",
-				"Customer-ContactAddress",
-				"Customer-Account",
-				"Customer-TaxRate",
+				// "Customer-Street",
+				// "Customer-Location",
+				// "Customer-PostCode",
+				// "Customer-Phone",
+				// "Customer-Mobile",
+				// "Customer-Fax",
+				// "Customer-Email1",
+				// "Customer-Email2",
+				// "Customer-ContactPerson",
+				// "Customer-PersonTitle",
+				// "Customer-ContactAddress",
+				// "Customer-Account",
+				// "Customer-TaxRate",
 				"Customer-Status",
 				"Customer-LastModify",
 				"Customer-LastUser",
 				"Customer-CreateTime",
 				"Customer-LockWeeks"
 			],
-			tableHeight:0
+			tableHeight:0,
+			getStatusArray: [],
 		};
   },
+	created() {
+		this.getStanderOne({ statid: 'wm_clientstatus' }).then((res) => {
+      this.getStatusArray = res.data
+    })
+	},
 	methods: {
 		// 搜索按钮操作
 		handleQuery() {