diff --git a/src/views/modules/partspare/partspare.vue b/src/views/modules/partspare/partspare.vue
index 4969887..420ef5b 100644
--- a/src/views/modules/partspare/partspare.vue
+++ b/src/views/modules/partspare/partspare.vue
@@ -100,6 +100,7 @@
         </template>
       </el-table-column>
     </el-table>
+
     <el-pagination
       style="margin-top: -2px;"
       @size-change="sizeChangeHandle"
@@ -112,7 +113,7 @@
     </el-pagination>
 
     <!-- 新增/修改 -->
-    <el-dialog title="备品备件" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="490px">
+    <el-dialog title="备品备件" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="520px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="BU" prop="bu">
           <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 221px">
@@ -128,73 +129,77 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" prop="active">
-          <el-select v-model="modalData.active" style="width: 100px">
-            <el-option value="Y" label="启用"></el-option>
-            <el-option value="N" label="禁用"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="是否核心备件" prop="coreFlag">
           <el-select v-model="modalData.coreFlag" style="width: 100px">
             <el-option value="Y" label="是"></el-option>
             <el-option value="N" label="否"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否启用序列号管理" prop="sCodeControlFlag">
+          <el-select v-model="modalData.sCodeControlFlag" style="width: 130px">
+            <el-option value="Y" label="启用"></el-option>
+            <el-option value="N" label="禁用"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item label="备品备件编码" prop="partNo">
-          <el-input :disabled="modalDisableFlag" v-model="modalData.partNo" style="width: 140px"></el-input>
+          <el-input :disabled="modalDisableFlag" v-model="modalData.partNo" style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="备品备件名称" prop="partDescription">
-          <el-input v-model="modalData.partDescription" style="width: 295px"></el-input>
+          <el-input v-model="modalData.partDescription" style="width: 315px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
-        <el-form-item label="规格型号" prop="spec">
-          <el-input v-model="modalData.spec" style="width: 140px"></el-input>
+        <el-form-item label="状态" prop="active">
+          <el-select v-model="modalData.active" style="width: 109px">
+            <el-option value="Y" label="启用"></el-option>
+            <el-option value="N" label="禁用"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="产品组编码" prop="groupId">
-          <el-input v-model="modalData.groupId" style="width: 140px"></el-input>
+        <el-form-item label="规格型号" prop="spec">
+          <el-input v-model="modalData.spec" style="width: 109px"></el-input>
         </el-form-item>
         <el-form-item label="单价" prop="averagePrice">
-          <el-input v-model="modalData.averagePrice" style="width: 140px"></el-input>
+          <el-input v-model="modalData.averagePrice" style="width: 109px"></el-input>
+        </el-form-item>
+        <el-form-item label="单位" prop="umid">
+          <el-input v-model="modalData.umid" style="width: 109px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
-        <el-form-item label="单位" prop="umid">
-          <el-input v-model="modalData.umid" style="width: 140px"></el-input>
+        <el-form-item label="产品组编码">
+          <el-input v-model="modalData.groupId" style="width: 109px"></el-input>
         </el-form-item>
         <el-form-item label="预计使用寿命">
-          <el-input-number :controls="false" :step="0" :min="0" v-model="modalData.estUseQty" style="width: 140px"></el-input-number>
+          <el-input-number :controls="false" :step="0" :min="0" v-model="modalData.estUseQty" style="width: 109px"></el-input-number>
         </el-form-item>
         <el-form-item label="最高库存数量">
-          <el-input-number :controls="false" :step="0" :min="0" v-model="modalData.maxStock" style="width: 140px"></el-input-number>
+          <el-input-number :controls="false" :step="0" :min="0" v-model="modalData.maxStock" style="width: 109px"></el-input-number>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item label="最低库存数量" prop="minStock">
-          <el-input-number :controls="false" :step="0" :min="0" v-model="modalData.minStock" style="width: 140px"></el-input-number>
+          <el-input-number :controls="false" :step="0" :min="0" v-model="modalData.minStock" style="width: 109px"></el-input-number>
         </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item prop="supplierName">
           <span slot="label" @click="getBaseList(501)"><a herf="#">供应商编码</a></span>
-          <el-input v-model="modalData.supplierName" style="width: 140px"></el-input>
+          <el-input v-model="modalData.supplierName" style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item prop="warehouseId">
           <span slot="label" style="" @click="getBaseList(502)"><a herf="#">仓库编码</a></span>
-          <el-input v-model="modalData.warehouseId" style="width: 140px"></el-input>
+          <el-input v-model="modalData.warehouseId" style="width: 150px"></el-input>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item prop="locationId">
           <el-link v-if="modalData.warehouseId" slot="label" @click="getBaseList(506)">货位编码</el-link>
           <span v-if="!modalData.warehouseId" slot="label">货位编码</span>
-          <el-input v-model="modalData.locationId"></el-input>
+          <el-input v-model="modalData.locationId" style="width: 150px"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData()">确定</el-button>
-      <el-button type="primary" @click="modalFlag = false">取消</el-button>
-    </span>
+      <el-footer style="height:35px;margin-top: 15px;text-align:center">
+        <el-button type="primary" @click="saveData()">确定</el-button>
+        <el-button type="primary" @click="modalFlag = false">取消</el-button>
+      </el-footer>
     </el-dialog>
 
     <!-- 在途信息 -->
@@ -859,7 +864,7 @@ export default {
             trigger: ['blur','change']
           }
         ],
-        groupId: [
+        sCodeControlFlag: [
           {
             required: true,
             message: ' ',
@@ -978,7 +983,7 @@ export default {
         flag: '1',
         bu: this.userBuList[0].buNo,
         active: 'Y',
-        coreFlag: 'Y',
+        coreFlag: 'N',
         averagePrice: '',
         estUseQty: 0,
         locationId: '',
@@ -986,7 +991,7 @@ export default {
         minStock: 0,
         partDescription: '',
         partNo: '',
-        sCodeControlFlag: '',
+        sCodeControlFlag: 'N',
         spec: '',
         supplierId: '',
         supplierName: '',
@@ -1028,14 +1033,14 @@ export default {
         this.$message.warning('请选择BU！')
         return
       }
-      if (this.modalData.active === '' || this.modalData.active == null) {
-        this.$message.warning('请选择状态！')
-        return
-      }
       if (this.modalData.coreFlag === '' || this.modalData.coreFlag == null) {
         this.$message.warning('请选择是否核心备件！')
         return
       }
+      if (this.modalData.sCodeControlFlag === '' || this.modalData.sCodeControlFlag == null) {
+        this.$message.warning('请选择是否启用序列号管理！')
+        return
+      }
       if (this.modalData.partNo == null || this.modalData.partNo === '') {
         this.$message.warning("备品备件编码不能为空!")
         return
@@ -1044,12 +1049,12 @@ export default {
         this.$message.warning("备品备件名称不能为空!")
         return
       }
-      if (this.modalData.spec == null || this.modalData.spec === '') {
-        this.$message.warning("规格型号不能为空!")
+      if (this.modalData.active === '' || this.modalData.active == null) {
+        this.$message.warning('请选择状态！')
         return
       }
-      if (this.modalData.groupId == null || this.modalData.groupId === '') {
-        this.$message.warning("产品组编码不能为空!")
+      if (this.modalData.spec == null || this.modalData.spec === '') {
+        this.$message.warning("规格型号不能为空!")
         return
       }
       if (this.modalData.averagePrice == null || this.modalData.averagePrice === '') {