Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy

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

@@ -29,14 +29,14 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleStockLevel-MinCoverPeriod')"
               prop="AP_ArticleStockLevel-MinCoverPeriod">
-            <el-input v-model="formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MinCoverPeriod']"
+            <el-input-number v-model="articleStockLevel['AP_ArticleStockLevel-MinCoverPeriod']"
                 placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleStockLevel-MinCoverPeriodType')"
               prop="AP_ArticleStockLevel-MinCoverPeriodType">
-            <el-select v-model="formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MinCoverPeriodType']"
+            <el-select v-model="articleStockLevel['AP_ArticleStockLevel-MinCoverPeriodType']"
                 placeholder="请选择">
               <el-option v-for="item in minCoverPeriodTypeArray"
                   :key="item['Stdef-StdefTyp']"
@@ -48,14 +48,14 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleStockLevel-MaxCoverPeriod')"
               prop="AP_ArticleStockLevel-MaxCoverPeriod">
-            <el-input v-model="formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MaxCoverPeriod']"
+            <el-input-number v-model="articleStockLevel['AP_ArticleStockLevel-MaxCoverPeriod']"
                 placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleStockLevel-MaxCoverPeriodType')"
               prop="AP_ArticleStockLevel-MaxCoverPeriodType">
-            <el-select v-model="formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MaxCoverPeriodType']"
+            <el-select v-model="articleStockLevel['AP_ArticleStockLevel-MaxCoverPeriodType']"
                 placeholder="请选择">
               <el-option v-for="item in maxCoverPeriodTypeArray"
                   :key="item['Stdef-StdefTyp']"
@@ -72,7 +72,7 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleResource-ResourceId')"
               prop="AP_ArticleResource-ResourceId">
-            <el-select v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-ResourceId']"
+            <el-select v-model="articleResource['AP_ArticleResource-ResourceId']"
                 placeholder="请选择">
               <el-option v-for="item in mainResourceList"
                   :key="item['AP_Resource-ResourceId']"
@@ -84,7 +84,7 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleResource-QuantityPerHour')"
               prop="AP_ArticleResource-QuantityPerHour">
-            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-QuantityPerHour']"
+            <el-input-number v-model="articleResource['AP_ArticleResource-QuantityPerHour']"
                 placeholder="请输入" />
           </el-form-item>
         </el-col>
@@ -94,7 +94,7 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleResource-OpTimePerItem')"
               prop="AP_ArticleResource-OpTimePerItem">
-            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-OpTimePerItem']"
+            <el-input-number v-model="articleResource['AP_ArticleResource-OpTimePerItem']"
                 placeholder="请输入" />
           </el-form-item>
         </el-col>
@@ -105,7 +105,7 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleResource-BatchTime')"
               prop="AP_ArticleResource-BatchTime">
-            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchTime']"
+            <el-input-number v-model="articleResource['AP_ArticleResource-BatchTime']"
                 placeholder="请输入" />
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleResource-BatchQuantity')"
               prop="AP_ArticleResource-BatchQuantity">
-            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchQuantity']"
+            <el-input-number v-model="articleResource['AP_ArticleResource-BatchQuantity']"
                 placeholder="请输入" />
           </el-form-item>
         </el-col>
@@ -122,7 +122,7 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('AP_ArticleResource-TimeUom')"
               prop="AP_ArticleResource-TimeUom">
-            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-TimeUom']"
+            <el-input v-model="articleResource['AP_ArticleResource-TimeUom']"
                 placeholder="请输入" />
           </el-form-item>
         </el-col>
@@ -130,7 +130,7 @@
         <el-col :span="3">
           <el-form-item :label="getColumnName('AP_ArticleResource-BatchTimeFieldToggle')"
               prop="AP_ArticleResource-BatchTimeFieldToggle">
-            <el-switch v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchTimeFieldToggle']"
+            <el-switch v-model="articleResource['AP_ArticleResource-BatchTimeFieldToggle']"
                 active-color="#35B0A6"
                 inactive-color="#FF3B31" />
           </el-form-item>
@@ -138,7 +138,7 @@
         <el-col :span="3">
           <el-form-item :label="getColumnName('AP_ArticleResource-RatePerHourToggle')"
               prop="AP_ArticleResource-RatePerHourToggle">
-            <el-switch v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-RatePerHourToggle']"
+            <el-switch v-model="articleResource['AP_ArticleResource-RatePerHourToggle']"
                 active-color="#35B0A6"
                 inactive-color="#FF3B31" />
           </el-form-item>
@@ -146,7 +146,7 @@
         <el-col :span="3">
           <el-form-item :label="getColumnName('AP_ArticleResource-TimePerItemToggle')"
               prop="AP_ArticleResource-TimePerItemToggle">
-            <el-switch v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-TimePerItemToggle']"
+            <el-switch v-model="articleResource['AP_ArticleResource-TimePerItemToggle']"
                 active-color="#35B0A6"
                 inactive-color="#FF3B31" />
           </el-form-item>
@@ -163,8 +163,8 @@
             icon="el-icon-plus"
             @click="addSecondaryResource()">新增 </el-button>
       </div>
-      <dir>
-        <template v-for="(data,index) in formData['ArtStockResourceData-ArticleSecondaryResourceLi']"
+      <div>
+        <template v-for="(data,index) in articleSecondaryResourceList"
             :key="'ArticleSecondaryResourceLi_' +index">
           <el-row class="item_style">
             <el-col :span="6">
@@ -182,21 +182,21 @@
             <el-col :span="6">
               <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-QuantityPerHour')"
                   prop="AP_ArticleSecondaryResource-QuantityPerHour">
-                <el-input v-model="data['AP_ArticleSecondaryResource-QuantityPerHour']"
+                <el-input-number v-model="data['AP_ArticleSecondaryResource-QuantityPerHour']"
                     placeholder="请输入" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-OpTimePerItem')"
                   prop="AP_ArticleSecondaryResource-OpTimePerItem">
-                <el-input v-model="data['AP_ArticleSecondaryResource-OpTimePerItem']"
+                <el-input-number v-model="data['AP_ArticleSecondaryResource-OpTimePerItem']"
                     placeholder="请输入" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-BatchTime')"
                   prop="AP_ArticleSecondaryResource-BatchTime">
-                <el-input v-model="data['AP_ArticleSecondaryResource-BatchTime']"
+                <el-input-number v-model="data['AP_ArticleSecondaryResource-BatchTime']"
                     placeholder="请输入" />
               </el-form-item>
             </el-col>
@@ -204,7 +204,7 @@
             <el-col :span="6">
               <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-BatchQuantity')"
                   prop="AP_ArticleSecondaryResource-BatchQuantity">
-                <el-input v-model="data['AP_ArticleSecondaryResource-BatchQuantity']"
+                <el-input-number v-model="data['AP_ArticleSecondaryResource-BatchQuantity']"
                     placeholder="请输入" />
               </el-form-item>
             </el-col>
@@ -255,7 +255,7 @@
           </el-row>
         </template>
 
-      </dir>
+      </div>
 
 
 
@@ -269,8 +269,8 @@
             icon="el-icon-plus"
             @click="addAlternativeResource()">新增 </el-button>
       </div>
-      <dir>
-        <template v-for="(data,index) in formData['ArtStockResourceData-ArticleAlternativeResourceLi']"
+      <div>
+        <template v-for="(data,index) in articleAlternativeResourceList"
             :key="'ArticleAlternativeResourceLi_' +index">
           <el-row class="item_style">
             <el-col :span="6">
@@ -288,7 +288,7 @@
             <el-col :span="6">
               <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-QuantityPerHour')"
                   prop="AP_ArticleAlternativeResource-QuantityPerHour">
-                <el-input v-model="data['AP_ArticleAlternativeResource-QuantityPerHour']"
+                <el-input-number v-model="data['AP_ArticleAlternativeResource-QuantityPerHour']"
                     placeholder="请输入" />
               </el-form-item>
             </el-col>
@@ -298,7 +298,7 @@
             <el-col :span="6">
               <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-OpTimePerItem')"
                   prop="AP_ArticleAlternativeResource-OpTimePerItem">
-                <el-input v-model="data['AP_ArticleAlternativeResource-OpTimePerItem']"
+                <el-input-number v-model="data['AP_ArticleAlternativeResource-OpTimePerItem']"
                     placeholder="请输入" />
               </el-form-item>
             </el-col>
@@ -308,7 +308,7 @@
             <el-col :span="6">
               <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-BatchTime')"
                   prop="AP_ArticleAlternativeResource-BatchTime">
-                <el-input v-model="data['AP_ArticleAlternativeResource-BatchTime']"
+                <el-input-number v-model="data['AP_ArticleAlternativeResource-BatchTime']"
                     placeholder="请输入" />
               </el-form-item>
             </el-col>
@@ -316,7 +316,7 @@
             <el-col :span="6">
               <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-BatchQuantity')"
                   prop="AP_ArticleAlternativeResource-BatchQuantity">
-                <el-input v-model="data['AP_ArticleAlternativeResource-BatchQuantity']"
+                <el-input-number v-model="data['AP_ArticleAlternativeResource-BatchQuantity']"
                     placeholder="请输入" />
               </el-form-item>
             </el-col>
@@ -368,7 +368,7 @@
           </el-row>
         </template>
 
-      </dir>
+      </div>
 
 
 
@@ -424,37 +424,11 @@
         maxCoverPeriodTypeArray: [],
         artList: [],
         loading: false,
-        formData: {
-          "ArtStockResourceData-ArtId": "",
-          "ArtStockResourceData-ArticleStockLevel": {
-            'AP_ArticleStockLevel-MinCoverPeriod': "",
-            'AP_ArticleStockLevel-MinCoverPeriodType': "",
-            'AP_ArticleStockLevel-MaxCoverPeriod': "",
-            'AP_ArticleStockLevel-MaxCoverPeriodType': "",
-          },
-          "ArtStockResourceData-ArticleResource": {
-            "AP_ArticleResource-ResourceId": "",
-            'AP_ArticleResource-QuantityPerHour': "",
-            'AP_ArticleResource-OpTimePerItem': "",
-            'AP_ArticleResource-BatchTime': "",
-            'AP_ArticleResource-BatchQuantity': "",
-            'AP_ArticleResource-TimeUom': "",
-            "AP_ArticleResource-RatePerHourToggle": true,
-            "AP_ArticleResource-TimePerItemToggle": true,
-            "AP_ArticleResource-BatchTimeFieldToggle": true
-          },
-          "ArtStockResourceData-ArticleSecondaryResourceLi": [{
-            "AP_ArticleSecondaryResource-RatePerHourToggle": true,
-            "AP_ArticleSecondaryResource-TimePerItemToggle": true,
-            "AP_ArticleSecondaryResource-BatchTimeFieldToggle": true,
-          }],
-          "ArtStockResourceData-ArticleAlternativeResourceLi": [{
-            "AP_ArticleAlternativeResource-RatePerHourToggle": true,
-            "AP_ArticleAlternativeResource-TimePerItemToggle": true,
-            "AP_ArticleAlternativeResource-BatchTimeFieldToggle": true,
-          }]
-
-        }, // 参数
+        articleStockLevel: {},
+        articleResource: {},
+        articleSecondaryResourceList: [],
+        articleAlternativeResourceList: [],
+        formData: {},
         // 菜单树选项
         treeMenu: [], // 菜单tree
         defaultProps: {
@@ -479,24 +453,24 @@
     },
     methods: {
       addSecondaryResource() {
-        this.formData["ArtStockResourceData-ArticleSecondaryResourceLi"].push({
+        this.articleSecondaryResourceList.push({
           "AP_ArticleSecondaryResource-RatePerHourToggle": true,
           "AP_ArticleSecondaryResource-TimePerItemToggle": true,
           "AP_ArticleSecondaryResource-BatchTimeFieldToggle": true,
         })
       },
       addAlternativeResource() {
-        this.formData["ArtStockResourceData-ArticleAlternativeResourceLi"].push({
+        this.articleAlternativeResourceList.push({
           "AP_ArticleAlternativeResource-RatePerHourToggle": true,
           "AP_ArticleAlternativeResource-TimePerItemToggle": true,
           "AP_ArticleAlternativeResource-BatchTimeFieldToggle": true,
         })
       },
       deleteSecondaryResource(index) {
-        this.formData["ArtStockResourceData-ArticleSecondaryResourceLi"].splice(index, 1)
+        this.articleSecondaryResourceList.splice(index, 1)
       },
       deleteAlternativeResource(index) {
-        this.formData["ArtStockResourceData-ArticleAlternativeResourceLi"].splice(index, 1)
+        this.articleAlternativeResourceList.splice(index, 1)
       },
       // 资源列表
       getMainResourceList() {
@@ -517,12 +491,14 @@
           this.artList = res.data || []
         })
       },
-
       // 确认
       submitForm() {
         this.$refs["formRef"].validate((valid) => {
-          console.log('%caddOrEdit.vue line:577 this.isAddOrEdit', 'color: #007acc;', this.isAddOrEdit);
           if (valid) {
+            this.formData["ArtStockResourceData-ArticleStockLevel"] = this.articleStockLevel
+            this.formData["ArtStockResourceData-ArticleResource"] = this.articleResource
+            this.formData["ArtStockResourceData-ArticleSecondaryResourceLi"] = this.articleSecondaryResourceList
+            this.formData["ArtStockResourceData-ArticleAlternativeResourceLi"] = this.articleAlternativeResourceList
             this.loading = true;
             if (this.isAddOrEdit == "add") {
               this.add();
@@ -536,34 +512,9 @@
           }
         });
       },
-      dealFormData() {
-        console.log('%caddOrEdit.vue line:461 this.formData', 'color: #007acc;', this.formData);
-
-        // MaxCoverPeriod
-        this.formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MinCoverPeriod'] = parseFloat(this.formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MinCoverPeriod']);
-        this.formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MaxCoverPeriod'] = parseFloat(this.formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MaxCoverPeriod']);
-
-        this.formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-QuantityPerHour'] = parseFloat(this.formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-QuantityPerHour']);
-        this.formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-OpTimePerItem'] = parseFloat(this.formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-OpTimePerItem']);
-        this.formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchTime'] = parseFloat(this.formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchTime']);
-        this.formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchQuantity'] = parseFloat(this.formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchQuantity']);
-
-        this.formData['ArtStockResourceData-ArticleSecondaryResourceLi'].forEach(data => {
-          data['AP_ArticleSecondaryResource-QuantityPerHour'] = parseFloat(data['AP_ArticleSecondaryResource-QuantityPerHour']);
-          data['AP_ArticleSecondaryResource-OpTimePerItem'] = parseFloat(data['AP_ArticleSecondaryResource-OpTimePerItem']);
-          data['AP_ArticleSecondaryResource-BatchTime'] = parseFloat(data['AP_ArticleSecondaryResource-BatchTime']);
-          data['AP_ArticleSecondaryResource-BatchQuantity'] = parseFloat(data['AP_ArticleSecondaryResource-BatchQuantity']);
-        })
-        this.formData['ArtStockResourceData-ArticleAlternativeResourceLi'].forEach(data => {
-          data['AP_ArticleAlternativeResource-QuantityPerHour'] = parseFloat(data['AP_ArticleAlternativeResource-QuantityPerHour']);
-          data['AP_ArticleAlternativeResource-OpTimePerItem'] = parseFloat(data['AP_ArticleAlternativeResource-OpTimePerItem']);
-          data['AP_ArticleAlternativeResource-BatchTime'] = parseFloat(data['AP_ArticleAlternativeResource-BatchTime']);
-          data['AP_ArticleAlternativeResource-BatchQuantity'] = parseFloat(data['AP_ArticleAlternativeResource-BatchQuantity']);
-        })
-      },
+
       // 新增
       add() {
-        this.dealFormData()
         add(this.formData)
           .then(({ code }) => {
             this.loading = false;
@@ -578,7 +529,6 @@
       },
       // 修改
       edit() {
-        this.dealFormData()
         edit({
             ...this.formData,
           }).then(({ code }) => {
@@ -607,6 +557,10 @@
         ).then(({ code, data }) => {
           if ((code == 200 && data)) {
             this.formData = data;
+            this.articleStockLevel = data["ArtStockResourceData-ArticleStockLevel"]
+            this.articleResource = data["ArtStockResourceData-ArticleResource"]
+            this.articleSecondaryResourceList = data["ArtStockResourceData-ArticleSecondaryResourceLi"]
+            this.articleAlternativeResourceList = data["ArtStockResourceData-ArticleAlternativeResourceLi"]
           }
         });
       },

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

@@ -166,7 +166,8 @@ export default {
       planList:[],// 工厂列表
       articleList:[], // 物料列表
       minCoverPeriodTypeArray:[],
-      maxCoverPeriodTypeArray:[]
+      maxCoverPeriodTypeArray:[],
+      completeStatusList:[]
 
     };
   },