feat: 时间线优化&包优化

package.json

@@ -49,16 +49,16 @@
     "vue-router": "3.0.1",
     "vue2-org-tree": "^1.3.6",
     "vued3tree": "^5.1.0",
-    "vuedraggable": "^2.23.2",
     "vuex": "3.0.1",
-    "xlsx": "^0.11.16"
+    "xlsx": "^0.11.16",
+    "vuedraggable": "^2.23.2"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
     "babel-core": "6.26.3",
     "babel-eslint": "10.0.1",
     "babel-helper-vue-jsx-merge-props": "2.0.3",
-    "babel-loader": "^8.1.0",
+    "babel-loader": "7.1.5",
     "babel-plugin-dynamic-import-node": "2.0.0",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-runtime": "6.23.0",
@@ -71,7 +71,7 @@
     "css-loader": "1.0.0",
     "eslint": "4.19.1",
     "eslint-friendly-formatter": "4.0.1",
-    "eslint-loader": "^3.0.2",
+    "eslint-loader": "2.0.0",
     "eslint-plugin-vue": "4.7.1",
     "file-loader": "1.1.11",
     "friendly-errors-webpack-plugin": "1.7.0",

src/views/consign/consignDetail.vue

@@ -33,7 +33,7 @@
       </el-button>
     </div>
     <div class="consign_content">
-      <el-card class="box-card" style="width: 60%; height: calc(100vh - 200px)">
+      <el-card class="box-card" style="width: 55%; height: calc(100vh - 180px)">
         <div slot="header" class="clearfix">
           <span style="font-weight: bold">寄售单信息</span>
         </div>
@@ -63,17 +63,17 @@
           </div>
         </div>
       </el-card>
-      <el-card class="box-card" style="width: 40%;height: calc(100vh - 200px);margin-left: 20px">
+      <el-card class="box-card" style="width: 45%;height: calc(100vh - 180px);margin-left: 20px">
         <div slot="header" class="clearfix">
           <span style="font-weight: bold">寄售单时间线</span>
         </div>
-        <div style="height: calc(100vh - 280px)">
-          <el-steps :active="1" direction="vertical">
+        <div style="height: calc(100vh - 240px)">
+          <el-steps :active="1" direction="vertical" >
             <el-step
               v-for="(item, indexNumber) in consignSaleRecordVoList"
               :key="indexNumber"
-              :title="item.content"
-              :description="(item.remark ? item.remark + '\n' : '' ) + item.createTime" />
+              :title="item.typeName"
+              :description="(item.content ? item.content + '\n' : '' ) + (item.remark ? item.remark + '\n' : '' ) + item.createTime" />
           </el-steps>
         </div>
       </el-card>