Browse Source

修改陆运

caojunjie 3 năm trước cách đây
mục cha
commit
b027a20124

+ 11 - 3
src/views/landTransportation/dispatchingCars/index.vue

@@ -70,6 +70,12 @@
               v-model="row.corpId"
           ></crop-select>
         </template>
+        <template slot="addressDetail" slot-scope="{ row,index}">
+          <el-tooltip class="item" effect="dark" placement="top">
+            <div v-html="ToBreak(row.addressDetail)" slot="content"></div>
+            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.addressDetail}}</div>
+          </el-tooltip>
+        </template>
         <template slot-scope="{row,index}" slot="menu">
           <el-button type="text"
                      icon="el-icon-edit"
@@ -82,10 +88,10 @@
           <!--                     @click.stop="$refs.crud.rowDel(row,index)">删除</el-button>-->
         </template>
         <template slot="corpName" slot-scope="{row,index}">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="rowCell(row,index)">{{ row.corpName }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.corpName }}</span>
         </template>
         <template slot="id" slot-scope="{row,index}">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="rowCell(row,index)">{{ row.id }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.id }}</span>
         </template>
       </avue-crud>
     </basic-container>
@@ -174,7 +180,6 @@ export default {
           }, {
             label: '路线',
             prop: 'addressDetail',
-            overHidden: true,
             index: 7,
             width: 140,
             search: true,
@@ -357,6 +362,9 @@ export default {
       this.activeName = tab
       this.onLoad(this.page)
     },
+    ToBreak (val) {
+      return val.replace('\n', '<br/>')
+    }
   }
 }
 </script>

+ 5 - 4
src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -13,7 +13,7 @@
       <div>
         <el-button
             class="el-button--small-yh add-customer-btn"
-            type="primary"
+            type="success"
             :disabled="goodsForm.status === 1 || !goodsForm.id"
             size="small"
             style="margin-right: 70px;"
@@ -475,8 +475,8 @@ export default {
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
           props: {
             label: "dictValue",
-            value: "dictKey"
-          }
+            value: "dictValue"
+          },
         }, {
           label: '箱量',
           cell: true,
@@ -484,6 +484,8 @@ export default {
           controls: false,
           precision: 0,
           width: 100,
+          maxRows:999,
+          minRows:1,
           type: 'number'
         }, {
           label: '总重量(吨)',
@@ -815,7 +817,6 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!');
           return false;
         }
       });

+ 15 - 8
src/views/landTransportation/placeAnOrder/index.vue

@@ -105,15 +105,21 @@
           @search-criteria-switch="searchCriteriaSwitch"
           @search-change="searchChange">
         <template slot="menuLeft" slot-scope="{size}">
-          <el-button type="primary" :size="size" @click="rowSave">创建单据</el-button>
-          <el-button type="success" :size="size" @click="rowSave">复制单据</el-button>
-          <el-button type="info" :size="size" icon="el-icon-printer" @click="rowSave">报表</el-button>
+          <el-button type="primary" icon="el-icon-plus" :size="size" @click="rowSave">创建单据</el-button>
+          <el-button type="success" :size="size">复制单据</el-button>
+          <el-button type="info" :size="size" icon="el-icon-printer">报表</el-button>
         </template>
         <template slot="corpNameSearch" slot-scope="{ row,index}">
           <crop-select
               v-model="row.corpId"
           ></crop-select>
         </template>
+        <template slot="addressDetail" slot-scope="{ row,index}">
+          <el-tooltip class="item" effect="dark" placement="top">
+            <div v-html="ToBreak(row.addressDetail)" slot="content"></div>
+            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.addressDetail}}</div>
+          </el-tooltip>
+        </template>
         <template slot-scope="{row,index}" slot="menu">
 <!--          <el-button type="text"-->
 <!--                     icon="el-icon-edit"-->
@@ -128,10 +134,10 @@
           </el-button>
         </template>
         <template slot="corpName" slot-scope="{row,index}">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="rowCell(row,index)">{{row.corpName}}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{row.corpName}}</span>
         </template>
         <template slot="id" slot-scope="{row,index}">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="rowCell(row,index)">{{row.id}}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{row.id}}</span>
         </template>
       </avue-crud>
     </basic-container>
@@ -221,7 +227,6 @@ export default {
           }, {
             label: '路线',
             prop: 'addressDetail',
-            overHidden: true,
             index: 7,
             width: 140,
             search: true,
@@ -263,7 +268,7 @@ export default {
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 12,
-            width: 140,
+            width: 150,
             search: true,
           }, {
             label: '船名航次',
@@ -340,7 +345,6 @@ export default {
     },
     onLoad(page, params) {
       totalList(1).then(res=>{
-        console.log(res)
         this.totalData = res.data.data
       })
       let queryParams = {
@@ -405,6 +409,9 @@ export default {
     backToList() {
       this.id = ''
       this.show = true
+    },
+    ToBreak (val) {
+      return val.replace('\n', '<br/>')
     }
   }
 }