Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

.env.dev

+# 开发环境配置
+NODE_ENV = 'production'
+
+# 页面标题
+VUE_APP_TITLE = 捷道管理系统
+
+# 捷道管理系统/开发环境
+VUE_APP_BASE_API = 'http://jd.admtest.jdshangmen.com'
+# VUE_APP_BASE_API = '/api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# 多租户的开关
+VUE_APP_TENANT_ENABLE = false
+
+# 文档的开关
+VUE_APP_DOC_ENABLE = true
+
+# 百度统计
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

README.md

-捷道项目管理后台-前端
+捷道项目管理后台-前端
\ No newline at end of file
+
+后台：
+本地运行：npm run dev
+测试环境：npm run build:dev
+生产环境：npm run build:prod
\ No newline at end of file

package.json

@@ -6,6 +6,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
+    "build:dev": "vue-cli-service build --mode dev",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "build:demo1024": "vue-cli-service build --mode demo1024",

src/components/QuickCreateCustomer/index.vue

@@ -16,7 +16,7 @@
           <el-option v-for="(item, index) in countryList"
                       :key="index" :label="item.nameShort + item.nameZh + '(' + item.tel + ')'" :value="item.tel" />
         </el-select>
-        <el-input v-model="form.customerContacts[0].phoneNew" placeholder="请输入联系方式" class="w-150 ml-10"/>
+        <el-input v-model="form.customerContacts[0].phoneNew" maxlength="11" placeholder="请输入联系方式" class="w-150 ml-10"/>
       </el-form-item>
 
       <el-form-item label="客户来源" prop="source">

src/i18n/index.js

@@ -11,8 +11,12 @@ const i18n = new VueI18n({
         'zh_CN': require('./languages/zh_CN.json')
     }
 })
+
+// 自动提取脚本只匹配$t,所以给个别名
+i18n.$t = i18n.t
+/* 
 window.i18n = i18n
-console.log({i18n})
+console.log({i18n}) */
 /*
 用法
 $l('title')         => titleZh

src/views/ecw/bannerPop/index.vue

@@ -99,14 +99,10 @@
           <el-input v-model="form.titleEn" placeholder="请输入英文标题" />
         </el-form-item>
         <el-form-item label="有效期" prop="validateStart">
-          <el-date-picker v-model="form.validateStart" @change="startChange"
-            type="date"
-            placeholder="选择日期" value-format="yyyy-MM-dd">
+          <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateStart" @change="startChange">
           </el-date-picker>
           ~
-          <el-date-picker v-model="form.validateEnd"
-            type="date"
-            placeholder="选择日期" value-format="yyyy-MM-dd">
+          <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateEnd">
           </el-date-picker>
           <span style="color:red;font-size:14px;">注意：留空则表示永久有效</span>
         </el-form-item>
@@ -223,7 +219,7 @@ export default {
     formatTime() {
       return millisecond => {
         if(millisecond) {
-          return new Date(millisecond).format('yyyy-MM-dd');
+          return new Date(millisecond).format('yyyy-MM-dd hh:mm:ss');
         }
         return '';
       }
@@ -317,6 +313,9 @@ export default {
       const id = row.id;
       getBannerPop(id).then(response => {
         this.form = response.data;
+		this.form.validateStart = this.parseTime(response.data.validateStart);
+		this.form.validateEnd = this.parseTime(response.data.validateEnd);
+		console.log(this.form);
         this.open = true;
         this.title = "修改广告弹窗";
       });

src/views/ecw/box/shippingSea/shippingSea.vue

@@ -46,7 +46,7 @@ import { listUser } from "@/api/system/user";
 
 // 这里引入的数据切换语言后要刷新才生效，优化办法是label同时配备labelEn字段，然后再页面上用$l函数调用
 import { getSeaStatus, getStatusName, seaBaseData } from "./utils";
-
+console.log(seaBaseData())
 /**
  * 海运操作主页面
  */

src/views/ecw/financial/creatCollection.vue

@@ -862,10 +862,10 @@ export default {
         const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
         const dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
 
-        const rmbList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 2)
+        const rmbList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 3)
         const rmb = rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
 
-        const nairaList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 3)
+        const nairaList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 2)
         const naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
 
         this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = [dollar, rmb, naira]

src/views/ecw/financial/creatPayment.vue

@@ -460,7 +460,8 @@ export default {
     if (that.$route.query.payableId && that.$route.query.payableId !== '0') {
       this.payableId = this.$route.query.payableId;
       getPayableInfoByIds({ id: this.payableId }).then(res => {
-        this.list = [{...res.data}]
+        this.handleSelectionChange([res.data])
+        this.list = this.multipleSelection
         this.$set(this.form, 'supplierId', res.data.supplierId)
       })
     }

src/views/ecw/offer/edit.vue

@@ -885,7 +885,7 @@ export default {
         console.log('选择联系人', contact)
         if(!this.contactChooseType && !this.quickCreateType) return
         if(!this.contactChooseType && this.quickCreateType){
-            this.contactChooseType = this.quickCreateType == 1 ? 'consignor' : 'consignee'
+            this.contactChooseType = this.quickCreateType == 0 ? 'consignor' : 'consignee'
         }
         this.$set(this.form, this.contactChooseType + 'Company', contact.company)
         this.$set(this.form, this.contactChooseType + 'Id', contact.customerContactsId)

src/views/ecw/order/prepayDeal.vue

@@ -29,7 +29,7 @@
                 {{orderData?getRouterNameById():''}}
            </el-form-item>
        </el-row>
-       
+
        <!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
        <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
         <!-- 预付异常,提货异常是针对整个订单的 -->
@@ -76,7 +76,7 @@
               <template v-else>{{$t('无入仓数据')}}</template>
           </el-row>
         </template>
-        
+
         <el-row :span="12">
           <el-form-item :label="$t('异常描述')+':'">
             <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" />
@@ -125,7 +125,7 @@
                 {{ currencyMap[row.currencyId] }}
           </template>
         </el-table-column>
-          
+
         <el-table-column :label="$t('付款人')">
           <template slot-scope="scope">
             <span>{{scope.row.consigneeName}}({{$t('收货人')}})</span>
@@ -209,7 +209,7 @@
           </el-form-item>
           </el-col>
           <el-col :span="8">
-          <el-form-item :label="$t('预付商品货值占佣金额比例')+':'" label-width="200px">
+          <el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="200px">
               {{orderFee.paymentGoodsWorthScale}}%
           </el-form-item>
           </el-col>
@@ -360,7 +360,7 @@
           orderExceptionStatus:"1",
           orderExceptionHandlerResult:''
         },
-        
+
         //发货/收货人信息
         consigneeData:[],
         routerList:[],
@@ -522,4 +522,4 @@
     display: flex;
     /* justify-content: space-between; */
   }
-</style>
+</style>
\ No newline at end of file

src/views/ecw/order/singleApply.vue

@@ -120,7 +120,7 @@
         <el-table-column :label="$t('入仓货物属性')" align="center">
             <template slot-scope="scope">
               <span>{{$t('合计')}}：</span>
-              <span>{{scope.row.sumNum+this.$t('箱')+' '+scope.row.sumVolume+'m³ '+scope.row.sumWeight+'kg'}}</span>
+              <span>{{scope.row.sumNum+$t('箱')+' '+scope.row.sumVolume+'m³ '+scope.row.sumWeight+'kg'}}</span>
             </template>
         </el-table-column>
         <el-table-column :label="$t('入仓时间')" align="center">
@@ -221,6 +221,7 @@ export default {
       // 执行查询
       getMergeListByOrderNo(this.queryParams).then(response => {
         this.loading = false;
+        console.log('(response.data',response.data)
         if(response.data.mergedList){
           this.mergedList = response.data.mergedList;
         }

src/views/ecw/order/warehousing/index.vue

@@ -140,7 +140,7 @@
     </el-form>
 
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
-                           :order-id="orderId" :city-id="cityId"></warehouse-area-dialog>
+                           :order-id="orderId" :warehouse-id="warehouseId"></warehouse-area-dialog>
 
     <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit"></edit-dialog>
 
@@ -431,8 +431,8 @@ export default {
       })
       return result
     },
-    cityId(){
-      return  this.order?.departureVO?.departureId
+    warehouseId(){
+      return this.order?.logisticsInfoDto?.startWarehouseId
     }
   }
 }