ysy пре 1 година
родитељ
комит
e9bd63e776

+ 16 - 14
src/views/material/BOMmanage/components/bomTreeDialog.vue

@@ -58,14 +58,14 @@
         </el-col>
 
         <el-col :span="12" label-width="100px">
-          <el-form-item label="编码" prop="category.code">
-            <el-input placeholder=""     @click.native="handleProduct()" v-model="category.code"></el-input>
+          <el-form-item label="编码" prop="code">
+            <el-input placeholder=""     @click.native="handleProduct()" v-model="attributeData.code"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="12" label-width="100px">
-          <el-form-item label="名称" prop="category.name">
-            <el-input placeholder="" v-model="category.name"></el-input>
+          <el-form-item label="名称" prop="name">
+            <el-input placeholder="" v-model="attributeData.name"></el-input>
           </el-form-item>
         </el-col>
 
@@ -194,13 +194,14 @@
         },
 
         category: {
-          name: '',
-          code: ''
+          name: ''
         },
 
         rules: {
         
-  
+          code: [{ required: true, message: '请选择编码', trigger: 'change' }],
+
+          name: [{ required: true, message: '请选择名称', trigger: 'change' }]
         },
         bomTreeList: [],
         statusOptions: [
@@ -233,9 +234,9 @@
     methods: {
       getTreeValue(data) {
         this.category = {
-          name: '',
-          code: ''
         }
+        this.$set(this.attributeData, 'code', null);
+        this.$set(this.attributeData, 'name', null);
         if(data) {
           this.attributeData.parentId = data.id;
           this.attributeData.level =  +data.level + 1;
@@ -248,11 +249,10 @@
 
       },
       save() {
-          if(!this.category.code) {
-            this.$message.error('编码不能为空');
-            return;
+        this.$refs.form.validate((valid) => {
+          if (!valid) {
+            return false;
           }
-
           if (!this.attributeData.parentId) {
             this.attributeData.parentId = 0;
             this.attributeData.level = 1;
@@ -264,7 +264,7 @@
               this.$emit('reload', this.attributeData.versions);
               this.handleClose();
             }
-    
+          });
         });
       },
       versionsChange(versions) {
@@ -278,6 +278,8 @@
       chooseStandardList(type, data) {
         if (type == 9 || type == 1) {
           this.category = data[0];
+          this.$set(this.attributeData, 'code', data[0].code);
+          this.$set(this.attributeData, 'name', data[0].name);
           this.$forceUpdate();
         }
       },

+ 11 - 0
src/views/material/BOMmanage/details.vue

@@ -79,6 +79,17 @@
                 v-if="currentNodeData.bomType == 1"
                 >转换MBOM</el-button
               >
+
+              <el-button
+                type="primary"
+                size="mini"
+                icon="el-icon-refresh"
+                plain
+                @click="transformation"
+                v-if="currentNodeData.bomType == 1"
+                >转换ABOM</el-button
+              >
+
               <div v-if="!noBack" class="back-btn">
                 <el-button size="mini" icon="el-icon-back" @click="back"
                   >返回</el-button