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

.env.development

@@ -6,7 +6,10 @@ VUE_APP_TITLE = 捷道管理系统
 
 # 捷道管理系统/开发环境
 #VUE_APP_BASE_API = 'https://jd.admtest.jdshangmen.com'
-VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
+#VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
+#VUE_APP_BASE_API = 'http://localhost:48080'
+VUE_APP_BASE_API = 'https://api2.groupage.cn'
+
 # VUE_APP_BASE_API = '/api'
 
 # 路由懒加载

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

@@ -142,12 +142,12 @@
                         {{$l(row,'prodTitle')}}
                       </template>
                     </el-table-column>
-                    <el-table-column :label="$t('箱数')" align="center" prop="num" />
+                    <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum" />
                     <el-table-column :label="$t('体积') + '/' + $t('重量') + '/' + $t('重货比')" align="center" width="140" prop="volumeWeight">
                       <template slot-scope="scope">
-                        <p v-if="scope.row.volume">{{getTotlContent(scope.row,['volume'])}}</p>
-                        <p v-if="scope.row.weight">{{getTotlContent(scope.row,['weight'])}}</p>
-                        <p>{{getRatioMax(scope.row)}}</p>
+                        <p v-if="scope.row.warehouseInInfoVO.volume">{{getTotlContent(scope.row.warehouseInInfoVO,['volume'])}}</p>
+                        <p v-if="scope.row.warehouseInInfoVO.weight">{{getTotlContent(scope.row.warehouseInInfoVO,['weight'])}}</p>
+                        <p>{{getRatioMax(scope.row.warehouseInInfoVO)}}</p>
                       </template>
                     </el-table-column>
                     <el-table-column :label="$t('报关方式')" align="center" prop="customsType" width="120">
@@ -248,13 +248,15 @@
                 </el-table-column>
                 <el-table-column :label="$t('备案')" align="center" prop="feeType">
                   <template slot-scope="{row}">
-                    <template>{{row.brandName}}</template>{{ $t('（') }}<dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />{{ $t('）') }}</template>
+                    <template>{{row.brandName}}</template>{{ $t('（') }}
+                    <dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />{{ $t('）') }}
+                  </template>
                 </el-table-column>
-                <el-table-column :label="$t('箱数')" align="center" prop="num" />
+                <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum" />
                 <el-table-column :label="$t('体积') +'/' + $t('重量')" align="center" prop="volumeWeight">
                   <template slot-scope="scope">
-                    <p v-if="scope.row.volume">{{getTotlContent(scope.row,['volume'])}}</p>
-                    <p v-if="scope.row.weight">{{getTotlContent(scope.row,['weight'])}}</p>
+                    <p v-if="scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.volume">{{getTotlContent(scope.row.warehouseInInfoVO,['volume'])}}</p>
+                    <p v-if="scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.weight">{{getTotlContent(scope.row.warehouseInInfoVO,['weight'])}}</p>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('报关方式')" align="center" prop="">
@@ -264,7 +266,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('包装类型')" align="center" prop="">
                   <template slot-scope="scope">
-                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="scope.row.unit" />
+                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.unit" />
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('材质')" align="center" prop="material">{{ $t('、') }}<template slot-scope="scope">
@@ -458,6 +460,19 @@ export default {
       params.shipmentId = this.shipmentObj.id;
       params.smartInstall = this.smartInstall;
       secGoodsList(params).then((res) => {
+        if (res.data) {
+          res.data.sectionGoodList.map((data) => {
+            if (data.sectionGoodsList) {
+              data.sectionGoodsList.map((data1) => {
+                data1.warehouseInInfoVO = data1.warehouseInInfo
+                  ? JSON.parse(data1.warehouseInInfo)
+                  : {};
+                return data1;
+              });
+            }
+            return data;
+          });
+        }
         this.preList = res.data;
         this.preLoading = false;
       });

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -56,10 +56,10 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('箱数')" align="center" prop="num">
+              <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfo.cartonsNum">
                 <template slot-scope="scope">
                   <el-link type="primary" @click.native="showWarehouseLogs(scope.row)">
-                    {{scope.row.num}}
+                    {{scope.row.warehouseInInfo.cartonsNum}}
                   </el-link>
                   <div style="color:blue;fontWeight:bold;">
                     {{ scope.row.multiSpecification === true ? '(多规格)' : ''}}
@@ -68,9 +68,9 @@
               </el-table-column>
               <el-table-column :label="$t('纸箱尺寸')" align="center" prop="warehouseInInfo.boxGauge">
               </el-table-column>
-              <el-table-column :label="$t('体积')" align="center" prop="volume">
+              <el-table-column :label="$t('体积')" align="center" prop="warehouseInInfo.volume">
               </el-table-column>
-              <el-table-column :label="$t('重量')" align="center" prop="weight">
+              <el-table-column :label="$t('重量')" align="center" prop="warehouseInInfo.weight">
               </el-table-column>
               <el-table-column :label="$t('数量（个）')" align="center" prop="quantity"></el-table-column>
               <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px"></el-table-column>

src/views/ecw/coupon/edit.vue

@@ -57,7 +57,7 @@
 				<div class="fee-item" v-for="(item, index) in fee[1]" :key="index">
 					<template v-if="[1,2,3,4,5].indexOf(form.type) > -1">
 						{{$t('满')}}
-						<el-input v-model="item.fullAmount" @keyup.native="checkPositive(item, 'fullAmount')" style="width:100px" />
+						<el-input v-model="item.fullAmount" @blur="checkPositive(item, 'fullAmount')" style="width:100px" />
 						<!-- <el-select v-model="item.fullCurrencyId" style="width:100px" >
 							<el-option v-for="item in currencyList" :key="item.id" :label="item.titleZh" :value="item.id" />
 						</el-select> -->
@@ -69,14 +69,14 @@
 
 						<span v-if="[5].indexOf(form.type) > -1">{{$t('收')}}</span>
 
-						<el-input v-if="[2,3,4].indexOf(form.type) > -1" v-model="item.reduceAmount"   @keyup.native="checkPositive(item, 'reduceAmount')" style="width:100px" />
+						<el-input v-if="[2,3,4].indexOf(form.type) > -1" v-model="item.reduceAmount"   @blur="checkPositive(item, 'reduceAmount')" style="width:100px" />
 
 						<selector v-if="[2,3].indexOf(form.type) > -1" v-model="item.reduceCurrencyId" :disabled="!!item.reduceCurrencyDisabled" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 						<span v-if="[4].indexOf(form.type) > -1">%</span>
 					</template>
 					<template v-if="form.type==7">
-						> <el-input v-model="item.startAmount"  @keyup.native="checkPositive(item, 'startAmount')" style="width:100px" />
-						≤ <el-input v-model="item.endAmount"  @keyup.native="checkPositive(item, 'endAmount')" style="width:100px" />
+						> <el-input v-model="item.startAmount"  @blur="checkPositive(item, 'startAmount')" style="width:100px" />
+						≤ <el-input v-model="item.endAmount"  @blur="checkPositive(item, 'endAmount')" style="width:100px" />
 						
 						<!-- <selector v-model="item.startAndEndCurrencyId" @input="checkReduceCurrency(item)"  :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 						 -->
@@ -85,7 +85,7 @@
 						{{$t('价格')}}
 					</template>
 
-					<el-input v-if="[5,6,7].indexOf(form.type) > -1"  @keyup.native="checkPositive(item, 'netReceiptsAmount')" v-model="item.netReceiptsAmount" style="width:100px" />
+					<el-input v-if="[5,6,7].indexOf(form.type) > -1"  @blur="checkPositive(item, 'netReceiptsAmount')" v-model="item.netReceiptsAmount" style="width:100px" />
 					<selector v-if="[5,6,7].indexOf(form.type) > -1" v-model="item.netReceiptsCurrencyId" :disabled="!!item.reduceCurrencyDisabled"  :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 
 					<template v-if="form.type == 6">
@@ -108,7 +108,7 @@
 				<div class="fee-item" v-for="(item, index) in fee[2]" :key="index">
 					<template v-if="[1,2,3,4,5].indexOf(form.type) > -1">
 						{{$t('满')}}
-						<el-input v-model="item.fullAmount"  @keyup.native="checkPositive(item, 'fullAmount')" style="width:100px" />
+						<el-input v-model="item.fullAmount"  @blur="checkPositive(item, 'fullAmount')" style="width:100px" />
 						<!-- <selector v-if="[2,4,5].indexOf(form.type) > -1" v-model="item.fullCurrencyId" @input="checkReduceCurrency(item)" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" /> -->
 						<selector v-if="[2,4,5].indexOf(form.type) > -1" v-model="item.combUnit" @input="checkReduceCurrency(item)" :options="combUnitList" label-field="label" value-field="value" defaultable style="width:100px" />
 						<selector v-if="form.type == 3" v-model="item.prodUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
@@ -118,20 +118,20 @@
 
 						<span v-if="[5].indexOf(form.type) > -1">{{$t('收')}}</span>
 
-						<el-input v-if="[2,3,4].indexOf(form.type) > -1"  @keyup.native="checkPositive(item, 'reduceAmount')" v-model="item.reduceAmount" style="width:100px" />
+						<el-input v-if="[2,3,4].indexOf(form.type) > -1"  @blur="checkPositive(item, 'reduceAmount')" v-model="item.reduceAmount" style="width:100px" />
 
 						<selector v-if="[2,3].indexOf(form.type) > -1" v-model="item.reduceCurrencyId" :disabled="!!item.reduceCurrencyDisabled" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 						<span v-if="[4].indexOf(form.type) > -1">%</span>
 					</template>
 					<template v-if="form.type==7">
-						> <el-input v-model="item.startAmount"  @keyup.native="checkPositive(item, 'startAmount')" style="width:100px" />
-						≤ <el-input v-model="item.endAmount"  @keyup.native="checkPositive(item, 'endAmount')" style="width:100px" />
+						> <el-input v-model="item.startAmount"  @blur="checkPositive(item, 'startAmount')" style="width:100px" />
+						≤ <el-input v-model="item.endAmount"  @blur="checkPositive(item, 'endAmount')" style="width:100px" />
 						<!-- <Selector v-model="item.startAndEndCurrencyId" @input="checkReduceCurrency(item)" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" /> -->
 						<selector v-model="item.combUnit" @input="checkReduceCurrency(item)" :options="combUnitList" label-field="label" value-field="value" defaultable style="width:100px" />
 						{{$t('价格')}}
 					</template>
 
-					<el-input v-if="[5,6,7].indexOf(form.type) > -1"  @keyup.native="checkPositive(item, 'netReceiptsAmount')" v-model="item.netReceiptsAmount" style="width:100px" />
+					<el-input v-if="[5,6,7].indexOf(form.type) > -1"  @blur="checkPositive(item, 'netReceiptsAmount')" v-model="item.netReceiptsAmount" style="width:100px" />
 					<selector v-if="[5,6,7].indexOf(form.type) > -1" v-model="item.netReceiptsCurrencyId" :disabled="!!item.reduceCurrencyDisabled" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 
 					<template v-if="form.type == 6">
@@ -617,6 +617,7 @@ export default {
 
 		// 检查正数
 		checkPositive(object, field){
+			console.log('checkPositive', object, field)
 			const lastChar = object[field].split('').pop()
 			object[field] = parseFloat(object[field])
 			if(isNaN(object[field]) || object[field] < 0) object[field] = ''

src/views/ecw/financial/creatCollection.vue

@@ -293,7 +293,7 @@
                 </el-form-item>
               </template>
               <template v-else>
-                {{ $t('应收总金额')+'（'+getCurrencyLabel(showCurrencyId)+'）'}}
+                {{ $t('应核销总金额')+'（'+getCurrencyLabel(showCurrencyId)+'）'}}
               </template>
             </template>
           </el-table-column>

src/views/ecw/financial/voucher.vue

@@ -62,52 +62,10 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-<!--          <el-form-item :label="$t('自编号')">
-            <el-input
-              style="max-width: 188px"
-              v-model="queryParams.orderNo"
-              :placeholder="$t('请输入自编号')"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item> -->
-<!--          <el-form-item :label="$t('订单号')">
-            <el-input
-              style="max-width: 188px"
-              v-model="queryParams.orderNo"
-              :placeholder="$t('请输入订单号')"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item> -->
           <el-form-item>
             <el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button>
           </el-form-item>
         </el-row>
-        <!-- <el-row :span="24"> -->
- <!--         <el-form-item :label="$t('商品名称')">
-            <el-input
-              style="max-width: 188px"
-              v-model="queryParams.orderNo"
-              :placeholder="$t('请输入商品名称')"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item> -->
-<!--          <el-form-item :label="$t('费用类型')">
-            <dict-selector
-              :type="DICT_TYPE.FEE_TYPE"
-              v-model="queryParams.feeType"
-            ></dict-selector>
-          </el-form-item>
-          <el-form-item :label="$t('收款类型')">
-            <dict-selector
-              :type="DICT_TYPE.PAYMENT_TYPE"
-              v-model="queryParams.paymentType"
-            ></dict-selector>
-          </el-form-item> -->
-
-        <!-- </el-row> -->
       </el-form>
     </el-card>
     <el-table v-loading="loadings" :data="list" border class="card">
@@ -119,27 +77,14 @@
       <el-table-column :label="$t('收款单号')" align="center" prop="receiptNo">
         <template slot-scope="scope">
           <span style="color: #1890ff;" @click="verificationCancelClick(scope.row)">{{scope.row.receiptNo}}</span>
-          <!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
         </template>
       </el-table-column>
-      <!-- <el-table-column :label="$t('自编号')" align="center" prop="orderNo" /> -->
-      <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderNo"> -->
-        <!-- <template slot-scope="scope"> -->
-            <!-- <span style="color: #1890ff;" @click="verificationCancelClick(scope.row)">{{scope.row.orderNo}}</span> -->
-            <!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
-          <!-- </template> -->
-        <!-- </el-table-column> -->
       <el-table-column :label="$t('客户名称')" align="center" prop="customerName" />
       <el-table-column :label="$t('创建日期')" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column :label="$t('币种')" align="center">
-              <template slot-scope="scope">
-              </template>
-            </el-table-column> -->
-      <!-- <el-table-column :label="$t('汇率')" align="center" prop="totalAmount" /> -->
       <el-table-column :label="$t('实收日期')" align="center" prop="payedAt">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.writeOffAt, '{y}-{m}-{d}') }}</span>
@@ -195,7 +140,7 @@
             >{{ $t('开票') }}</el-button
           >
           <el-button v-if="scope.row.state == 1 || scope.row.state == 2 || scope.row.state == 3" size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ $t('收款') }}</el-button>
-          <el-button v-if="scope.row.state == 0 || scope.row.state == 1" size="mini" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
+          <el-button v-if="[0,1,2].indexOf(scope.row.state) > -1" size="mini" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
           <el-button
             v-if="scope.row.state != 0"
             size="mini"

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

@@ -24,7 +24,7 @@
                 :style="{display: index == 0 ? 'block':'none' }"
                 :key="item.num">
                 <div style="float: left; width: 28mm; border-bottom: 0.2mm solid #333; border-right: 0.2mm solid #333; " >
-                    <img :src="detail.url" alt="ECP0063704N-1" style="width: 26mm" />
+                    <img :src="item.url" :alt="item.url" style="width: 26mm" />
                     <p style=" text-align: center; height: 5mm; font-size: 3mm; -webkit-margin-before: 0em; -webkit-margin-after: 0em; margin-top: 0mm; " >
                         {{item.tag}}
                     </p>

src/views/ecw/order/detail.vue

@@ -117,6 +117,15 @@
             {{ $t('海外仓') }}
           </el-tag>
         </el-descriptions-item>
+        <el-descriptions-item :label="$t('快递单号')">
+          {{order.number}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('创建人')">
+          {{order.creatorName}} （{{order.userType == 1 ? $t('会员') : $t('后台用户')}}）
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('创建时间')">
+          {{order.createTime|parseTime}}
+        </el-descriptions-item>
       </el-descriptions>
     </el-card>
     <el-card class="card">
@@ -191,6 +200,11 @@
                 </template>
               </template>
             </el-table-column>
+            <el-table-column prop="" :label="$t('快递单号')">
+              <template slot-scope="{row}">
+                {{ row.expressNo }}
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane :label="$t('订单动态')" name="second">
@@ -353,7 +367,8 @@ export default {
     },
     transportFilter(e, transportList) {
       if (e) return transportList.find(item => item.value == e).label
-    }
+    },
+    parseTime
   },
   data() {
     return {

src/views/ecw/order/edit.vue

@@ -745,12 +745,16 @@ export default {
         this.$set(this.form, 'ccIds', arr.join(","))
     },
     // 始发地
-    'form.departureId'(){
+    'form.departureId'(departureId, oldDepartureId){
         this.getOpenedRouterList()
+        // 修改始发地后需要重新选择路线
+        if(oldDepartureId && oldDepartureId != departureId)this.$set(this.form, 'lineId', null)
     },
     // 目的地
-    'form.objectiveId'(){
+    'form.objectiveId'(objectiveId, oldObjectiveId){
         this.getOpenedRouterList()
+        // 修改目的地后需要重新选择路线
+        if(oldObjectiveId && oldObjectiveId != objectiveId)this.$set(this.form, 'lineId', null)
     },
     'form.transportId'(transportId, oldTransportId){
         // 海运拼柜给表单默认值
@@ -821,7 +825,9 @@ export default {
     }, */
     // 选择的路线变化后，需要判断是否开通了对应的服务，如果没开通需要取消对应的服务选择
     selectedRouter(val){
-        if(!val) return
+        if(!val){
+            return
+        }
         ['1', '4'].forEach(service => {
             if(this.routeOtherServices.indexOf(service) < 0 && this.form.type.indexOf(service) > -1){
                 this.form.type.splice(this.form.type.findIndex(item => item == service), 1)
@@ -838,9 +844,7 @@ export default {
   created() {
     defaultFormData = Object.assign({}, this.form)
 
-    if(this.$route.query.id){
-        this.getOrder()
-    }else this.addProduct()
+    
 
     getProductAttrList().then(res => this.productAttrList = res.data)
     getChannelList().then(res => this.channelList = res.data)
@@ -856,6 +860,10 @@ export default {
         })
     })
 
+    if(this.$route.query.id){
+        this.getOrder()
+    }else this.addProduct()
+    
     this.$nextTick(() => {
         this.initing = false
     })

src/views/ecw/order/index.vue

@@ -145,7 +145,7 @@
       </el-table-column>
       <el-table-column :label="$t('体积/重量')" align="center" prop="sumWeight">
         <template slot-scope="{row}">
-          <!--入仓前是填单数据，入仓后是入仓数据-->
+          <!--入仓前是填单数据，入仓后是入仓数据，装柜审核通过等状态inwarehouseState会变成0，所以只能通过sumNum来判断-->
           <component
           :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
           class="item"
@@ -155,8 +155,8 @@
           effect="dark"
           :content="(row.wvolume||0)+'m³'"
           placement="bottom">
-            <div v-if="row.inWarehouseState <= 1">{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
-            <div v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
+            <div v-if="row.sumNum > 0">{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
+            <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
           </component>
           <!-- <el-tooltip v-if="scope.row.orderExceptionType=='order_heavy_cargo_exception'" class="item" effect="dark" :content="(scope.row.wvolume||0)+'m³'" placement="bottom">
             <span style="color:#ff4949" v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>

src/views/ecw/product/index.vue

@@ -326,7 +326,12 @@ export default {
     }
   },
 
-
+  activated(){
+    if(this.$route.query.typeId != this.queryParams.typeId){
+      this.queryParams.typeId = this.$route.query.typeId
+    }
+    this.getList()
+  },
   created() {
     let typeId = this.$route.query.typeId;
     if (typeId) {

src/views/ecw/productPrice/blacklist.vue

@@ -676,7 +676,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      return this.$router.push('product-price/edit?id=' + row.id)
+      return this.$router.push('product-price/edit?action=update&id=' + row.id)
     },
 
     updateStatus(row, type) {