Merge pull request '优化' (#62) from wangxy into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/62
Reviewed-by: xuxiaoming <xiaoming.xu@le-it.com.cn>

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

@@ -23,6 +23,11 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
+					<el-form-item :label="getColumnName('AP_CustDemandModel-DemandWeeks')">
+						<el-input-number v-model="form['AP_CustDemandModel-DemandWeeks']" placeholder="请输入" />
+					</el-form-item>
+				</el-col>
+				<!-- <el-col :span="12">
 					<el-form-item :label="getColumnName('AP_CustDemandModel-DemandWeeks')">
 						<el-select v-model="form['AP_CustDemandModel-DemandWeeks']"   placeholder="请选择" style="width:100%;">
 							<el-option v-for="item in demandWeeksArray"
@@ -31,7 +36,7 @@
 												:value="item['Stdef-StdefTyp']" />
 						</el-select>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 				<el-col :span="12">
 					<el-form-item :label="getColumnName('AP_CustDemandModel-WeekDemandDay')">
 						<el-input-number v-model="form['AP_CustDemandModel-WeekDemandDay']" placeholder="请输入" />

src/views/plan/workbench/homePage/beta/predict/index.vue

@@ -20,7 +20,7 @@
 				<el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" width="170" :show-overflow-tooltip="true">
 					<template #default="scope">
 						<span v-if="item === 'AP_CustDemandVerHead-PlantNr'">{{ getWorkshopName(scope.row['AP_CustDemandVerHead-PlantNr']) }}</span>
-						<span v-if="item === 'AP_CustDemandVerHead-Status'">{{ scope.row['AP_CustDemandVerHead-Status'] == '1' ? '已发布':'未发布' }}</span>
+						<span v-else-if="item === 'AP_CustDemandVerHead-Status'">{{ scope.row['AP_CustDemandVerHead-Status'] == '1' ? '已发布':'未发布' }}</span>
 						<span v-else>{{ scope.row[item] }}</span>
 					</template>
 				</el-table-column>

src/views/plan/workbench/homePage/beta/predict/predictEdit.vue

@@ -58,7 +58,9 @@
 							<el-form-item class="fr" style="margin: 10px 0 0;">
 								<el-button v-if="item.title === '修改'" @click="handleUpload" class="search-button-style">I 导入</el-button>
 								<el-button class="search-button-style" @click="submitForm">S 保存</el-button>
-								<el-button v-if="item.title === '修改'" @click="releaseHandle" class="search-button-style">P 发布</el-button>
+								<el-button v-if="item.title === '修改'" @click="releaseHandle(1)" class="search-button-style">P 发布</el-button>
+								<el-button v-if="item.title === '修改'" @click="releaseHandle(2)" class="search-button-style">全局发布</el-button>
+								<el-button v-if="item.title === '修改'" @click="releaseHandle(3)" class="search-button-style">取消发布</el-button>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -237,7 +239,19 @@ export default {
         .catch(() => { });
     },
 		// 发布
-		releaseHandle() {
+		releaseHandle(type) {
+			let url
+			let releaseStatus = "1"
+			if (type === 1) { // 发布
+				url = `/admin/ap/custdemandverhead/issueversion`
+				releaseStatus = "1"
+			} else if (type === 2) { // 全局发布
+				url = `/admin/ap/custdemandverhead/issueglobalversion`
+				releaseStatus = undefined
+			} else { // 取消发布
+				url = `/admin/ap/custdemandverhead/removeissueversion`
+				releaseStatus = undefined
+			}
 			this.$confirm('是否确认发布"' + this.item.CustomerId + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -247,12 +261,12 @@ export default {
 					let params = {
 						"AP_CustDemandVerHead-CustomerId": this.item.CustomerId,
 						"AP_CustDemandVerHead-VersionId": this.item.VersionId,
-						"AP_CustDemandVerHead-Status": "1"
+						"AP_CustDemandVerHead-Status": releaseStatus
 					}
-          return put(`/admin/ap/custdemandverhead/issueversion`,params);
+          return put(url, params)
         })
         .then(() => {
-          this.msgSuccess("发布成功");
+          this.msgSuccess("操作成功");
         })
         .catch(() => { });
 		},