55

src/views/material/BOMmanage/components/baseInfo.vue

@@ -54,7 +54,13 @@
         </el-col>
 
         <el-col :span="2" label-width="78px">
-          <el-button type="text" @click="handleEdit"> 编辑</el-button>
+          <el-button
+            type="text"
+            @click="handleEdit"
+            v-if="dataInfo.status != 1"
+          >
+            编辑</el-button
+          >
         </el-col>
       </el-row>
     </el-form>

src/views/material/BOMmanage/components/bomTreeDialog.vue

@@ -280,6 +280,7 @@
       chooseStandardList(type, data) {
         if (type == 9 || type == 1) {
           this.category = data[0];
+          this.attributeData.categoryId = data[0].id;
           this.$set(this.attributeData, 'code', data[0].code);
           this.$set(this.attributeData, 'name', data[0].name);
           this.$forceUpdate();
@@ -289,7 +290,7 @@
       async open(type, versions, categoryId, treeId) {
         this.attributeData = {};
         this.attributeData.bomType = type;
-        this.attributeData.categoryId = categoryId;
+      
         this.attributeData.versions = versions;
         this.versions = versions;
 

src/views/material/BOMmanage/components/detailedList.vue

@@ -142,13 +142,13 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'categoryCode',
+            prop: 'code',
             label: '编码',
             showOverflowTooltip: true,
             width: 120
           },
           {
-            prop: 'categoryName',
+            prop: 'name',
             label: '名称',
             width: 150
           },
@@ -279,7 +279,7 @@
       treeId: {
         handler(val) {
           this.newTreeId = val;
-          console.log(999, this.newTreeId)
+       
         },
         deep: true,
         immediate: true

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -923,8 +923,10 @@
     ></standardOutput>
 
     <div class="btns">
-      <el-button type="primary" size="small" @click="save">{{
-        isView ? '确定' : '保存'
+      <el-button type="primary" size="small" v-if="!isView" @click="save('save')"> 保存</el-button>
+
+      <el-button type="primary" size="small" @click="save('close')">{{
+        isView ? '确定' : '保存并关闭'
       }}</el-button>
       <el-button size="small" @click="handleClose">关闭</el-button>
     </div>
@@ -1726,7 +1728,7 @@
         this.$refs.table.setSelectedRows([]);
         this.selection = [];
       },
-      save() {
+      save(type) {
         if (this.isView) {
           this.handleClose();
         } else {
@@ -1770,7 +1772,9 @@
           }).then(() => {
             this.$message.success('保存成功');
             this.$emit('chooseProcess');
-            this.handleClose();
+            if(type === 'close') {
+              this.handleClose();
+              }
           });
         }
       }

src/views/material/BOMmanage/components/workmanship.vue

@@ -144,7 +144,7 @@
                 >
                   <template v-slot:reference>
                     <el-link
-                     v-if="attributeData.status != 1"
+                
                       type="danger"
                       :underline="false"
                       icon="el-icon-delete"
@@ -159,7 +159,7 @@
         </template>
 
         <!-- 操作列 -->
-        <template v-slot:action="{ row }">
+        <template v-slot:action="{ row }"  v-if="attributeData.status != 1">
           <el-link
             type="primary"
             :underline="false"