修改客户模型显示

deploy.sh

@@ -16,16 +16,16 @@ SSH_USER="administrator"
 SSH_PASSWORD="Leit2021@@"
 # 部署目录
 REMOTE_DIR="C:/frontendApp/mds/dist/"
-
+# 获得当前分支
 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 echo "\033[32m 当前分支为 ${CURRENT_BRANCH} \033[0m"
-
+# 切换分支到develop上，并拉取最新代码
 echo "\033[32m 切换分支到develop \033[0m"
 (git checkout develop) >/dev/null 2>&1
 echo "\033[32m 拉取develop最新数据 \033[0m"
 (git pull) >/dev/null 2>&1
 echo "\033[32m 拉取完成 \033[0m"
-
+# 开始本地打包并亚瑟
 echo "\033[32m 开始部署文件，现在进行打包 \033[0m"
 cd $PROJECT_DIR
 (yarn build:dev) >/dev/null 2>&1
@@ -33,20 +33,18 @@ echo "\033[32m 打包完成 \033[0m"
 echo "\033[32m 开始压缩文件 \033[0m"
 cd $DIST_DIT
 zip -q -r $ZIP_NAME ./
-
 echo "\033[32m 压缩完成，文件名  ${ZIP_NAME} \033[0m"
 echo "\033[32m 开始传输文件 \033[0m"
-
+# 远程传送文件
 (expect -c "
 spawn scp $ZIP_NAME "${SSH_USER}@${SSH_HOST}:${REMOTE_DIR}"
 expect \"password:\"
 send \"${SSH_PASSWORD}\r\"
 expect eof
 ") >/dev/null 2>&1
-
 echo "\033[32m 传送完成，传送到服务器目录：${REMOTE_DIR}${ZIP_NAME} \033[0m"
+# 远程解压及部署
 echo "\033[32m 开始部署 \033[0m"
-
 (expect -c "
 spawn ssh -t "${SSH_USER}@${SSH_HOST}"
 set timeout 3
@@ -63,8 +61,7 @@ send \"del ${ZIP_NAME}\r\"
 send \"exit\r\"
 expect eof
 ") >/dev/null 2>&1
-
 echo "\033[32m 部署完成 \033[0m"
-
+# 切回分支
 echo "\033[32m 切换回到${CURRENT_BRANCH} \033[0m"
 (git checkout $CURRENT_BRANCH) >/dev/null 2>&1

src/views/plan/basic/customerModel/index.vue

@@ -25,6 +25,11 @@
 					<template #default="scope">
 						<span v-if="item === 'AP_CustDemandModel-PlantNr'">{{ getWorkshopName(scope.row['AP_CustDemandModel-PlantNr']) }}</span>
 						<span v-else-if="item === 'AP_CustDemandModel-DemandStartDateMode'">{{ standardListText(scope.row["AP_CustDemandModel-DemandStartDateMode"]) }}</span>
+						<span v-else-if="item === 'AP_CustDemandModel-RelativeStartDeviationMode' || item === 'AP_CustDemandModel-AuotoCreateCycleMode'">{{ scope.row[item]=="Y"?"是":"否" }}</span>
+						<span v-else-if="item === 'AP_CustDemandModel-AutoCreateDay' || item === 'AP_CustDemandModel-WeekDemandDay' || item === 'AP_CustDemandModel-AutoReleaseDay'">{{ 
+							standardDayText(scope.row[item])
+						}}</span>
+						<span v-else-if="item === 'AP_CustDemandModel-RelativeStartDeviation'">{{ scope.row[item]}}周</span>
 						<span v-else>{{ scope.row[item] }}</span>
 					</template>
 				</el-table-column>
@@ -54,39 +59,49 @@ export default {
     AddOrEdit
   },
 	mixins: [ListMixin],
-  data() {
-    return {
+	data() {
+		return {
 			queryTableDataUrl: "/admin/ap/custdemandmodel/query",
 			// 默认字段
-      headers: [
-        "AP_CustDemandModel-PlantNr",
-				"AP_CustDemandModel-DemandModelId",
-				"AP_CustDemandModel-Descr",
-				"AP_CustDemandModel-DemandStartDateMode",
-				"AP_CustDemandModel-DemandWeeks",
-				"AP_CustDemandModel-WeekDemandDay",
-				"AP_CustDemandModel-RelativeStartDeviationMode",
-				"AP_CustDemandModel-RelativeStartDeviation",
-				"AP_CustDemandModel-AuotoCreateCycleMode",
-				"AP_CustDemandModel-AutoCreateDay",
-				"AP_CustDemandModel-AutoReleaseDay",
-			],
+			headers: [
+				"AP_CustDemandModel-PlantNr",
+					"AP_CustDemandModel-DemandModelId",
+					"AP_CustDemandModel-Descr",
+					"AP_CustDemandModel-DemandStartDateMode",
+					"AP_CustDemandModel-DemandWeeks",
+					"AP_CustDemandModel-WeekDemandDay",
+					"AP_CustDemandModel-RelativeStartDeviationMode",
+					"AP_CustDemandModel-RelativeStartDeviation",
+					"AP_CustDemandModel-AuotoCreateCycleMode",
+					"AP_CustDemandModel-AutoCreateDay",
+					"AP_CustDemandModel-AutoReleaseDay",
+				],
 			tableHeight:0,
 			demandStartDateArray: [],
+			autoCreateDayArray:[],
 		};
-  },
+	},
 	created() {
 		this.getStanderOne({ statid: 'DemandStartDateMode' }).then((res) => {
-      this.demandStartDateArray = res.data
-    })
+			this.demandStartDateArray = res.data
+		})
+		this.getStanderOne({ statid: 'AP_CustDemandModel-AutoCreateDay' }).then((res) => {
+			this.autoCreateDayArray = res.data
+		})
 	},
 	methods: {
 		standardListText(value) {
-      const item = this.demandStartDateArray.find(
-        (e) => e["Stdef-StdefTyp"] == value
-      );
-      return item?.["Stdef-Bez"] || value
-    },
+			const item = this.demandStartDateArray.find(
+				(e) => e["Stdef-StdefTyp"] == value
+			);
+			return item?.["Stdef-Bez"] || value
+		},
+		standardDayText(value) {
+			const item = this.autoCreateDayArray.find(
+				(e) => e["Stdef-StdefTyp"] == value
+			);
+			return item?.["Stdef-Bez"] || value
+		},
 		// 搜索按钮操作
 		handleQuery() {
 			this.pagination.pageNumber = 1