bom

components/page/files.vue

@@ -353,6 +353,7 @@ export default {
   width: 100%;
   border: 1px solid #eee;
   margin-top: 10px;
+  padding-top:5px;
   .demo-upload-list {
     display: inline-block;
     width: 60px;
@@ -364,8 +365,8 @@ export default {
     overflow: hidden;
     background: #fff;
     position: relative;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-    margin: 10px 10px 0 10px;
+    box-shadow: 0 1px 1px rgba(168, 147, 147, 0.2);
+    margin: 0 5px 0 5px;
     cursor: pointer;
   }
   .demo-upload-list img {

pages/technology/productMix/product/add.vue

@@ -152,7 +152,7 @@ export default {
   },
   methods: {
     change(e) {
-      // console.log(e);
+    //  console.log(e);
       this.entity.name = e.name;
       this.entity.mmcode = e.mmcode;
       this.entity.drawingNo = e.drawingNo;

pages/technology/productMix/product/api.js

@@ -13,8 +13,8 @@ export default {
     update(params){
     return Api.post(`${technologyUrl}productinfo/update`,params);
     },
-    delete(id,levelId){
-    return Api.delete(`${technologyUrl}productinfo/delete`,{params:{id:id,levelId:levelId}});
+    delete(id){
+    return Api.delete(`${technologyUrl}productinfo/delete`,{params:{id:id}});
     },
     // deletes(params) {
     // return Api.post(`${technologyUrl}productinfo/batchdelete`,params);

pages/technology/productMix/product/bom.vue

@@ -300,6 +300,7 @@ export default {
   .row-filed {
     box-shadow: 0 0 6px 2px #ccc;
     padding: 15px;
+    border-radius: 5px;
     .label {
       font-weight: bold;
       height: 30px;
@@ -309,13 +310,12 @@ export default {
     }
     .upload-body {
       border: none;
-      height: 66px;
-      overflow: auto;
+      // height: 66px;
+      // overflow: auto;
       .demo-upload-list {
         margin-top: 0;
-       margin:0 2px;
+        margin: 0 2px;
       }
-     
     }
     .ivu-divider-inner-text {
       font-weight: bold;
@@ -327,6 +327,7 @@ export default {
     box-shadow: 0 0 6px 2px #ccc;
     padding: 15px;
     height: 68vh;
+    border-radius: 5px;
     .mb10 {
       float: right;
       margin-bottom: 10px;

pages/technology/productMix/product/bomDetail.vue

 <template>
   <div class="bom">
     <Row class="row-filed">
-      <Filed :span="4" :name="l('levelId')+'：'">{{entity.levelTitle}}</Filed>
-      <Filed :span="4" :name="l('mmcode')+'：'">{{entity.mmcode}}</Filed>
-      <Filed :span="4" :name="l('drawingNo')+'：'">{{entity.drawingNo}}</Filed>
-      <Filed :span="4" :name="l('name')+'：'">{{entity.name}}</Filed>
+      <Filed :span="5" :name="l('levelId')+'：'">{{entity.levelTitle}}</Filed>
+      <Filed :span="5" :name="l('mmcode')+'：'">{{entity.mmcode}}</Filed>
+      <Filed :span="5" :name="l('drawingNo')+'：'">{{entity.drawingNo}}</Filed>
+      <Filed :span="5" :name="l('name')+'：'">{{entity.name}}</Filed>
       <Filed :span="4" :name="l('version')+'：'">
         <State code="material.main.version" :value="parseInt(entity.version)" />
       </Filed>
-      <Filed :span="4" :name="l('madeCompany')+'：'">{{entity.madeCompanyTitle}}</Filed>
+      <!-- <Filed :span="4" :name="l('madeCompany')+'：'">{{entity.madeCompanyTitle}}</Filed> -->
       <!-- <Filed :span="8" :name="l('productUrl')+'：'">
           <a href="#" @click="seeImg(entity.productUrl)">查看图片</a>
       </Filed>-->
@@ -168,15 +168,15 @@ export default {
       key = "product_info" + "." + key;
       return this.$t(key);
     }
-  },
-//   watch: {
-//     eid(v) {
-//       if (v != 0) {
-//         this.load(v);
-//         this.init();
-//       }
-//     }
-//   }
+  }
+  //   watch: {
+  //     eid(v) {
+  //       if (v != 0) {
+  //         this.load(v);
+  //         this.init();
+  //       }
+  //     }
+  //   }
 };
 </script>
 <style lang="less">
@@ -184,6 +184,7 @@ export default {
   .row-filed {
     box-shadow: 0 0 6px 2px #ccc;
     padding: 15px;
+    border-radius: 5px;
     .label {
       font-weight: bold;
       height: 30px;
@@ -193,8 +194,8 @@ export default {
     }
     .upload-body {
       border: none;
-      height: 66px;
-      overflow: auto;
+    //   height: 66px;
+    //   overflow: auto;
       .demo-upload-list {
         margin-top: 0;
       }
@@ -209,6 +210,7 @@ export default {
     box-shadow: 0 0 6px 2px #ccc;
     padding: 15px;
     height: 55vh;
+    border-radius: 5px;
     .mb10 {
       float: right;
       margin-bottom: 10px;

pages/technology/productMix/product/index.vue

@@ -314,7 +314,8 @@ export default {
       this.fullscreen = true;
     },
     remove(row) {
-      Api.delete(row.id, row.levelId).then(r => {
+      
+      Api.delete(row.bomId).then(r => {
         if (r.success) {
           this.$refs.grid.load();
           this.$Message.success("删除成功");

pages/technology/productMix/productTree/index.vue

@@ -160,8 +160,8 @@ export default {
       this.expand = !this.expand;
     },
     change(v, b) {
-      console.log(v);
-      console.log(b);
+      // console.log(v);
+      // console.log(b);
       let ids = [];
       ids.push(b.value);
       if (b.children) {