diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
index c2ea85f..47e57f8 100644
--- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
+++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
@@ -1,36 +1,26 @@
 <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-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'"
-              @visible-change="setAtrList"
-            >
-              <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'"
+                @visible-change="setAtrList">
+              <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-col>
@@ -38,64 +28,44 @@
       <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-number
-              v-model="articleStockLevel['AP_ArticleStockLevel-MinCoverPeriod']"
-              placeholder="请输入"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleStockLevel-MinCoverPeriod')"
+              prop="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="
+          <el-form-item :label="getColumnName('AP_ArticleStockLevel-MinCoverPeriodType')"
+              prop="AP_ArticleStockLevel-MinCoverPeriodType">
+            <el-select v-model="
                 articleStockLevel['AP_ArticleStockLevel-MinCoverPeriodType']
               "
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in minCoverPeriodTypeArray"
-                :key="item['Stdef-StdefTyp']"
-                :label="item['Stdef-Bez']"
-                :value="item['Stdef-StdefTyp']"
-              />
+                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-col>
         <el-col :span="6">
-          <el-form-item
-            :label="getColumnName('AP_ArticleStockLevel-MaxCoverPeriod')"
-            prop="AP_ArticleStockLevel-MaxCoverPeriod"
-          >
-            <el-input-number
-              v-model="articleStockLevel['AP_ArticleStockLevel-MaxCoverPeriod']"
-              placeholder="请输入"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleStockLevel-MaxCoverPeriod')"
+              prop="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="
+          <el-form-item :label="getColumnName('AP_ArticleStockLevel-MaxCoverPeriodType')"
+              prop="AP_ArticleStockLevel-MaxCoverPeriodType">
+            <el-select v-model="
                 articleStockLevel['AP_ArticleStockLevel-MaxCoverPeriodType']
               "
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in maxCoverPeriodTypeArray"
-                :key="item['Stdef-StdefTyp']"
-                :label="item['Stdef-Bez']"
-                :value="item['Stdef-StdefTyp']"
-              />
+                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-col>
@@ -103,287 +73,205 @@
       <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="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="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-col>
         <el-col :span="6">
-          <el-form-item
-            :label="getColumnName('AP_ArticleResource-QuantityPerHour')"
-            prop="AP_ArticleResource-QuantityPerHour"
-          >
-            <el-input-number
-              v-model="articleResource['AP_ArticleResource-QuantityPerHour']"
-              placeholder="请输入"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleResource-QuantityPerHour')"
+              prop="AP_ArticleResource-QuantityPerHour">
+            <el-input-number v-model="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-number
-              v-model="articleResource['AP_ArticleResource-OpTimePerItem']"
-              placeholder="请输入"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleResource-OpTimePerItem')"
+              prop="AP_ArticleResource-OpTimePerItem">
+            <el-input-number v-model="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-number
-              v-model="articleResource['AP_ArticleResource-BatchTime']"
-              placeholder="请输入"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleResource-BatchTime')"
+              prop="AP_ArticleResource-BatchTime">
+            <el-input-number v-model="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-number
-              v-model="articleResource['AP_ArticleResource-BatchQuantity']"
-              placeholder="请输入"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleResource-BatchQuantity')"
+              prop="AP_ArticleResource-BatchQuantity">
+            <el-input-number v-model="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="articleResource['AP_ArticleResource-TimeUom']"
-              placeholder="请输入"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleResource-TimeUom')"
+              prop="AP_ArticleResource-TimeUom">
+            <el-input v-model="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="
+          <el-form-item :label="getColumnName('AP_ArticleResource-BatchTimeFieldToggle')"
+              prop="AP_ArticleResource-BatchTimeFieldToggle">
+            <el-switch v-model="
                 articleResource['AP_ArticleResource-BatchTimeFieldToggle']
               "
-              active-color="#35B0A6"
-              inactive-color="#FF3B31"
-            />
+                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="articleResource['AP_ArticleResource-RatePerHourToggle']"
-              active-color="#35B0A6"
-              inactive-color="#FF3B31"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleResource-RatePerHourToggle')"
+              prop="AP_ArticleResource-RatePerHourToggle">
+            <el-switch v-model="articleResource['AP_ArticleResource-RatePerHourToggle']"
+                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="articleResource['AP_ArticleResource-TimePerItemToggle']"
-              active-color="#35B0A6"
-              inactive-color="#FF3B31"
-            />
+          <el-form-item :label="getColumnName('AP_ArticleResource-TimePerItemToggle')"
+              prop="AP_ArticleResource-TimePerItemToggle">
+            <el-switch v-model="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 style="float: right"
+            size="mini"
+            type="text"
+            class="edit-button-style"
+            icon="el-icon-plus"
+            @click="addSecondaryResource()">新增
         </el-button>
       </div>
       <div>
-        <template
-          v-for="(data, index) in articleSecondaryResourceList"
-          :key="'ArticleSecondaryResourceLi_' + index"
-        >
+        <template v-for="(data, index) in articleSecondaryResourceList"
+            :key="'ArticleSecondaryResourceLi_' + index">
           <el-row class="item_style">
             <el-col :span="6">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName(
                     'AP_ArticleSecondaryResource-SecondaryResourceId'
                   )
                 "
-                prop="AP_ArticleSecondaryResource-SecondaryResourceId"
-              >
-                <el-select
-                  v-model="
+                  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']"
-                  />
+                    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="
+              <el-form-item :label="
                   getColumnName('AP_ArticleSecondaryResource-QuantityPerHour')
                 "
-                prop="AP_ArticleSecondaryResource-QuantityPerHour"
-              >
-                <el-input-number
-                  v-model="data['AP_ArticleSecondaryResource-QuantityPerHour']"
-                  placeholder="请输入"
-                />
+                  prop="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="
+              <el-form-item :label="
                   getColumnName('AP_ArticleSecondaryResource-OpTimePerItem')
                 "
-                prop="AP_ArticleSecondaryResource-OpTimePerItem"
-              >
-                <el-input-number
-                  v-model="data['AP_ArticleSecondaryResource-OpTimePerItem']"
-                  placeholder="请输入"
-                />
+                  prop="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-number
-                  v-model="data['AP_ArticleSecondaryResource-BatchTime']"
-                  placeholder="请输入"
-                />
+              <el-form-item :label="getColumnName('AP_ArticleSecondaryResource-BatchTime')"
+                  prop="AP_ArticleSecondaryResource-BatchTime">
+                <el-input-number v-model="data['AP_ArticleSecondaryResource-BatchTime']"
+                    placeholder="请输入" />
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName('AP_ArticleSecondaryResource-BatchQuantity')
                 "
-                prop="AP_ArticleSecondaryResource-BatchQuantity"
-              >
-                <el-input-number
-                  v-model="data['AP_ArticleSecondaryResource-BatchQuantity']"
-                  placeholder="请输入"
-                />
+                  prop="AP_ArticleSecondaryResource-BatchQuantity">
+                <el-input-number 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 :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="
+              <el-form-item :label="
                   getColumnName('AP_ArticleSecondaryResource-RatePerHourToggle')
                 "
-                prop="AP_ArticleSecondaryResource-RatePerHourToggle"
-              >
-                <el-switch
-                  v-model="
+                  prop="AP_ArticleSecondaryResource-RatePerHourToggle">
+                <el-switch v-model="
                     data['AP_ArticleSecondaryResource-RatePerHourToggle']
                   "
-                  active-color="#35B0A6"
-                  inactive-color="#FF3B31"
-                />
+                    active-color="#35B0A6"
+                    inactive-color="#FF3B31" />
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName('AP_ArticleSecondaryResource-TimePerItemToggle')
                 "
-                prop="AP_ArticleSecondaryResource-TimePerItemToggle"
-              >
-                <el-switch
-                  v-model="
+                  prop="AP_ArticleSecondaryResource-TimePerItemToggle">
+                <el-switch v-model="
                     data['AP_ArticleSecondaryResource-TimePerItemToggle']
                   "
-                  active-color="#35B0A6"
-                  inactive-color="#FF3B31"
-                />
+                    active-color="#35B0A6"
+                    inactive-color="#FF3B31" />
               </el-form-item>
             </el-col>
 
             <el-col :span="4">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName(
                     'AP_ArticleSecondaryResource-BatchTimeFieldToggle'
                   )
                 "
-                prop="AP_ArticleSecondaryResource-BatchTimeFieldToggle"
-              >
-                <el-switch
-                  v-model="
+                  prop="AP_ArticleSecondaryResource-BatchTimeFieldToggle">
+                <el-switch v-model="
                     data['AP_ArticleSecondaryResource-BatchTimeFieldToggle']
                   "
-                  active-color="#35B0A6"
-                  inactive-color="#FF3B31"
-                />
+                    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 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>
@@ -393,178 +281,134 @@
 
       <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 style="float: right"
+            size="mini"
+            type="text"
+            class="edit-button-style"
+            icon="el-icon-plus"
+            @click="addAlternativeResource()">新增
         </el-button>
       </div>
       <div>
-        <template
-          v-for="(data, index) in articleAlternativeResourceList"
-          :key="'ArticleAlternativeResourceLi_' + index"
-        >
+        <template v-for="(data, index) in articleAlternativeResourceList"
+            :key="'ArticleAlternativeResourceLi_' + index">
           <el-row class="item_style">
             <el-col :span="6">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName(
                     'AP_ArticleAlternativeResource-AlternativeResourceId'
                   )
                 "
-                prop="AP_ArticleAlternativeResource-AlternativeResourceId"
-              >
-                <el-select
-                  v-model="
+                  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']"
-                  />
+                    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="
+              <el-form-item :label="
                   getColumnName('AP_ArticleAlternativeResource-QuantityPerHour')
                 "
-                prop="AP_ArticleAlternativeResource-QuantityPerHour"
-              >
-                <el-input-number
-                  v-model="
+                  prop="AP_ArticleAlternativeResource-QuantityPerHour">
+                <el-input-number v-model="
                     data['AP_ArticleAlternativeResource-QuantityPerHour']
                   "
-                  placeholder="请输入"
-                />
+                    placeholder="请输入" />
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName('AP_ArticleAlternativeResource-OpTimePerItem')
                 "
-                prop="AP_ArticleAlternativeResource-OpTimePerItem"
-              >
-                <el-input-number
-                  v-model="data['AP_ArticleAlternativeResource-OpTimePerItem']"
-                  placeholder="请输入"
-                />
+                  prop="AP_ArticleAlternativeResource-OpTimePerItem">
+                <el-input-number v-model="data['AP_ArticleAlternativeResource-OpTimePerItem']"
+                    placeholder="请输入" />
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName('AP_ArticleAlternativeResource-BatchTime')
                 "
-                prop="AP_ArticleAlternativeResource-BatchTime"
-              >
-                <el-input-number
-                  v-model="data['AP_ArticleAlternativeResource-BatchTime']"
-                  placeholder="请输入"
-                />
+                  prop="AP_ArticleAlternativeResource-BatchTime">
+                <el-input-number v-model="data['AP_ArticleAlternativeResource-BatchTime']"
+                    placeholder="请输入" />
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName('AP_ArticleAlternativeResource-BatchQuantity')
                 "
-                prop="AP_ArticleAlternativeResource-BatchQuantity"
-              >
-                <el-input-number
-                  v-model="data['AP_ArticleAlternativeResource-BatchQuantity']"
-                  placeholder="请输入"
-                />
+                  prop="AP_ArticleAlternativeResource-BatchQuantity">
+                <el-input-number 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 :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="
+              <el-form-item :label="
                   getColumnName(
                     'AP_ArticleAlternativeResource-RatePerHourToggle'
                   )
                 "
-                prop="AP_ArticleAlternativeResource-RatePerHourToggle"
-              >
-                <el-switch
-                  v-model="
+                  prop="AP_ArticleAlternativeResource-RatePerHourToggle">
+                <el-switch v-model="
                     data['AP_ArticleAlternativeResource-RatePerHourToggle']
                   "
-                  active-color="#35B0A6"
-                  inactive-color="#FF3B31"
-                />
+                    active-color="#35B0A6"
+                    inactive-color="#FF3B31" />
               </el-form-item>
             </el-col>
             <el-col :span="3">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName(
                     'AP_ArticleAlternativeResource-TimePerItemToggle'
                   )
                 "
-                prop="AP_ArticleAlternativeResource-TimePerItemToggle"
-              >
-                <el-switch
-                  v-model="
+                  prop="AP_ArticleAlternativeResource-TimePerItemToggle">
+                <el-switch v-model="
                     data['AP_ArticleAlternativeResource-TimePerItemToggle']
                   "
-                  active-color="#35B0A6"
-                  inactive-color="#FF3B31"
-                />
+                    active-color="#35B0A6"
+                    inactive-color="#FF3B31" />
               </el-form-item>
             </el-col>
 
             <el-col :span="3">
-              <el-form-item
-                :label="
+              <el-form-item :label="
                   getColumnName(
                     'AP_ArticleAlternativeResource-BatchTimeFieldToggle'
                   )
                 "
-                prop="AP_ArticleAlternativeResource-BatchTimeFieldToggle"
-              >
-                <el-switch
-                  v-model="
+                  prop="AP_ArticleAlternativeResource-BatchTimeFieldToggle">
+                <el-switch v-model="
                     data['AP_ArticleAlternativeResource-BatchTimeFieldToggle']
                   "
-                  active-color="#35B0A6"
-                  inactive-color="#FF3B31"
-                />
+                    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 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>
@@ -574,234 +418,198 @@
     </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
-        >
+        <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>
 </template>
 <script>
-import {
-  getDetails,
-  add,
-  edit,
-  getMainResourceList,
-  getSecondaryResourceList,
-  getArtIdList,
-} from "@/server/factoryModel/materialResourceMaintenance/artStockResource";
+  import {
+    getDetails,
+    add,
+    edit,
+  } from "@/server/factoryModel/materialResourceMaintenance/artStockResource";
 
-export default {
-  emits: ["setIsAddOrEdit"],
-  props: {
-    item: {
-      default: {},
-    },
-    isAddOrEdit: {
-      default: "add",
-    },
-    planList: {
-      default: [],
-    },
-    articleList: {
-      default: [],
-    },
-    resourceList: {
-      default: [],
+  export default {
+    emits: ["setIsAddOrEdit"],
+    props: {
+      item: {
+        default: {},
+      },
+      isAddOrEdit: {
+        default: "add",
+      },
+      articleList: {
+        default: [],
+      },
+      resourceList: {
+        default: [],
+      },
+      maxCoverPeriodTypeArray: {
+        default: [],
+      },
+      minCoverPeriodTypeArray: {
+        default: [],
+      },
+      mainResourceList: {
+        default: [],
+      },
+      secondaryResourceList: {
+        default: [],
+      },
     },
-  },
-  data() {
-    return {
-      rules: {
-        "ArtStockResourceData-ArtId": [
+    data() {
+      return {
+        rules: {
+          "ArtStockResourceData-ArtId": [
           {
             required: true,
             message: "此项不能为空",
             trigger: "blur",
-          },
-        ],
-      },
-      mainResourceList: [],
-      secondaryResourceList: [],
-      minCoverPeriodTypeArray: [],
-      maxCoverPeriodTypeArray: [],
-      artList: [],
-      loading: false,
-      articleStockLevel: {},
-      articleResource: {},
-      articleSecondaryResourceList: [],
-      articleAlternativeResourceList: [],
-      formData: {},
-    };
-  },
-  mounted() {
-    this.getStanderOne({
-      statid: "AP_ArticleStockLevel-MinCoverPeriodType",
-    }).then((res) => {
-      this.minCoverPeriodTypeArray = res.data;
-    });
-    this.getStanderOne({
-      statid: "AP_ArticleStockLevel-MaxCoverPeriodType",
-    }).then((res) => {
-      this.maxCoverPeriodTypeArray = res.data;
-    });
-    this.getMainResourceList();
-    this.getSecondaryResourceList();
-    // this.getArtList();
-    if (this.isAddOrEdit == "edit") {
-      this.getDetails();
-    }
-  },
-  methods: {
-    // 物料列表赋值
-    setAtrList(value){
-      if(value){
-        this.artList = this.articleList
-      }
-    },
-    addSecondaryResource() {
-      this.articleSecondaryResourceList.push({
-        "AP_ArticleSecondaryResource-RatePerHourToggle": true,
-        "AP_ArticleSecondaryResource-TimePerItemToggle": true,
-        "AP_ArticleSecondaryResource-BatchTimeFieldToggle": true,
-      });
-    },
-    addAlternativeResource() {
-      this.articleAlternativeResourceList.push({
-        "AP_ArticleAlternativeResource-RatePerHourToggle": true,
-        "AP_ArticleAlternativeResource-TimePerItemToggle": true,
-        "AP_ArticleAlternativeResource-BatchTimeFieldToggle": true,
-      });
-    },
-    deleteSecondaryResource(index) {
-      this.articleSecondaryResourceList.splice(index, 1);
-    },
-    deleteAlternativeResource(index) {
-      this.articleAlternativeResourceList.splice(index, 1);
-    },
-    // 资源列表
-    getMainResourceList() {
-      getMainResourceList().then(({ data = [] }) => {
-        this.mainResourceList = data;
-      });
-    },
-    // 资源列表
-    getSecondaryResourceList() {
-      getSecondaryResourceList().then(({ data = [] }) => {
-        this.secondaryResourceList = data;
-      });
-    },
+          }, ],
+        },
+        artList: [],
+        loading: false,
+        formData: {},
+        articleStockLevel: {},
+        articleResource: {},
+        articleSecondaryResourceList: [],
+        articleAlternativeResourceList: [],
 
-    // 获取物料数据
-    getArtList() {
-      getArtIdList().then((res) => {
-        this.artList = res.data || [];
-      });
+      };
     },
-    // 确认
-    submitForm() {
-      this.$refs["formRef"].validate((valid) => {
-        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();
-          } else if (this.isAddOrEdit == "edit") {
-            this.edit();
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
+    mounted() {
+      if (this.isAddOrEdit == "edit") {
+        this.getDetails();
+      }
     },
-
-    // 新增
-    add() {
-      add(this.formData)
-        .then(({ code }) => {
-          this.loading = false;
-          if (code == 200) {
-            this.msgSuccess("新增成功");
-            this.$emit("setIsAddOrEdit", false);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
+    methods: {
+      // 物料列表赋值
+      setAtrList(value) {
+        if (value) {
+          this.artList = this.articleList
+        }
+      },
+      addSecondaryResource() {
+        this.articleSecondaryResourceList.push({
+          "AP_ArticleSecondaryResource-RatePerHourToggle": true,
+          "AP_ArticleSecondaryResource-TimePerItemToggle": true,
+          "AP_ArticleSecondaryResource-BatchTimeFieldToggle": true,
         });
-    },
-    // 修改
-    edit() {
-      edit({
-        ...this.formData,
-      })
-        .then(({ code }) => {
-          this.loading = false;
-          if (code == 200) {
-            this.msgSuccess("修改成功");
-            this.$emit("setIsAddOrEdit", false);
+      },
+      addAlternativeResource() {
+        this.articleAlternativeResourceList.push({
+          "AP_ArticleAlternativeResource-RatePerHourToggle": true,
+          "AP_ArticleAlternativeResource-TimePerItemToggle": true,
+          "AP_ArticleAlternativeResource-BatchTimeFieldToggle": true,
+        });
+      },
+      deleteSecondaryResource(index) {
+        this.articleSecondaryResourceList.splice(index, 1);
+      },
+      deleteAlternativeResource(index) {
+        this.articleAlternativeResourceList.splice(index, 1);
+      },
+      // 确认
+      submitForm() {
+        this.$refs["formRef"].validate((valid) => {
+          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();
+            } else if (this.isAddOrEdit == "edit") {
+              this.edit();
+            }
+          } else {
+            console.log("error submit!!");
+            return false;
           }
-        })
-        .catch(() => {
-          this.loading = false;
         });
-    },
-    // 取消/关闭
-    handleClose() {
-      this.$emit("setIsAddOrEdit", false);
-    },
-    // 选择图标后的操作
-    selected(name) {
-      this.formData["Menu-Icon"] = name;
-    },
-    // 获取详情
-    getDetails() {
-      getDetails(this.item["AP_ArticleStockLevel-ArtId"]).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"];
+      },
+
+      // 新增
+      add() {
+        add(this.formData)
+          .then(({ code }) => {
+            this.loading = false;
+            if (code == 200) {
+              this.msgSuccess("新增成功");
+              this.$emit("setIsAddOrEdit", false);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      },
+      // 修改
+      edit() {
+        edit({
+            ...this.formData,
+          })
+          .then(({ code }) => {
+            this.loading = false;
+            if (code == 200) {
+              this.msgSuccess("修改成功");
+              this.$emit("setIsAddOrEdit", false);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      },
+      // 取消/关闭
+      handleClose() {
+        this.$emit("setIsAddOrEdit", false);
+      },
+      // 选择图标后的操作
+      selected(name) {
+        this.formData["Menu-Icon"] = name;
+      },
+      // 获取详情
+      getDetails() {
+        getDetails(this.item["AP_ArticleStockLevel-ArtId"]).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"];
+            }
           }
-        }
-      );
+        );
+      },
     },
-  },
-};
+  };
 </script>
 <style scoped>
-.sub_title {
-  width: 95%;
-  height: 24px;
-  font-size: 18px;
-  padding: 5px;
-  border-bottom: 1px solid #333;
-
-  margin: 20px auto;
-}
-
-.item_style {
-  background-color: #eee;
-  padding: 5px;
-  margin: 5px;
-  border: 1px solid #aaa;
-}
+  .sub_title {
+    width: 95%;
+    height: 24px;
+    font-size: 18px;
+    padding: 5px;
+    border-bottom: 1px solid #333;
+    margin: 20px auto;
+  }
+  .item_style {
+    background-color: #eee;
+    padding: 5px;
+    margin: 5px;
+    border: 1px solid #aaa;
+  }
 </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 e277c84..7bd0f8c 100644
--- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
+++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
@@ -132,14 +132,16 @@
       v-if="isAddOrEdit"
       :isAddOrEdit="isAddOrEdit"
       :item="item"
-      :planList="planList"
+
       :articleList="articleList"
+      :maxCoverPeriodTypeArray="maxCoverPeriodTypeArray"
+      :minCoverPeriodTypeArray="minCoverPeriodTypeArray"
+      :mainResourceList="mainResourceList"
+      :secondaryResourceList="secondaryResourceList"
       @setIsAddOrEdit="setIsAddOrEdit"
     />
 
-    <Upload
-            v-model="importDialogVisible"
-            @editCallBack="completeCallBack" />
+    <Upload v-if="importDialogVisible" @editCallBack="completeCallBack" />
 
   </div>
 </template>
@@ -148,7 +150,7 @@ import AddOrEdit from "./addOrEdit.vue";
 import Upload from "./upload.vue";
 import { ListMixin } from "@/mixins/newListMixin";
 import { queryTableData, getPlantList } from "@/server/factoryModel/materialResourceMaintenance/inventoryLevels";
-import { deleteHanle,getArtIdList } from "@/server/factoryModel/materialResourceMaintenance/artStockResource";
+import { deleteHanle,getArtIdList, getMainResourceList, getSecondaryResourceList, } from "@/server/factoryModel/materialResourceMaintenance/artStockResource";
 
 
 export default {
@@ -181,28 +183,29 @@ export default {
       articleList:[], // 物料列表
       minCoverPeriodTypeArray:[],
       maxCoverPeriodTypeArray:[],
-      completeStatusList:[]
+      completeStatusList:[],
+      mainResourceList:[],
+      secondaryResourceList:[],
 
-    };
+    }
+  },
+  created(){
+    this.getStanderData()
+  },
+  mounted(){
+    this.getList();
+    this.$nextTick(() => {
+      this.tableHeight = this.calculationTableHeight(
+        this.$refs.tableRef,
+        120
+      );
+    })
   },
   methods: {
     // 上传回调
     completeCallBack() {
         this.importDialogVisible = false
     },
-   
-        // 物料列表
-    getArticleList(){
-      getArtIdList().then(({data=[]})=>{
-        this.articleList=data;
-      })
-    },
-    // 工厂列表
-    getPlantList(){
-      getPlantList().then(({data=[]})=>{
-        this.planList=data;
-      })
-    },
     // 搜索按钮操作
     handleQuery() {
       this.getList();
@@ -230,6 +233,18 @@ export default {
     },
 
     getStanderData(){
+        getMainResourceList().then(({ data = [] }) => {
+          this.mainResourceList = data;
+        });
+        getSecondaryResourceList().then(({ data = [] }) => {
+          this.secondaryResourceList = data;
+        });
+        getArtIdList().then(({data=[]})=>{
+          this.articleList=data;
+        })
+        getPlantList().then(({data=[]})=>{
+          this.planList=data;
+        })
         this.getStanderOne({ statid: 'AP_ArticleStockLevel-MinCoverPeriodType' }).then((res) => {
           this.minCoverPeriodTypeArray = res.data
         })
@@ -238,25 +253,9 @@ export default {
         })
         this.getStanderOne({ statid: 'AP_ArticleStockLevel-CompleteStatus' }).then((res) => {
           this.completeStatusList = res.data
-          console.log(this.completeStatusList);
         })
     }
   },
-  created(){
-    this.getPlantList();
-    this.getArticleList();
-    this.getStanderData();
-  },
-  mounted(){
-    this.getList();
-    this.$nextTick(() => {
-      this.tableHeight = this.calculationTableHeight(
-        this.$refs.tableRef,
-        120
-      );
-    });
-    
-  }
 };
 </script>
 <style lang="less" scoped>
diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/upload.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/upload.vue
index 4c788b5..6486406 100644
--- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/upload.vue
+++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/upload.vue
@@ -19,6 +19,7 @@ import { importArtResource } from "@/server/factoryModel/materialResourceMainten
 
 export default {
 	name: 'upload',
+  emits:["editCallBack"],
   props:{
     showUploadDailog : {
       type: Boolean,