Merge branch 'hotfix/pick' into 'dev'

Hotfix/pick

See merge request !17

vu/dist/static/css/chunk-5332.16c2a629.css → vu/dist/static/css/chunk-b503.9ad381ee.css

-.waves-ripple{position:absolute;border-radius:100%;background-color:rgba(0,0,0,.15);background-clip:padding-box;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transform:scale(0);transform:scale(0);opacity:1}.waves-ripple.z-active{opacity:0;-webkit-transform:scale(2);transform:scale(2);-webkit-transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out,-webkit-transform .6s ease-out}.edit-input[data-v-6cbe9bf6]{padding-right:100px}.cancel-btn[data-v-6cbe9bf6]{position:absolute;right:15px;top:10px}
\ No newline at end of file
+.waves-ripple{position:absolute;border-radius:100%;background-color:rgba(0,0,0,.15);background-clip:padding-box;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transform:scale(0);transform:scale(0);opacity:1}.waves-ripple.z-active{opacity:0;-webkit-transform:scale(2);transform:scale(2);-webkit-transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out,-webkit-transform .6s ease-out}.edit-input[data-v-4d92cdb2]{padding-right:100px}.cancel-btn[data-v-4d92cdb2]{position:absolute;right:15px;top:10px}
\ No newline at end of file

vu/src/views/pick/list.vue

@@ -41,12 +41,6 @@
         </template>
       </el-table-column>
 
-      <!--<el-table-column  align="center" label="pick小组数">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ scope.row.pick_group_nums }}</span>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
-
       <el-table-column  align="center" label="pick属性">
         <template slot-scope="scope">
           <span>{{ scope.row.pick_type }}</span>