Merge branch 'dev' of http://39.106.8.246:3003/zhangyu/PDM into dev

src/components/brand/brandTool.vue

@@ -20,7 +20,7 @@
         <span>&nbsp;{{incompleteCount}}&nbsp;</span>个
       </div>
       <span style="float: right;">
-            <el-button type="primary" @click="handBrand">添加产品</el-button>
+            <el-button type="primary" @click="handBrand">添加品牌</el-button>
 
       </span>
     </div>
@@ -51,7 +51,8 @@ export default {
       })
     },
     handBrand() {
-      //跳转添加产品的路由
+      //添加品牌弹窗
+      this.$emit("addbrand")
     },
   }
 }

src/components/brand/detail/sagaBrandDetail.vue

@@ -4,7 +4,7 @@
       <div class="breadcrumb-content">
         <el-breadcrumb separator-class="el-icon-arrow-right">
           <el-breadcrumb-item>所有品牌</el-breadcrumb-item>
-          <el-breadcrumb-item>{{this.$route.query.BrandCname}}</el-breadcrumb-item>
+          <el-breadcrumb-item>{{this.$route.query.BrandCname}}：</el-breadcrumb-item>
         </el-breadcrumb>
         <template v-for="item in system">
           <template v-for="i in item">
@@ -63,7 +63,7 @@
     data() {
       return {
         more: '更多',
-        limitSys: 18,
+        limitSys: 14,
         isShow: false,
         system: [],
         total: 0,
@@ -203,7 +203,7 @@
         display: inline-block;
         background: #EFF0F1;
         padding: 0 10px;
-        line-height: 20px;
+        line-height: 22px;
         cursor: pointer;
         margin-top: -3px;
       }
@@ -218,7 +218,7 @@
       .left {
         padding-top: 6px;
         color: #8D9399;
-        width: 130px;
+        width: 120px;
       }
 
       .right {
@@ -236,12 +236,14 @@
           li {
             display: inline-block;
             line-height: 25px;
-            width: 102px;
+            max-width: 98px;
+            /*min-width: 80px;*/
             text-align: left;
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
             cursor: pointer;
+            margin-right: 40px;
           }
         }
       }

src/components/product/detail/sagaProductDetail.vue

@@ -10,7 +10,7 @@
             <el-breadcrumb-item>所有分类</el-breadcrumb-item>
             <el-breadcrumb-item>{{this.$route.query.major}}</el-breadcrumb-item>
             <el-breadcrumb-item>{{this.$route.query.system}}</el-breadcrumb-item>
-            <el-breadcrumb-item>{{this.$route.query.class}}</el-breadcrumb-item>
+            <el-breadcrumb-item>{{this.$route.query.class}}：</el-breadcrumb-item>
           </el-breadcrumb>
           <span
             v-for="(item,index) in allSelect"
@@ -288,13 +288,14 @@
       }
 
       .select {
-        margin-left: 20px;
+        margin-left: 8px;
         display: inline-block;
         background: #EFF0F1;
         padding: 0 10px;
-        line-height: 20px;
+        line-height: 22px;
         cursor: pointer;
-        margin-top: -3px;
+        position: relative;
+        top: -2px;
         margin-bottom: 10px;
       }
     }

src/components/product/sagaProduct.vue

@@ -143,6 +143,8 @@
 </style>
 <style lang="less">
 .el-popover {
+  max-height: 400px;
+  overflow: auto;
   p:first-child {
     color: #1F2329;
     text-indent: 8px;

src/components/supplement/sagaSupplement.vue

@@ -39,6 +39,7 @@
 
               <el-input
                 v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'"
+                :class="item.InputMode == 'A1'||item.InputMode == 'A2' ? 'reset-width':''"
                 type="number"
                 v-model="ruleForm.ProdParam[item.Code]">
                 <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
@@ -368,7 +369,7 @@
         border-bottom: 1px solid #eff0f1;
       }
 
-      /deep/ .el-input__inner {
+      .el-select, > > > .el-form-item__content, .el-cascader {
         width: 320px;
       }
     }
@@ -382,6 +383,12 @@
   /deep/ .el-scrollbar__wrap {
     overflow-x: hidden;
   }
+
+  .reset-width {
+    /*.el-input__inner {*/
+    /*   width: 200px;*/
+    /* }*/
+  }
 }
 
 ::-webkit-scrollbar-thumb {

src/views/brand/index.vue

@@ -17,7 +17,7 @@
 <script>
 import sagaBrand from "@/components/brand/sagaBrand"
 import sagaToolbar from "@/components/brand/brandTool"
-import addBrand from "../../components/business/addBrand";
+import addBrand from "@/components/business/addBrand";
 export default {
   name: "brand",
   components: {