Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd

src/views/sb/modelbom/modules/BaseForm.vue

@@ -158,7 +158,8 @@ export default {
       statusMap: {},
       sbTypeTreeData: [],
       typeMap: {},
-      periodTypeMap: {}
+      periodTypeMap: {},
+      oldSpareId:null
     }
   },
   components: {
@@ -177,9 +178,12 @@ export default {
   },
   methods: {
     base (record) {
+      console.log(record)
       this.visible = true
+      this.oldSpareId=record.spareId
       if (this.BaseTool.Object.isBlank(record.modelId)) {
         this.sbId = record.id
+        console.log(this.sbId)
         this.modalTitle = '添加'
         const { form: { setFieldsValue } } = this
         // 日期处理
@@ -207,7 +211,8 @@ export default {
           'spareName',
           'period',
           'periodType',
-          'num'
+          'num',
+          'oldSpareId'
         ])))
       })
     },
@@ -243,6 +248,8 @@ export default {
               this.confirmLoading = false
             })
         } else {
+          values.oldSpareId = this.oldSpareId
+          console.log(values)
           updateSbModelBom(values)
             .then(() => {
               this.handleCancel(values)

src/views/sb/modelbom/modules/Detail.vue

@@ -57,7 +57,7 @@
       </span>
     </a-table>
     <base-form ref="baseModal" @ok="handleOk"/>
-    <spare-base-form ref='spareBaseModal' @ok='handleOk'/>
+    <spare-base-form ref="spareBaseModal" @ok="handleOk"/>
     <import-form-add ref="importModal" @ok="handleOk"></import-form-add>
     <spare-part-info-select-modal :type="'checkbox'" ref="spareSelectModal" @selected="handleSpareSelected"/>
   </a-card>
@@ -208,10 +208,11 @@ export default {
     },
     handleAdd () {
       const modal = this.$refs.baseModal
-      modal.base({ modelId: this.model.id })
+      modal.base({ modelId: null, id: this.model.id })
     },
     handleEdit (record) {
       const modal = this.$refs.baseModal
+      record.modelId = this.model.id
       modal.base(record)
     },
     handleCancel () {