md

src/components/Breadcrumb/index.vue

@@ -2,7 +2,8 @@
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span>
+        <!-- <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title() }}</span> -->
+        <span v-if="item.meta.title&&typeof item.meta.title === 'function'">{{ item.meta.title($route.params) }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>

src/layout/components/TagsView/index.vue

@@ -14,7 +14,10 @@
           @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
           @contextmenu.prevent.native="openMenu(tag,$event)"
         >
-          {{ tag.title }}
+          	<!-- 原代码       {{ tag.title }}-->
+        <span v-if="tag.title && typeof tag.title === 'function'">{{ tag.title(tag.params)}}</span>
+        <span v-else>{{tag.title}}</span>
+
           <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
         </router-link>
       </scroll-pane>

src/views/oms/emisWaybill/OrderRecord.vue

@@ -522,9 +522,9 @@
                             </el-table-column>
                             <el-table-column prop="unit" :label="$t('单位')" align="center" width="100">
                               <template slot-scope="scope">
-                                <el-select filterable v-model="scope.row.unit" style="width: 100%;">
+                                <el-select filterable v-model="scope.row.unit" size="mini"  style="width: 100%;">
                                         <el-option key="件" label="件" value="件" ></el-option>
-                                        <el-option key="个" label="米" value="个" ></el-option>
+                                        <el-option key="个" label="个" value="个" ></el-option>
                                         <el-option key="条" label="条" value="条" ></el-option>
                                         <el-option key="米" label="米" value="米" ></el-option>
                                         <el-option key="根" label="根" value="根" ></el-option>
@@ -587,11 +587,12 @@
                               </template>
                             </el-table-column>
 
-                        <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="80">
+                            <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="80">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.length"   size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
+
                             <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="80">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.width"  size="mini" placeholder=""></el-input>
@@ -1014,12 +1015,36 @@ watch: {
         deep: true
   },
 },
-
+// beforeRouteEnter:(to,from,next) => {
+//     if(to.query.action=="modify") {
+//       to.meta.title = '修改'
+//     }else if(to.query.type == 'copyOrder') {
+//       to.meta.title = '再来一单'
+//     }
+//     next()
+// },
 created() {
 
-  if(this.$route.query.action=="copyOrder"||this.$route.query.action=="modify"){
+  if(this.$route.query.action=="copyOrder"){
+    // this.$router.meta.title="再来一单";
     this.action=this.$route.query.action;
     this.billCode=this.$route.query.billCode;
+
+    const title = '再来一单';
+    const route = Object.assign({}, this.$route, { title: `${title}` })
+    this.$store.dispatch('tagsView/updateVisitedView', route)
+
+    this.initData();
+  }
+  else if(this.$route.query.action=="modify"){
+    // this.$router.meta.title="订单修改";
+    this.action=this.$route.query.action;
+    this.billCode=this.$route.query.billCode;
+
+    const title = '修改:'+this.billCode;
+    const route = Object.assign({}, this.$route, { title: `${title}` })
+    this.$store.dispatch('tagsView/updateVisitedView', route)
+
     this.initData();
   }
   else if(this.$route.query.action=="preOrderByProd"){

src/views/oms/emisWaybill/SendOrderbillList.vue

@@ -5,7 +5,7 @@
     :model="queryParams"
     ref="queryForm"
     size="mini"
-    :maxShow="8"
+    :maxShow="40"
     label-width="90px"
      v-show="showSearch" @search="handleQuery"
      @reset="resetQuery">
@@ -312,6 +312,16 @@
                 >导出</el-button>
               </el-col>
 
+              <el-col :span="1.5">
+              <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleShowGotPic"
+                >查看揽收底单</el-button>
+              </el-col>
+
           </el-row>
       </div>
 
@@ -522,6 +532,14 @@
       <WaybillDetailReadOnly  :key="currentTraceBillCode" :billCode="currentTraceBillCode" ></WaybillDetailReadOnly>
     </el-dialog>
 
+    <el-dialog title="查看揽收底单图片" :visible.sync="openShowGotPic" width="30%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+
+      <div>
+        <el-image :src="billPicSendRmk" style="width: 200px"></el-image>
+      </div>
+
+    </el-dialog>
+
   </XdPageContainer>
 </template>
 
@@ -621,6 +639,7 @@ export default {
       titleForm: "",
       billCode:null,
 
+
       openTraceInfo:false,
       currentTraceBillItem:null,
       currentTraceBillCode:null,
@@ -631,11 +650,15 @@ export default {
 
       queryStatInfoMap:null,
 
+
       // 弹出展示层
       id:null,
       titleView:"",
       openView: false,
 
+      openShowGotPic:false,
+      billPicSendRmk:null,
+
       // 时间搜索
       dateRange:[],
       // 查询参数
@@ -842,7 +865,9 @@ export default {
     },
     handleView(row){
         // this.billCode=row.billCode;
-        this.openView=true;
+        this.currentTraceBillCode=this.billCode;
+        this.currentTraceBillItem=row;
+        this.openTraceInfo=true;
     },
     handleCancel(row){
 
@@ -862,10 +887,43 @@ export default {
       }).catch(() => {});
     },
     handleUpdate(row) {
-       this.$router.push({ path: '/orderMgnt/OrderRecord', query: { action:"modify",billCode: this.billCode }})
+      // const id = row.id;
+      // const title = '修改:'+this.billCode;
+      // const route = Object.assign({}, this.$route, { title: `${title}` })
+      // route.path='/orderMgnt/OrderRecord';
+      // route.query={ action:"modify",billCode: this.billCode};
+
+      // console.log("===>route==>",route);
+
+      // this.$store.dispatch('tagsView/updateVisitedView', route)
+
+       this.$router.push({
+        path: '/orderMgnt/OrderRecord',
+        query: { action:"modify",billCode: this.billCode },
+        meta:{
+          title:'修改'
+        }
+      })
+    },
+    handleShowGotPic(row){
+
+      if(!this.billPicSendRmk){
+         this.$modal.msgError("无揽收底单" );
+          return
+      }
+
+      if(this.billPicSendRmk){
+        this.openShowGotPic=true;
+      }
     },
     handleCopyOrderRecord(row){
-      this.$router.push({ path: '/orderMgnt/OrderRecord', query: { action:"copyOrder",billCode: this.billCode }})
+      this.$router.push({
+        path: '/orderMgnt/OrderRecord',
+        query: { action:"copyOrder",billCode: this.billCode },
+        meta:{
+          title:'再来一单'
+        }
+      })
     },
     initQueryParams(){
       //   this.queryOrderType="1";
@@ -943,6 +1001,8 @@ export default {
       console.log("====>selection==>",selection)
       if(selection!=null){
         this.billCode=selection[0].billCode;
+        this.billPicSendRmk=selection[0].billPicSendRmk;
+
       }
       console.log("====>billCode==>",this.billCode)
 

src/views/oms/emisWaybill/WaybillDetailReadOnly.vue

@@ -36,6 +36,14 @@
             <el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
     </el-descriptions>
 
+    <el-descriptions :title="$t('仓库收货信息')" size="small"  :column="4" v-if="form.pickupMethod==1">
+      <el-descriptions-item label="仓库名称" :span="1">{{form.intoWarehouseName}}</el-descriptions-item>
+      <el-descriptions-item label="仓库联系人" :span="1">{{form.intoWarehouseContact}} {{form.intoWarehousePhone}}</el-descriptions-item>
+      <el-descriptions-item label="仓库地址" :span="4">{{form.intoWarehouseAddress}}</el-descriptions-item>
+      <el-descriptions-item label="预计入仓时间" :span="1">{{form.pickStartDate}}</el-descriptions-item>
+
+    </el-descriptions>
+
     <el-descriptions :title="$t('收寄件信息')"  size="small" :column="4"  style="margin-top:10px">
             <el-descriptions-item label="寄件人">{{ form.sender.name }}</el-descriptions-item>
             <el-descriptions-item label="寄件电话">{{ form.sender.phone }}</el-descriptions-item>