修改bug

src/server/productionPlanning/customerForecastDemandReview.js

@@ -64,4 +64,7 @@ export const getMpsMode = (id) => get(`/admin/ap/mpssetting/selectone/${id}`)
 
 export const deleteMpsMode = (id) => deleteData(`/admin/ap/mpssetting/deleteone/${id}`)
 
-export const updateMpsMode = (data) => put('/admin/ap/mpssetting/updateone',data)
+export const updateMpsMode = (data) => put('/admin/ap/mpssetting/updateone',data)
+
+
+export const getArtIdList = () => get("/admin/base/article/selectdata?ArtTypeId=FINISHED")

src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue

@@ -2,10 +2,9 @@
 <el-dialog
     title="物料库存资源配置"
     model-value
-    width="1800px"
-    max-height="1000px"
     :close-on-click-modal="false"
     :before-close="handleClose"
+    fullscreen
 >
     <el-form
     ref="formRef"
@@ -300,13 +299,22 @@
                     </el-form-item>
                     </el-col>
 
-                    <el-col :span="3">
+                    <el-col :span="4">
                         <el-form-item
                             :label="getColumnName('AP_ArticleSecondaryResource-BatchTimeFieldToggle')"
                             prop="AP_ArticleSecondaryResource-BatchTimeFieldToggle" >
                             <el-switch v-model="data['AP_ArticleSecondaryResource-BatchTimeFieldToggle']" active-color="#35B0A6" inactive-color="#FF3B31" />
+                            <template v-if="index > 0">
+                                    <el-button  
+                                    style="float:right;margin:10px"
+                                    size="mini"
+                                    type="text"
+                                    class="edit-button-style"
+                                    icon="el-icon-delete"
+                                    @click="deleteSecondaryResource(index)" >删除 </el-button>
+                                </template>
                         </el-form-item>
-                    </el-col>  
+                    </el-col>
 
                 </el-row>
         </template>
@@ -428,7 +436,17 @@
             :label="getColumnName('AP_ArticleAlternativeResource-BatchTimeFieldToggle')"
             prop="AP_ArticleAlternativeResource-BatchTimeFieldToggle" >
             <el-switch v-model="data['AP_ArticleAlternativeResource-BatchTimeFieldToggle']" active-color="#35B0A6" inactive-color="#FF3B31" />
+            <template v-if="index > 0">
+                                    <el-button  
+                                    style="float:right;margin:10px"
+                                    size="mini"
+                                    type="text"
+                                    class="edit-button-style"
+                                    icon="el-icon-delete"
+                                    @click="deleteAlternativeResource(index)" >删除 </el-button>
+                                </template>
         </el-form-item>
+
         </el-col>  
     </el-row>
         </template>
@@ -544,11 +562,17 @@ methods: {
     },
     addAlternativeResource(){
         this.formData["ArtStockResourceData-ArticleAlternativeResourceLi"].push({
-           "AP_ArticleAlternativeResource-RatePerHourToggle":true,
+            "AP_ArticleAlternativeResource-RatePerHourToggle":true,
             "AP_ArticleAlternativeResource-TimePerItemToggle":true,
             "AP_ArticleAlternativeResource-BatchTimeFieldToggle":true,
         })
     },
+    deleteSecondaryResource(index){
+        this.formData["ArtStockResourceData-ArticleSecondaryResourceLi"].splice(index,1)
+    },
+    deleteAlternativeResource(index){
+        this.formData["ArtStockResourceData-ArticleAlternativeResourceLi"].splice(index,1)
+    },
     // 资源列表
     getMainResourceList(){
         getMainResourceList().then(({data=[]})=>{

src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue

@@ -242,13 +242,7 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-:deep(.el-dialog__body){
- 
-    height: 600px;
-    z-index: 1;
-    overflow: hidden;
-    overflow-y: auto;
-}
+
   .table-height-wrap{
     height: 100%;
     overflow: hidden;

src/views/factoryModel/materialResourceMaintenance/mainResources/addOrEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="物料竹资源"
+    title="物料主资源"
     model-value
     width="1000px"
     :close-on-click-modal="false"