Merge remote-tracking branch 'origin/dev' into dev

.env.dev

@@ -2,7 +2,7 @@
 NODE_ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 捷道管理系统
+VUE_APP_TITLE = 捷道管理系统 - 测试版
 
 # 捷道管理系统/开发环境
 VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
@@ -18,4 +18,4 @@ VUE_APP_TENANT_ENABLE = false
 VUE_APP_DOC_ENABLE = true
 
 # 百度统计
-VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
\ No newline at end of file

.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 捷道管理系统
+VUE_APP_TITLE = 捷道管理系统-测试站
 
 # 捷道管理系统/开发环境
 VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
@@ -17,4 +17,4 @@ VUE_APP_TENANT_ENABLE = false
 VUE_APP_DOC_ENABLE = true
 
 # 百度统计
-VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
\ No newline at end of file

src/layout/components/Sidebar/Logo.vue

@@ -3,11 +3,15 @@
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
+          {{ title }}
+         </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
+          {{ title }}
+         </h1>
       </router-link>
     </transition>
   </div>
@@ -33,9 +37,12 @@ export default {
       return this.$store.state.settings.sideTheme
     }
   },
+  created(){
+    console.log('process.env', process.env)
+  },
   data() {
     return {
-      title: '捷道管理系统',
+      title: process.env.VUE_APP_TITLE,
       logo: logoImg
     }
   }

src/views/ecw/box/indexSea.vue

@@ -145,7 +145,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize" @pagination="getList" @current-change="pageChange" />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="dialogCfg.title" :visible.sync="dialogCfg.open" :width="dialogCfg.width" :fullscreen="dialogCfg.fullscreen" append-to-body class="shippingSea-dialog">
@@ -258,7 +258,7 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-        pageSize: 10,
+        rows: 10,
       },
       cabinetList: [],
       warehouseList: [],

src/views/ecw/box/indexSeaAir.vue

@@ -137,7 +137,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize" @pagination="getList" @current-change="pageChange" />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="dialogCfg.title" :visible.sync="dialogCfg.open" :width="dialogCfg.width" :fullscreen="dialogCfg.fullscreen" append-to-body class="shippingSea-dialog">
@@ -250,7 +250,7 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-        pageSize: 10,
+        rows: 10,
       },
       cabinetList: [],
       channelList: [],

src/views/ecw/box/shippingDetail.vue

@@ -33,7 +33,15 @@
 
     <div v-if="(type === 'unload_container' || type === 'close_container') && srcStrs" style="marginTop:15px">
       <h1>{{$t('图片')}}</h1>
-      <ImagePreview :src="srcStrs" :width="146" :height="146" />
+      <!-- <ImagePreview :src="srcStrs" :width="146" :height="146" /> -->
+      <div style="display:flex">
+        <el-image v-for="(srcStr, i) in srcStrs" :key="i" :src="srcStr" fit="cover" style="width:146px;height:146px;margin-right:10px" :preview-src-list="[srcStr]">
+          <div slot="error" class="image-slot">
+            <i class="el-icon-picture-outline"></i>
+          </div>
+        </el-image>
+      </div>
+
     </div>
 
     <el-dialog :title="dialogConfig.title" :visible.sync="dialogConfig.visible" fullscreen :modal-append-to-body=false append-to-body>
@@ -128,7 +136,7 @@ export default {
         title: "",
         visible: false,
       },
-      srcStrs: "",
+      srcStrs: [],
     };
   },
   created() {
@@ -146,10 +154,12 @@ export default {
           const ldPictures = res.data.cabinetVO.ldPictures
             ? JSON.parse(res.data.cabinetVO.ldPictures)
             : [];
-          this.srcStrs = ldPictures.map((item) => item.url).join(",");
+          this.srcStrs = ldPictures.map((item) => item.url);
         }
         if (this.type === "unload_container" && res.data.cabinetUnloadVO) {
-          this.srcStrs = res.data.cabinetUnloadVO.ulImgs ?? '';
+          this.srcStrs = res.data.cabinetUnloadVO.ulImgs
+            ? res.data.cabinetUnloadVO.ulImgs.split(",")
+            : [];
         }
       });
     },
@@ -227,4 +237,25 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.el-image {
+  border-radius: 5px;
+  background-color: #ebeef5;
+  box-shadow: 0 0 5px 1px #ccc;
+  ::v-deep .el-image__inner {
+    transition: all 0.3s;
+    cursor: pointer;
+    &:hover {
+      transform: scale(1.2);
+    }
+  }
+  ::v-deep .image-slot {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+    color: #909399;
+    font-size: 30px;
+  }
+}
 </style>

src/views/ecw/order/components/warehouseDetails.vue

@@ -138,7 +138,7 @@
       <ol>
         <template v-for="item in FeeDetails.details.applyInfoVOList">
           <li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li>
-          <li v-else-if="item.newValue === undefined">{{ $t('删除入仓') }}</li>
+          <li v-else-if="item.newValue === undefined">{{ $t('删除入仓') }} 【{{ item.orgValue }}】</li>
           <li v-else-if="item.newValue !== item.orgValue">{{ item.name }}从【{{ item.orgValue }}】改为【{{ item.newValue }}】</li>
         </template>
       </ol>

src/views/ecw/order/edit.vue

@@ -755,15 +755,22 @@ export default {
     },
     // 始发地
     'form.departureId'(departureId, oldDepartureId){
+        console.log('departureId', departureId)
         this.getOpenedRouterList()
         // 修改始发地后需要重新选择路线
-        if(oldDepartureId && oldDepartureId != departureId)this.$set(this.form, 'lineId', null)
+        if(oldDepartureId && oldDepartureId != departureId){
+            console.log('修改始发地，重置lineId', oldDepartureId, departureId)
+            this.$set(this.form, 'lineId', null)
+        }
     },
     // 目的地
     'form.objectiveId'(objectiveId, oldObjectiveId){
         this.getOpenedRouterList()
         // 修改目的地后需要重新选择路线
-        if(oldObjectiveId && oldObjectiveId != objectiveId)this.$set(this.form, 'lineId', null)
+        if(oldObjectiveId && oldObjectiveId != objectiveId){
+            console.log('修改目的地，重置lineId', oldObjectiveId, objectiveId)
+            this.$set(this.form, 'lineId', null)
+        }
     },
     'form.transportId'(transportId, oldTransportId){
         // 海运拼柜给表单默认值
@@ -796,7 +803,6 @@ export default {
     'form.lineId'(lineId){
         let router = this.routerList.find(item => item.id == lineId)
         if(!router){
-            console.log('未选择路线', router, lineId, JSON.stringify(this.routerList))
             return
         }
         this.$set(this.form, 'departureId', router.startCityId)
@@ -850,16 +856,14 @@ export default {
         this.getOrder()
     }
   },
-  created() {
+  async created() {
     defaultFormData = Object.assign({}, this.form)
 
-    
-
-    getProductAttrList().then(res => this.productAttrList = res.data)
-    getChannelList().then(res => this.channelList = res.data)
-    getTradeCityList().then(res => this.tradeCityList = res.data)
-    getCurrencyList().then(res => this.currencyList = res.data)
-    getUnitList().then(res => this.unitList = res.data)
+    this.productAttrList = (await getProductAttrList()).data
+    this.channelList = (await getChannelList()).data
+    this.tradeCityList = (await getTradeCityList()).data
+    this.currencyList = (await getCurrencyList()).data
+    this.unitList = (await getUnitList()).data
     this.transportList = this.getDictDatas(this.DICT_TYPE.ECW_TRANSPORT_TYPE)
     this.getDictDatas(this.DICT_TYPE.ECW_CUSTOM_DRAWEE).forEach(item => {
         this.customDraweeList.push({

src/views/login.vue

 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{ $t('捷道后台管理系统') }}</h3>
+      <h3 class="title">{{ title }}</h3>
       <el-form-item prop="tenantName" v-if="tenantEnable">
         <el-input v-model="loginForm.tenantName" type="text" auto-complete="off" placeholder='租户'>
           <svg-icon slot="prefix" icon-class="tree" class="el-input__icon input-icon" />
@@ -68,6 +68,7 @@ export default {
   name: "Login",
   data() {
     return {
+      title: process.env.VUE_APP_TITLE,
       codeUrl: "",
       captchaEnable: true,
       tenantEnable: false,