Explorar el Código

fix:仓库可视化调整

zhangjingyuan hace 3 años
padre
commit
22b88133ee
Se han modificado 2 ficheros con 70 adiciones y 31 borrados
  1. 34 3
      src/components/ibps-crud/index.vue
  2. 36 28
      src/views/warehouse/cangku.vue

+ 34 - 3
src/components/ibps-crud/index.vue

@@ -193,7 +193,7 @@
                 </span>
                 <!--通用过滤器-->
                 <span v-else-if="column.filter" class="ibps-table-column">
-                  {{ handleColumnFilter(column.filter,scope.row[column.prop]) }}
+                  {{ handleColumnFilter(column.filter,scope.row[column.prop]) }}as
                 </span>
                 <!-- 下拉组件-->
                 <span v-else-if="column.options" class="ibps-table-column">
@@ -247,7 +247,7 @@
 
                 <!-- 自定义slot组件############################################-->
                <span v-else-if="column.slotName" class="ibps-table-column">
-                  <slot  :name="column.slotName" :row="scope.row" :value="scope.row[column.prop]" :column="column" :$index="scope.$index" />
+                 <slot  :name="column.slotName" :row="scope.row" :value="scope.row[column.prop]" :column="column" :$index="scope.$index" />
                 </span>
 
                 <!--自定义组件-->
@@ -482,7 +482,7 @@ export default {
   ]
 }
 </script>
-<style>
+<style >
   .el-table th{
     background-color: #A7D6F8 !important;
     font-size: 12px  !important;
@@ -514,4 +514,35 @@ export default {
       background: #F9FFFF;
       color: #000000;
     }
+
 </style>
+<style lang="less" scoped>
+    /deep/ .el-tag--mini{
+     height: 0px; 
+     padding: 0px; 
+     line-height: 15px; 
+    }
+    /deep/  .el-tag{
+    background-color: #ecf5ff;
+    border-color: #d9ecff;
+     height: 0px; 
+     padding: 0px; 
+    line-height: 15px; 
+    font-size: 12px;
+    color: #409EFF;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 4px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    //  white-space: nowrap;
+    white-space:break-spaces;
+    }
+    /deep/.cell{
+      overflow: visible;
+    }
+    /deep/ .el-table .cell.el-tooltip {
+     white-space:break-spaces; 
+    // min-width: 50px;
+    }
+</style>

+ 36 - 28
src/views/warehouse/cangku.vue

@@ -50,18 +50,17 @@
         <ul class="list-items">
           <li
             class="list-item quyu-item"
-            :style="{
-              background: quyuShow == item.qu_yu_ ? '#FF9900' : '#e5baba',
-            }"
+            :style="{background: quyuShow == item.qu_yu_ ? '#66b1ff' : '#e5baba',}"
             @click="qu_yu_Event"
             v-for="item in quyu_arr"
             :key="item.qu_yu_"
           >
             <div v-if="item.qu_yu_.includes('冰箱')">
-              {{ item.qu_yu_ | freezerFilters }}({{ item.cun_chu_tiao_jian }})
+           {{ item.qu_yu_ | freezerFilters }}({{ item.cun_chu_tiao_jian }})
             </div>
 
             <div v-if="!item.qu_yu_.includes('冰箱')">
+              
               {{ item.qu_yu_ | freezerFilters }}
             </div>
           </li>
@@ -86,16 +85,17 @@
                   >
                     <div class="top-dsc">
                       <div class="position">
-                        <p>名称:{{ it.wu_liao_ming_chen }}</p>
-                        <p>编码:{{ it.wu_liao_bian_ma_ || "空" }}</p>
-                        <p>位置:{{ it.cun_fang_wei_zhi_ || "空" }}</p>
-                        <p>货号:{{ it.huo_hao_ || "空" }}</p>
+                        <p><span style="vertical-align: top;">名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  称:</span> <span class="matterName">{{ it.wu_liao_ming_chen }}</span></p>
+                        <p><span style="vertical-align: top;">入库批号:</span><span class="matterCode">{{it.ru_ku_pi_hao_ || "空"}}</span></p>
+
+                        <p>位&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 置:{{ it.cun_fang_wei_zhi_ || "空" }}</p>
                       </div>
                       <div class="right-content">
-                        <p>入库批号:{{ it.ru_ku_pi_hao_ || "空" }}</p>
+                        <p><span style="vertical-align: top;">编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 码:</span><span class="">{{it.wu_liao_bian_ma_ || "空"}}</span></p>
+                        <p>货&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 号:{{ it.huo_hao_ || "空" }}</p>
+                        <p>有效期&nbsp;&nbsp;&nbsp;:{{ it.you_xiao_qi_ || "空" }}</p>
+                        <p>库存量&nbsp;&nbsp;&nbsp;:{{ it.ku_cun_liang_ || "空" }}</p>
                         <p>存储条件:{{ it.cun_chu_yao_qiu_ || "空" }}</p>
-                        <p>有效期:{{ it.you_xiao_qi_ || "空" }}</p>
-                        <p>库存量:{{ it.ku_cun_liang_ || "空" }}</p>
                       </div>
                       <!-- <div class="condition">{{ it.cun_chu_tiao_jian }}</div> -->
                     </div>
@@ -224,7 +224,7 @@ export default {
       this.formInline.qu_yu_value = "1号冰箱";
       this.selectActive = 1;
       this.firstLoadActive = true;
-      this.quyuShow = "1号冰箱";
+      this.quyuShow = "1号冰箱T";
       var sqlString ="select * from t_mjwlgl where cun_fang_wei_zhi_ like" +"'%" +"BX1T" +"%'";
       this.queryLoad(sqlString, "BX1T");
     },
@@ -330,7 +330,6 @@ export default {
             }
           }
           this.listData = newarr;
-          console.log(this.listData, "listData");
         });
       });
     },
@@ -358,8 +357,9 @@ export default {
       this.firstLoadQuyu(newdata);
     },
     "formInline.qu_yu_value": function (newdata) {
+      console.log(newdata)
       this.qu_yu_value = newdata;
-      this.quyuShow = newdata;
+      this.quyuShow = newdata.split("(")[0];
       this.firstLoadActive = false;
     },
   },
@@ -394,7 +394,7 @@ p {
   .huojia {
     width: 100%;
     .list-items {
-      display: flex;
+      // display: flex;
       cursor: pointer;
       .wDTianjian::after {
         content: "2-6";
@@ -407,16 +407,17 @@ p {
         background: #99ccff;
       }
       .list-item {
-        padding: 4px 14px;
-        height: 30px;
+        padding: 7px 5px;
+        // height: 30px;
         background-color: #cec6a4;
         text-align: center;
-        line-height: 30px;
+        // line-height: 30px; 
         margin-left: 20px;
         margin-bottom: 6px;
         /* margin-top: 6px; */
         border-radius: 10px;
         position: relative;
+        display: inline-block;
         .tiaojian {
           // position: absolute;
           // right: 0px;
@@ -501,9 +502,7 @@ p {
             margin-right: 15px;
             .goods-dsc {
               cursor: pointer;
-              // width: 170px;
-              // height: 80px;
-              padding: 6px 12px;
+              padding: 3px 6px;
               border-radius: 5px;
               background: #e6a23c;
               margin-left: 12px;
@@ -514,14 +513,26 @@ p {
                 display: flex;
                 justify-content: space-between;
                 font-size: 12px;
-                height: 18px;
-                line-height: 18px;
+
+                // line-height: 18px;
                 .position > p {
                   text-align: left;
-                  // color: #fbe8ff;
                 }
+                .position .matterName{
+                  min-width: 40px;
+                  max-width: 70px;
+                  display: inline-block;
+                  word-wrap: break-word;
+                }                
+                .position .matterCode{
+                  min-width: 40px;
+                  max-width: 70px;
+                  display: inline-block;
+                  word-wrap: break-word;
+                }
+                
                 .right-content > p {
-                  margin-left: 15px;
+                  margin-left: 1px;
                   // color: #fbe8ff;
                   text-align: left;
                 }
@@ -532,9 +543,6 @@ p {
               .bottom-dsc {
                 width: 100%;
                 font-size: 18px;
-                height: 42px;
-                line-height: 60px;
-                margin-top: 20px;
                 // color: #fbe8ff;
               }
               .goods-demo {