Merge pull request '物料主数据维护' (#63) from wangxy into develop

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

src/views/factoryModel/part/material/index.vue

@@ -176,17 +176,17 @@ export default {
         "Article-ProjectId",
         "Article-ArtTypeId",
         "Article-ArtSpec2",
-        "Article-ArtSpec3",
-        "Article-ArtTypeId",
+        // "Article-ArtSpec3",
+        // "Article-ArtTypeId",
         "Article-CustArtId",
-        "Article-AlternativeArtId",
+        // "Article-AlternativeArtId",
         "Article-UomId",
-        "Article-QuantityPerHour",
+        // "Article-QuantityPerHour",
         "Article-DeliveryBuffer",
         "Article-MidBatchQuantity",
-        "Article-LastModify",
-        "Article-LastUser",
-        "Article-CreateTime",
+        // "Article-LastModify",
+        // "Article-LastUser",
+        // "Article-CreateTime",
       ],
       isAddOrEdit: false,
       artSpecList: [], // 物料类型

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

@@ -21,6 +21,8 @@
 					<template #default="scope">
 						<span v-if="item === 'AP_CustDemandVerHead-PlantNr'">{{ getWorkshopName(scope.row['AP_CustDemandVerHead-PlantNr']) }}</span>
 						<span v-else-if="item === 'AP_CustDemandVerHead-Status'">{{ scope.row['AP_CustDemandVerHead-Status'] == '1' ? '已发布':'未发布' }}</span>
+						<span v-else-if="item === 'AP_CustDemandVerHead-Valid'">{{ scope.row['AP_CustDemandVerHead-Valid'] == true ? '当前使用':'' }}</span>
+						<!-- AP_CustDemandVerHead-Valid -->
 						<span v-else>{{ scope.row[item] }}</span>
 					</template>
 				</el-table-column>
@@ -53,6 +55,7 @@ export default {
 				"AP_CustDemandVerHead-CustomerId",
 				"AP_CustDemandVerHead-VersionId",
 				"AP_CustDemandVerHead-Descr",
+				"AP_CustDemandVerHead-Valid",
 				"AP_CustDemandVerHead-Status",
 				"AP_CustDemandVerHead-PlanReleaseTime",
 				"AP_CustDemandVerHead-ActualReleaseTime",

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

@@ -59,8 +59,8 @@
 								<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(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-button v-if="item.title === '修改' && formData['AP_CustDemandVerHead-Status'] === '1'" @click="releaseHandle(2)" class="search-button-style">全局发布</el-button>
+								<el-button v-if="item.title === '修改' && formData['AP_CustDemandVerHead-Status'] === '1'" @click="releaseHandle(3)" class="search-button-style">取消发布</el-button>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -74,11 +74,20 @@
 								border>
 								<el-table-column label="零件" width="180">
 									<template #default="scope">
-										<el-input v-model="scope.row['ArtId']" clearable placeholder="请输入" />
+										<el-input
+											v-model="scope.row['ArtId']"
+											:disabled="title === '修改' && formData['AP_CustDemandVerHead-Status'] === '1'"
+											clearable
+											placeholder="请输入" />
 									</template>
 								</el-table-column>
 								<el-table-column v-for="(item, index) in headers" :key="index" :label="item" width="130">
-									<template v-slot="{ row }"><el-input v-model="row.Item[item]" clearable /></template>
+									<template v-slot="{ row }">
+										<el-input
+											v-model="row.Item[item]"
+											:disabled="title === '修改' && formData['AP_CustDemandVerHead-Status'] === '1'"
+											clearable />
+									</template>
 								</el-table-column>
 							</el-table>
 						</el-col>