diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
index 4e65769..aba7a0a 100644
--- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
+++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
@@ -1,630 +1,545 @@
 <template>
-<el-dialog
-    title="物料库存资源配置"
-    model-value
-    :close-on-click-modal="false"
-    :before-close="handleClose"
-    fullscreen
->
-    <el-form
-    ref="formRef"
-    v-loading="loading"
-    :model="formData"
-    :rules="rules"
-    label-width="170px"
-    >
-    <el-row>
+  <el-dialog title="物料库存资源配置"
+      model-value
+      :close-on-click-modal="false"
+      :before-close="handleClose"
+      fullscreen>
+    <el-form ref="formRef"
+        v-loading="loading"
+        :model="formData"
+        :rules="rules"
+        label-width="170px">
+      <el-row>
         <el-col :span="6">
-        <el-form-item
-            :label="getColumnName('ArtStockResourceData-ArtId')"
-            prop="ArtStockResourceData-ArtId"
-        >
-        <el-select
-            v-model="formData['ArtStockResourceData-ArtId']"
-            placeholder="请选择"
-            :disabled="isAddOrEdit == 'edit'"
-            >
-            <el-option
-                v-for="item in artList" 
-                :key="item['Article-ArtId']"
-                :label="item['Article-ArtId']+'-'+item['Article-Descr1']"
-                :value="item['Article-ArtId']"
-            />
+          <el-form-item :label="getColumnName('ArtStockResourceData-ArtId')"
+              prop="ArtStockResourceData-ArtId">
+            <el-select v-model="formData['ArtStockResourceData-ArtId']"
+                placeholder="请选择"
+                :disabled="isAddOrEdit == 'edit'">
+              <el-option v-for="item in artList"
+                  :key="item['Article-ArtId']"
+                  :label="item['Article-ArtId']+'-'+item['Article-Descr1']"
+                  :value="item['Article-ArtId']" />
             </el-select>
-        </el-form-item>
+          </el-form-item>
         </el-col>
-    </el-row>
-    <div class="sub_title">库存级别</div>
-    <el-row>
+      </el-row>
+      <div class="sub_title">库存级别</div>
+      <el-row>
         <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']"
-            placeholder="请输入"
-            />
-        </el-form-item>
+          <el-form-item :label="getColumnName('AP_ArticleStockLevel-MinCoverPeriod')"
+              prop="AP_ArticleStockLevel-MinCoverPeriod">
+            <el-input v-model="formData['ArtStockResourceData-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']"
-            placeholder="请选择"
-            >
-            <el-option
-                v-for="item in minCoverPeriodTypeArray" 
-                :key="item['Stdef-StdefTyp']"
-                :label="item['Stdef-Bez']"
-                :value="item['Stdef-StdefTyp']"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleStockLevel-MinCoverPeriodType')"
+              prop="AP_ArticleStockLevel-MinCoverPeriodType">
+            <el-select v-model="formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MinCoverPeriodType']"
+                placeholder="请选择">
+              <el-option v-for="item in minCoverPeriodTypeArray"
+                  :key="item['Stdef-StdefTyp']"
+                  :label="item['Stdef-Bez']"
+                  :value="item['Stdef-StdefTyp']" />
             </el-select>
-        </el-form-item>
+          </el-form-item>
         </el-col>
         <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']"
-            placeholder="请输入"
-            />
-        </el-form-item>
+          <el-form-item :label="getColumnName('AP_ArticleStockLevel-MaxCoverPeriod')"
+              prop="AP_ArticleStockLevel-MaxCoverPeriod">
+            <el-input v-model="formData['ArtStockResourceData-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']"
-            placeholder="请选择"
-            >
-            <el-option
-                v-for="item in maxCoverPeriodTypeArray" 
-                :key="item['Stdef-StdefTyp']"
-                :label="item['Stdef-Bez']"
-                :value="item['Stdef-StdefTyp']"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleStockLevel-MaxCoverPeriodType')"
+              prop="AP_ArticleStockLevel-MaxCoverPeriodType">
+            <el-select v-model="formData['ArtStockResourceData-ArticleStockLevel']['AP_ArticleStockLevel-MaxCoverPeriodType']"
+                placeholder="请选择">
+              <el-option v-for="item in maxCoverPeriodTypeArray"
+                  :key="item['Stdef-StdefTyp']"
+                  :label="item['Stdef-Bez']"
+                  :value="item['Stdef-StdefTyp']" />
             </el-select>
-        </el-form-item>
+          </el-form-item>
         </el-col>
 
 
-    </el-row>
-    <div class="sub_title">主要资源</div>
-    <el-row>
+      </el-row>
+      <div class="sub_title">主要资源</div>
+      <el-row>
         <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']"
-            placeholder="请选择"
-            >
-            <el-option
-                v-for="item in mainResourceList" 
-                :key="item['AP_Resource-ResourceId']"
-                :label="item['AP_Resource-Descr']"
-                :value="item['AP_Resource-ResourceId']"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleResource-ResourceId')"
+              prop="AP_ArticleResource-ResourceId">
+            <el-select v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-ResourceId']"
+                placeholder="请选择">
+              <el-option v-for="item in mainResourceList"
+                  :key="item['AP_Resource-ResourceId']"
+                  :label="item['AP_Resource-Descr']"
+                  :value="item['AP_Resource-ResourceId']" />
             </el-select>
-        </el-form-item>
+          </el-form-item>
         </el-col>
         <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']"
-            placeholder="请输入"
-            />
-        </el-form-item>
+          <el-form-item :label="getColumnName('AP_ArticleResource-QuantityPerHour')"
+              prop="AP_ArticleResource-QuantityPerHour">
+            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-QuantityPerHour']"
+                placeholder="请输入" />
+          </el-form-item>
         </el-col>
 
 
 
         <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']"
-            placeholder="请输入"
-            />
-        </el-form-item>
+          <el-form-item :label="getColumnName('AP_ArticleResource-OpTimePerItem')"
+              prop="AP_ArticleResource-OpTimePerItem">
+            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-OpTimePerItem']"
+                placeholder="请输入" />
+          </el-form-item>
         </el-col>
 
-       
+
 
 
         <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']"
-            placeholder="请输入"
-            />
-        </el-form-item>
+          <el-form-item :label="getColumnName('AP_ArticleResource-BatchTime')"
+              prop="AP_ArticleResource-BatchTime">
+            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchTime']"
+                placeholder="请输入" />
+          </el-form-item>
         </el-col>
 
         <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']"
-            placeholder="请输入"
-            />
-        </el-form-item>
+          <el-form-item :label="getColumnName('AP_ArticleResource-BatchQuantity')"
+              prop="AP_ArticleResource-BatchQuantity">
+            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchQuantity']"
+                placeholder="请输入" />
+          </el-form-item>
         </el-col>
 
 
         <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']"
-            placeholder="请输入"
-            />
-        </el-form-item>
-        </el-col>     
+          <el-form-item :label="getColumnName('AP_ArticleResource-TimeUom')"
+              prop="AP_ArticleResource-TimeUom">
+            <el-input v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-TimeUom']"
+                placeholder="请输入" />
+          </el-form-item>
+        </el-col>
 
         <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']" active-color="#35B0A6" inactive-color="#FF3B31" />
-        </el-form-item>
-        </el-col>  
-         <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']" active-color="#35B0A6" inactive-color="#FF3B31" />
-        </el-form-item>
+          <el-form-item :label="getColumnName('AP_ArticleResource-BatchTimeFieldToggle')"
+              prop="AP_ArticleResource-BatchTimeFieldToggle">
+            <el-switch v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-BatchTimeFieldToggle']"
+                active-color="#35B0A6"
+                inactive-color="#FF3B31" />
+          </el-form-item>
         </el-col>
         <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']" active-color="#35B0A6" inactive-color="#FF3B31" />
-        </el-form-item>
-        </el-col> 
-    </el-row>
-
-
-
-<div class="sub_title">次要资源  
-            <el-button style="float:right" size="mini" type="text" class="edit-button-style"
-            icon="el-icon-plus"  @click="addSecondaryResource()" >新增 </el-button></div>
-    <dir>
-        <template v-for="(data,index) in formData['ArtStockResourceData-ArticleSecondaryResourceLi']" :key="'ArticleSecondaryResourceLi_' +index">
-            <el-row class="item_style">
-                    <el-col :span="6">
-                    <el-form-item
-                        :label="getColumnName('AP_ArticleSecondaryResource-SecondaryResourceId')"
-                        prop="AP_ArticleSecondaryResource-SecondaryResourceId"
-                    >
-                        <el-select
-                        v-model="data['AP_ArticleSecondaryResource-SecondaryResourceId']"
-                        placeholder="请选择"
-                        >
-                        <el-option
-                            v-for="item in secondaryResourceList" 
-                            :key="item['AP_SecondaryResource-SecondaryResourceId']"
-                            :label="item['AP_SecondaryResource-Descr']"
-                            :value="item['AP_SecondaryResource-SecondaryResourceId']"
-                        />
-                        </el-select>
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                    <el-form-item
-                        :label="getColumnName('AP_ArticleSecondaryResource-QuantityPerHour')"
-                        prop="AP_ArticleSecondaryResource-QuantityPerHour"  >
-                        <el-input
-                        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']"
-                        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']"
-                        placeholder="请输入"
-                        />
-                    </el-form-item>
-                    </el-col>
-
-                    <el-col :span="6">
-                    <el-form-item
-                        :label="getColumnName('AP_ArticleSecondaryResource-BatchQuantity')"
-                        prop="AP_ArticleSecondaryResource-BatchQuantity" >
-                        <el-input
-                        v-model="data['AP_ArticleSecondaryResource-BatchQuantity']"
-                        placeholder="请输入"
-                        />
-                    </el-form-item>
-                    </el-col>
-
-
-                    <el-col :span="6">
-                    <el-form-item
-                        :label="getColumnName('AP_ArticleSecondaryResource-TimeUom')"
-                        prop="AP_ArticleSecondaryResource-TimeUom" >
-                        <el-input
-                        v-model="data['AP_ArticleSecondaryResource-TimeUom']"
-                        placeholder="请输入"
-                        />
-                    </el-form-item>
-                    </el-col>  
-
-                    <el-col :span="3">
-                    <el-form-item
-                        :label="getColumnName('AP_ArticleSecondaryResource-RatePerHourToggle')"
-                        prop="AP_ArticleSecondaryResource-RatePerHourToggle" >
-                        <el-switch v-model="data['AP_ArticleSecondaryResource-RatePerHourToggle']" active-color="#35B0A6" inactive-color="#FF3B31" />
-                    </el-form-item>
-                    </el-col>
-                    <el-col :span="3">
-                    <el-form-item
-                        :label="getColumnName('AP_ArticleSecondaryResource-TimePerItemToggle')"
-                        prop="AP_ArticleSecondaryResource-TimePerItemToggle" >
-                        <el-switch v-model="data['AP_ArticleSecondaryResource-TimePerItemToggle']" active-color="#35B0A6" inactive-color="#FF3B31" />
-                    </el-form-item>
-                    </el-col>
-
-                    <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" />
-                            
-                                    <el-button  
-                                    style="float:right;margin:10px"
-                                    size="mini"
-                                    type="text"
-                                    class="edit-button-style"
-                                    icon="el-icon-delete"
-                                    @click="deleteSecondaryResource(index)" >删除 </el-button>
-                          
-                        </el-form-item>
-                    </el-col>
-
-                </el-row>
-        </template>
-    
-</dir>
-
-
-
-
-
-<div class="sub_title">替代资源  
-            <el-button style="float:right" size="mini" type="text" class="edit-button-style"
-            icon="el-icon-plus"  @click="addAlternativeResource()" >新增 </el-button></div>
-    <dir>
-        <template v-for="(data,index) in formData['ArtStockResourceData-ArticleAlternativeResourceLi']" :key="'ArticleAlternativeResourceLi_' +index">
-            <el-row class="item_style">
-        <el-col :span="6">
-        <el-form-item
-            :label="getColumnName('AP_ArticleAlternativeResource-AlternativeResourceId')"
-            prop="AP_ArticleAlternativeResource-AlternativeResourceId"
-        >
-            <el-select
-            v-model="data['AP_ArticleAlternativeResource-AlternativeResourceId']"
-            placeholder="请选择"
-            >
-            <el-option
-                v-for="item in mainResourceList" 
-                :key="item['AP_Resource-ResourceId']"
-                :label="item['AP_Resource-Descr']"
-                :value="item['AP_Resource-ResourceId']"
-            />
-            </el-select>
-        </el-form-item>
-        </el-col>
-        <el-col :span="6">
-        <el-form-item
-            :label="getColumnName('AP_ArticleAlternativeResource-QuantityPerHour')"
-            prop="AP_ArticleAlternativeResource-QuantityPerHour"
-        >
-            <el-input
-            v-model="data['AP_ArticleAlternativeResource-QuantityPerHour']"
-            placeholder="请输入"
-            />
-        </el-form-item>
-        </el-col>
-
-       
-
-        <el-col :span="6">
-        <el-form-item
-            :label="getColumnName('AP_ArticleAlternativeResource-OpTimePerItem')"
-            prop="AP_ArticleAlternativeResource-OpTimePerItem"
-        >
-            <el-input
-            v-model="data['AP_ArticleAlternativeResource-OpTimePerItem']"
-            placeholder="请输入"
-            />
-        </el-form-item>
+          <el-form-item :label="getColumnName('AP_ArticleResource-RatePerHourToggle')"
+              prop="AP_ArticleResource-RatePerHourToggle">
+            <el-switch v-model="formData['ArtStockResourceData-ArticleResource']['AP_ArticleResource-RatePerHourToggle']"
+                active-color="#35B0A6"
+                inactive-color="#FF3B31" />
+          </el-form-item>
         </el-col>
-
-
-
-        <el-col :span="6">
-        <el-form-item
-            :label="getColumnName('AP_ArticleAlternativeResource-BatchTime')"
-            prop="AP_ArticleAlternativeResource-BatchTime"
-        >
-            <el-input
-            v-model="data['AP_ArticleAlternativeResource-BatchTime']"
-            placeholder="请输入"
-            />
-        </el-form-item>
+        <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']"
+                active-color="#35B0A6"
+                inactive-color="#FF3B31" />
+          </el-form-item>
         </el-col>
+      </el-row>
+
+
+
+      <div class="sub_title">次要资源
+        <el-button style="float:right"
+            size="mini"
+            type="text"
+            class="edit-button-style"
+            icon="el-icon-plus"
+            @click="addSecondaryResource()">新增 </el-button>
+      </div>
+      <dir>
+        <template v-for="(data,index) in formData['ArtStockResourceData-ArticleSecondaryResourceLi']"
+            :key="'ArticleSecondaryResourceLi_' +index">
+          <el-row class="item_style">
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-SecondaryResourceId')"
+                  prop="AP_ArticleSecondaryResource-SecondaryResourceId">
+                <el-select v-model="data['AP_ArticleSecondaryResource-SecondaryResourceId']"
+                    placeholder="请选择">
+                  <el-option v-for="item in secondaryResourceList"
+                      :key="item['AP_SecondaryResource-SecondaryResourceId']"
+                      :label="item['AP_SecondaryResource-Descr']"
+                      :value="item['AP_SecondaryResource-SecondaryResourceId']" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-QuantityPerHour')"
+                  prop="AP_ArticleSecondaryResource-QuantityPerHour">
+                <el-input 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']"
+                    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']"
+                    placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-BatchQuantity')"
+                  prop="AP_ArticleSecondaryResource-BatchQuantity">
+                <el-input v-model="data['AP_ArticleSecondaryResource-BatchQuantity']"
+                    placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-TimeUom')"
+                  prop="AP_ArticleSecondaryResource-TimeUom">
+                <el-input v-model="data['AP_ArticleSecondaryResource-TimeUom']"
+                    placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="3">
+              <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-RatePerHourToggle')"
+                  prop="AP_ArticleSecondaryResource-RatePerHourToggle">
+                <el-switch v-model="data['AP_ArticleSecondaryResource-RatePerHourToggle']"
+                    active-color="#35B0A6"
+                    inactive-color="#FF3B31" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-TimePerItemToggle')"
+                  prop="AP_ArticleSecondaryResource-TimePerItemToggle">
+                <el-switch v-model="data['AP_ArticleSecondaryResource-TimePerItemToggle']"
+                    active-color="#35B0A6"
+                    inactive-color="#FF3B31" />
+              </el-form-item>
+            </el-col>
+
+            <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" />
+
+                <el-button style="float:right;margin:10px"
+                    size="mini"
+                    type="text"
+                    class="edit-button-style"
+                    icon="el-icon-delete"
+                    @click="deleteSecondaryResource(index)">删除 </el-button>
+
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </template>
 
-        <el-col :span="6">
-        <el-form-item
-            :label="getColumnName('AP_ArticleAlternativeResource-BatchQuantity')"
-            prop="AP_ArticleAlternativeResource-BatchQuantity"
-        >
-            <el-input
-            v-model="data['AP_ArticleAlternativeResource-BatchQuantity']"
-            placeholder="请输入"
-            />
-        </el-form-item>
-        </el-col>
+      </dir>
+
+
+
+
+
+      <div class="sub_title">替代资源
+        <el-button style="float:right"
+            size="mini"
+            type="text"
+            class="edit-button-style"
+            icon="el-icon-plus"
+            @click="addAlternativeResource()">新增 </el-button>
+      </div>
+      <dir>
+        <template v-for="(data,index) in formData['ArtStockResourceData-ArticleAlternativeResourceLi']"
+            :key="'ArticleAlternativeResourceLi_' +index">
+          <el-row class="item_style">
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-AlternativeResourceId')"
+                  prop="AP_ArticleAlternativeResource-AlternativeResourceId">
+                <el-select v-model="data['AP_ArticleAlternativeResource-AlternativeResourceId']"
+                    placeholder="请选择">
+                  <el-option v-for="item in mainResourceList"
+                      :key="item['AP_Resource-ResourceId']"
+                      :label="item['AP_Resource-Descr']"
+                      :value="item['AP_Resource-ResourceId']" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-QuantityPerHour')"
+                  prop="AP_ArticleAlternativeResource-QuantityPerHour">
+                <el-input v-model="data['AP_ArticleAlternativeResource-QuantityPerHour']"
+                    placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+
+
+
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-OpTimePerItem')"
+                  prop="AP_ArticleAlternativeResource-OpTimePerItem">
+                <el-input v-model="data['AP_ArticleAlternativeResource-OpTimePerItem']"
+                    placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+
+
+
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-BatchTime')"
+                  prop="AP_ArticleAlternativeResource-BatchTime">
+                <el-input v-model="data['AP_ArticleAlternativeResource-BatchTime']"
+                    placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-BatchQuantity')"
+                  prop="AP_ArticleAlternativeResource-BatchQuantity">
+                <el-input v-model="data['AP_ArticleAlternativeResource-BatchQuantity']"
+                    placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="6">
+              <el-form-item :label="getColumnName('AP_ArticleResource-TimeUom')"
+                  prop="AP_ArticleSecondaryResource-TimeUom">
+                <el-input v-model="data['AP_ArticleAlternativeResource-TimeUom']"
+                    placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="3">
+              <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-RatePerHourToggle')"
+                  prop="AP_ArticleAlternativeResource-RatePerHourToggle">
+                <el-switch v-model="data['AP_ArticleAlternativeResource-RatePerHourToggle']"
+                    active-color="#35B0A6"
+                    inactive-color="#FF3B31" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-TimePerItemToggle')"
+                  prop="AP_ArticleAlternativeResource-TimePerItemToggle">
+                <el-switch v-model="data['AP_ArticleAlternativeResource-TimePerItemToggle']"
+                    active-color="#35B0A6"
+                    inactive-color="#FF3B31" />
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="3">
+              <el-form-item :label="getColumnName('AP_ArticleAlternativeResource-BatchTimeFieldToggle')"
+                  prop="AP_ArticleAlternativeResource-BatchTimeFieldToggle">
+                <el-switch v-model="data['AP_ArticleAlternativeResource-BatchTimeFieldToggle']"
+                    active-color="#35B0A6"
+                    inactive-color="#FF3B31" />
+
+                <el-button style="float:right;margin:10px"
+                    size="mini"
+                    type="text"
+                    class="edit-button-style"
+                    icon="el-icon-delete"
+                    @click="deleteAlternativeResource(index)">删除 </el-button>
+
+              </el-form-item>
+
+            </el-col>
+          </el-row>
+        </template>
 
+      </dir>
 
-        <el-col :span="6">
-        <el-form-item
-            :label="getColumnName('AP_ArticleResource-TimeUom')"
-            prop="AP_ArticleSecondaryResource-TimeUom"
-        >
-            <el-input
-            v-model="data['AP_ArticleAlternativeResource-TimeUom']"
-            placeholder="请输入"
-            />
-        </el-form-item>
-        </el-col>  
-
-         <el-col :span="3">
-        <el-form-item
-            :label="getColumnName('AP_ArticleAlternativeResource-RatePerHourToggle')"
-            prop="AP_ArticleAlternativeResource-RatePerHourToggle" >
-            <el-switch v-model="data['AP_ArticleAlternativeResource-RatePerHourToggle']" active-color="#35B0A6" inactive-color="#FF3B31" />
-        </el-form-item>
-        </el-col>
-        <el-col :span="3">
-        <el-form-item
-            :label="getColumnName('AP_ArticleAlternativeResource-TimePerItemToggle')"
-            prop="AP_ArticleAlternativeResource-TimePerItemToggle" >
-            <el-switch v-model="data['AP_ArticleAlternativeResource-TimePerItemToggle']" active-color="#35B0A6" inactive-color="#FF3B31" />
-        </el-form-item>
-        </el-col>
 
 
-        <el-col :span="3">
-        <el-form-item
-            :label="getColumnName('AP_ArticleAlternativeResource-BatchTimeFieldToggle')"
-            prop="AP_ArticleAlternativeResource-BatchTimeFieldToggle" >
-            <el-switch v-model="data['AP_ArticleAlternativeResource-BatchTimeFieldToggle']" active-color="#35B0A6" inactive-color="#FF3B31" />
-           
-                                    <el-button  
-                                    style="float:right;margin:10px"
-                                    size="mini"
-                                    type="text"
-                                    class="edit-button-style"
-                                    icon="el-icon-delete"
-                                    @click="deleteAlternativeResource(index)" >删除 </el-button>
-                               
-        </el-form-item>
-
-        </el-col>  
-    </el-row>
-        </template>
-    
-</dir>
-
- 
-    
 
     </el-form>
     <template #footer>
-    <span class="dialog-footer">
-        <el-button
-        type="primary"
-        class="dialog-submit-button"
-        @click="submitForm"
-        >确 定</el-button
-        >
-        <el-button class="dialog-cancel-button" @click="handleClose"
-        >取 消</el-button
-        >
-    </span>
+      <span class="dialog-footer">
+        <el-button type="primary"
+            class="dialog-submit-button"
+            @click="submitForm">确 定</el-button>
+        <el-button class="dialog-cancel-button"
+            @click="handleClose">取 消</el-button>
+      </span>
     </template>
-</el-dialog>
+  </el-dialog>
 </template>
 <script>
-import { getDetails, add, edit, getMainResourceList, getSecondaryResourceList,getArtIdList } from "@/server/factoryModel/materialResourceMaintenance/artStockResource";
-
-export default {
-props: {
-    item: {
-    default: {},
-    },
-    isAddOrEdit: {
+  import { getDetails, add, edit, getMainResourceList, getSecondaryResourceList, getArtIdList } from "@/server/factoryModel/materialResourceMaintenance/artStockResource";
+
+  export default {
+    emits: ["setIsAddOrEdit"],
+    props: {
+      item: {
+        default: {},
+      },
+      isAddOrEdit: {
         default: "add",
+      },
+      planList: {
+        default: [],
+      },
+      articleList: {
+        default: [],
+      },
+      resourceList: {
+        default: [],
+      }
+
     },
-    planList: {
-    default: [],
-    },
-    articleList: {
-    default: [],
-    },
-    resourceList: {
-    default: [],
-    }
-
-},
-data() {
-    return {
-    rules: {
-        "ArtStockResourceData-ArtId": [
-            {
-                required: true,
-                message: "此项不能为空",
-                trigger: "blur",
-            },
-        ],
-    },
-    mainResourceList:[],
-    secondaryResourceList:[],
-    minCoverPeriodTypeArray:[],
-    maxCoverPeriodTypeArray:[],
-    artList:[],
-    loading: false,
-    formData: {
-        "ArtStockResourceData-ArtId":"",
-        "ArtStockResourceData-ArticleStockLevel":{
-          'AP_ArticleStockLevel-MinCoverPeriod':"",
-          'AP_ArticleStockLevel-MinCoverPeriodType':"",
-          'AP_ArticleStockLevel-MaxCoverPeriod':"",
-          'AP_ArticleStockLevel-MaxCoverPeriodType':"",
+    data() {
+      return {
+        rules: {
+          "ArtStockResourceData-ArtId": [
+          {
+            required: true,
+            message: "此项不能为空",
+            trigger: "blur",
+          }, ],
         },
-        "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
+        mainResourceList: [],
+        secondaryResourceList: [],
+        minCoverPeriodTypeArray: [],
+        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,
+          }]
+
+        }, // 参数
+        // 菜单树选项
+        treeMenu: [], // 菜单tree
+        defaultProps: {
+          children: "Children",
+          label: "Menu-Title",
         },
-        "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,
-        }]
-     
-    }, // 参数
-    // 菜单树选项
-    treeMenu: [], // 菜单tree
-    defaultProps: {
-        children: "Children",
-        label: "Menu-Title",
+      };
     },
-    };
-},
-mounted() {
-    this.getStanderOne({ statid: 'AP_ArticleStockLevel-MinCoverPeriodType' }).then((res) => {
+    mounted() {
+      this.getStanderOne({ statid: 'AP_ArticleStockLevel-MinCoverPeriodType' }).then((res) => {
         this.minCoverPeriodTypeArray = res.data
-    })
-    this.getStanderOne({ statid: 'AP_ArticleStockLevel-MaxCoverPeriodType' }).then((res) => {
+      })
+      this.getStanderOne({ statid: 'AP_ArticleStockLevel-MaxCoverPeriodType' }).then((res) => {
         this.maxCoverPeriodTypeArray = res.data
-    })
-    this.getMainResourceList()
-    this.getSecondaryResourceList()
-    this.getArtList()
-    if (this.isAddOrEdit == "edit") {
+      })
+      this.getMainResourceList()
+      this.getSecondaryResourceList()
+      this.getArtList()
+      if (this.isAddOrEdit == "edit") {
         this.getDetails();
-    }
-},
-methods: {
-    addSecondaryResource(){
+      }
+    },
+    methods: {
+      addSecondaryResource() {
         this.formData["ArtStockResourceData-ArticleSecondaryResourceLi"].push({
-            "AP_ArticleSecondaryResource-RatePerHourToggle":true,
-            "AP_ArticleSecondaryResource-TimePerItemToggle":true,
-            "AP_ArticleSecondaryResource-BatchTimeFieldToggle":true,
+          "AP_ArticleSecondaryResource-RatePerHourToggle": true,
+          "AP_ArticleSecondaryResource-TimePerItemToggle": true,
+          "AP_ArticleSecondaryResource-BatchTimeFieldToggle": true,
         })
-    },
-    addAlternativeResource(){
+      },
+      addAlternativeResource() {
         this.formData["ArtStockResourceData-ArticleAlternativeResourceLi"].push({
-            "AP_ArticleAlternativeResource-RatePerHourToggle":true,
-            "AP_ArticleAlternativeResource-TimePerItemToggle":true,
-            "AP_ArticleAlternativeResource-BatchTimeFieldToggle":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=[]})=>{
-            this.mainResourceList=data;
+      },
+      deleteSecondaryResource(index) {
+        this.formData["ArtStockResourceData-ArticleSecondaryResourceLi"].splice(index, 1)
+      },
+      deleteAlternativeResource(index) {
+        this.formData["ArtStockResourceData-ArticleAlternativeResourceLi"].splice(index, 1)
+      },
+      // 资源列表
+      getMainResourceList() {
+        getMainResourceList().then(({ data = [] }) => {
+          this.mainResourceList = data;
         })
-    },
-     // 资源列表
-    getSecondaryResourceList(){
-        getSecondaryResourceList().then(({data=[]})=>{
-            this.secondaryResourceList=data;
+      },
+      // 资源列表
+      getSecondaryResourceList() {
+        getSecondaryResourceList().then(({ data = [] }) => {
+          this.secondaryResourceList = data;
         })
-    },
+      },
 
-    // 获取物料数据
-    getArtList() {
+      // 获取物料数据
+      getArtList() {
         getArtIdList().then((res) => {
-            this.artList = res.data || []
+          this.artList = res.data || []
         })
-    },
+      },
 
-    // 确认
-    submitForm() {
+      // 确认
+      submitForm() {
         this.$refs["formRef"].validate((valid) => {
-            console.log('%caddOrEdit.vue line:577 this.isAddOrEdit', 'color: #007acc;', this.isAddOrEdit);
-            if (valid) {
-                this.loading = true;
-                if (this.isAddOrEdit == "add") {
-                    this.add();
-                } else if (this.isAddOrEdit == "edit") {
-                    this.edit();
-                }
-            } else {
-                console.log("error submit!!");
-                console.log('%caddOrEdit.vue line:587 valid', 'color: #007acc;', valid);
-                return false;
+          console.log('%caddOrEdit.vue line:577 this.isAddOrEdit', 'color: #007acc;', this.isAddOrEdit);
+          if (valid) {
+            this.loading = true;
+            if (this.isAddOrEdit == "add") {
+              this.add();
+            } else if (this.isAddOrEdit == "edit") {
+              this.edit();
             }
+          } else {
+            console.log("error submit!!");
+            console.log('%caddOrEdit.vue line:587 valid', 'color: #007acc;', valid);
+            return false;
+          }
         });
-    },
-    dealFormData(){
-            console.log('%caddOrEdit.vue line:461 this.formData', 'color: #007acc;', this.formData);
+      },
+      dealFormData() {
+        console.log('%caddOrEdit.vue line:461 this.formData', 'color: #007acc;', this.formData);
 
-            // MaxCoverPeriod
+        // 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']);
 
@@ -634,88 +549,86 @@ methods: {
         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']);
+          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']);
+          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() {
+      },
+      // 新增
+      add() {
         this.dealFormData()
         add(this.formData)
-            .then(({ code }) => {
+          .then(({ code }) => {
             this.loading = false;
             if (code == 200) {
-                this.msgSuccess('新增成功');
-                this.$emit("setIsAddOrEdit", false);
+              this.msgSuccess('新增成功');
+              this.$emit("setIsAddOrEdit", false);
             }
-            })
-            .catch(() => {
+          })
+          .catch(() => {
             this.loading = false;
-        });
-    },
-    // 修改
-    edit() {
+          });
+      },
+      // 修改
+      edit() {
         this.dealFormData()
         edit({
             ...this.formData,
-        }).then(({ code }) => {
+          }).then(({ code }) => {
             this.loading = false;
             if (code == 200) {
-                this.msgSuccess('修改成功');
-                this.$emit("setIsAddOrEdit", false);
+              this.msgSuccess('修改成功');
+              this.$emit("setIsAddOrEdit", false);
             }
-        })
-        .catch(() => {
+          })
+          .catch(() => {
             this.loading = false;
-        });
-    },
-    // 取消/关闭
-    handleClose() {
+          });
+      },
+      // 取消/关闭
+      handleClose() {
         this.$emit("setIsAddOrEdit", false);
-    },
-    // 选择图标后的操作
-    selected(name) {
+      },
+      // 选择图标后的操作
+      selected(name) {
         this.formData["Menu-Icon"] = name;
-    },
-    // 获取详情
-    getDetails() {
+      },
+      // 获取详情
+      getDetails() {
         getDetails(
-            this.item["AP_ArticleStockLevel-ArtId"]
+          this.item["AP_ArticleStockLevel-ArtId"]
         ).then(({ code, data }) => {
-            if ((code == 200 && data)) {
+          if ((code == 200 && data)) {
             this.formData = data;
-            }
+          }
         });
+      },
     },
-},
 
-};
+  };
 </script>
 <style scoped>
-
-.sub_title{
+  .sub_title {
     width: 95%;
     height: 24px;
     font-size: 18px;
     padding: 5px;
     border-bottom: 1px solid #333;
- 
+
     margin: 20px auto;
-}
-.item_style{
+  }
+
+  .item_style {
     background-color: #eee;
     padding: 5px;
     margin: 5px;
     border: 1px solid #aaa;
-}
-</style>
-
-
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
index 8b587bb..65fc006 100644
--- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
+++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
@@ -219,6 +219,7 @@ export default {
         })
          this.getStanderOne({ statid: 'AP_ArticleStockLevel-CompleteStatus' }).then((res) => {
           this.completeStatusList = res.data
+          console.log(this.completeStatusList);
         })
     }
   },
diff --git a/src/views/factoryModel/part/material/addOrEdit.vue b/src/views/factoryModel/part/material/addOrEdit.vue
index d7fa5ef..af7bc6b 100644
--- a/src/views/factoryModel/part/material/addOrEdit.vue
+++ b/src/views/factoryModel/part/material/addOrEdit.vue
@@ -137,10 +137,19 @@
             :label="getColumnName('Article-ArtSpec4')"
             prop="Article-ArtSpec4"
           >
-          <el-input
+            <el-select
               v-model="formData['Article-ArtSpec4']"
-              placeholder="请输入"
-            />
+              filterable
+              placeholder="请选择"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in attributeArray"
+                :key="item['Attribute-AttrCode']"
+                :label="item['Attribute-AttrName']"
+                :value="item['Attribute-AttrCode']"
+              />
+            </el-select>
 
           </el-form-item>
         </el-col>