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

src/views/ecw/customerCommissionInfo/index.vue

@@ -294,7 +294,7 @@ export default {
         {
           productType:0,//商品类型
           productAttr: 0,//暗佣 产品属性
-          darkCommission: 1,//暗佣 佣金
+          darkCommission: '',//暗佣 佣金
           darkCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣 货币
           darkUnit:undefined,//	暗佣 单位
         }

src/views/ecw/myCustomerService/index.vue

@@ -71,10 +71,6 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                    v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button :disabled="selectCustomerList.length === 0" type="primary" size="mini" @click="show = true;" :loading="exportLoading"
-                   v-hasPermi="['ecw:customer:export']">{{$t('批量移交')}}</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/ecw/oceanCustomer/index.vue

@@ -70,11 +70,6 @@
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                    v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
-      </el-col>
-       <el-col :span="1.5">
-        <el-button type="primary" size="mini" @click="batchHandover"
-                   :disabled="multipleSelection.length === 0"
-                   >{{$t('批量移交')}}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

src/views/ecw/offer/detail.vue

@@ -18,43 +18,43 @@
               <label>{{$t('报价单所属')}}：{{list.relation?list.relation==1?$t('发货人'):$t('收货人'):$t('发货人')}}</label>
             </div>
                 <el-descriptions :column="3" border class="card">
-                    <el-descriptions-item :label="$t('发货人:')">
+                    <el-descriptions-item :label="$t('发货人')+':'">
                         {{consignorData.contactsName||$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('手机号:')">
+                    <el-descriptions-item :label="$t('手机号')+':'">
                       {{consignorData?(checkCode(consignorData.areaCode)+consignorData.phoneNew)||$t('无'):$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('联系地址:')">
+                    <el-descriptions-item :label="$t('联系地址')+':'">
                       {{consignorData.address||$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('客户来源:')">
+                    <el-descriptions-item :label="$t('客户来源')+':'">
                           {{consignorData.source||$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('发货人公司名称:')">
+                    <el-descriptions-item :label="$t('发货人公司名称')+':'">
                       {{consignorData.company||$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('社交软件:')">
+                    <el-descriptions-item :label="$t('社交软件')+':'">
                        {{consignorData.social||$t('无')+' '+consignorData.socialNumber||''}}
                     </el-descriptions-item>
                 </el-descriptions>
 
                <el-descriptions :column="3" border class="card">
-                   <el-descriptions-item :label="$t('收货人:')">
+                   <el-descriptions-item :label="$t('收货人')+':'">
                     {{consigneeData.contactsName||$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('手机号:')">
+                    <el-descriptions-item :label="$t('手机号')+':'">
                       {{consigneeData?(checkCode(consigneeData.areaCode)+consigneeData.phoneNew)||$t('无'):$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('联系地址:')">
+                    <el-descriptions-item :label="$t('联系地址')+':'">
                       {{consigneeData.address||$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('客户来源:')">
+                    <el-descriptions-item :label="$t('客户来源')+':'">
                           {{consigneeData.source||$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('发货人公司名称:')">
+                    <el-descriptions-item :label="$t('发货人公司名称')+':'">
                       {{consigneeData.company||$t('无')}}
                     </el-descriptions-item>
-                    <el-descriptions-item :label="$t('社交软件:')">
+                    <el-descriptions-item :label="$t('社交软件')+':'">
                        {{consigneeData.social||$t('无')+' '+consigneeData.socialNumber||''}}
                     </el-descriptions-item>
                </el-descriptions>
@@ -139,19 +139,19 @@
         <el-card class="card">
           <div slot="header" class="card-title">{{$t('费用小计')}}</div>
             <el-descriptions border class="card" :column="5">
-              <el-descriptions-item :label="$t('总件数:')">
+              <el-descriptions-item :label="$t('总件数')+':'">
                   {{list.estCostVO?list.estCostVO.totalNum||'0':0}}
               </el-descriptions-item>
-              <el-descriptions-item :label="$t('总体积:')">
+              <el-descriptions-item :label="$t('总体积')+':'">
                 {{list.estCostVO?(list.estCostVO.totalVolume+'m³')||'0':0}}
               </el-descriptions-item>
-              <el-descriptions-item :label="$t('总重量:')">
+              <el-descriptions-item :label="$t('总重量')+':'">
                 {{list.estCostVO?(list.estCostVO.totalWeight+'kg')||'0':0}}
               </el-descriptions-item>
-              <el-descriptions-item :label="$t('总数量:')">
+              <el-descriptions-item :label="$t('总数量')+':'">
                 {{list.estCostVO?list.estCostVO.totalQuantity||'0':0}}
               </el-descriptions-item>
-              <el-descriptions-item :label="$t('总货值(RMB):')">
+              <el-descriptions-item :label="$t('总货值(RMB)')+':'">
                   {{list.estCostVO?list.estCostVO.totalWorth||'0':0}}
               </el-descriptions-item>
 <!--              <el-descriptions-item :label="报价费：">

src/views/ecw/order/batchSingleApplication.vue

@@ -31,7 +31,7 @@
             <div>重量：{{ row.sumWeight || 0 }}KG</div>
           </template>
         </el-table-column>
-        <el-table-column label="入仓时间">
+        <el-table-column label="入仓时间" prop="rucangTime">
 
         </el-table-column>
         <el-table-column label="运输方式">

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

@@ -12,50 +12,50 @@
          <span style="margin: 0 8px;">{{$t('到')}}</span>
           <el-date-picker clearable v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" />
         </el-form-item>
-        <el-form-item :label="$t('始发地:')">
+        <el-form-item :label="$t('始发地')+':'">
             <el-select v-model="queryParams.originId" :placeholder="$t('请选择始发地')" clearable>
                 <el-option v-for="item in expoerCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
             </el-select>
         </el-form-item>
-        <el-form-item :label="$t('目的地:')" >
+        <el-form-item :label="$t('目的地')+':'" >
             <el-select v-model="queryParams.destinationId" :placeholder="$t('请选择目的地')" clearable>
              <el-option v-for="item in importCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id" ></el-option>
             </el-select>
         </el-form-item>
-        <el-form-item :label="$t('运输方式:')" >
+        <el-form-item :label="$t('运输方式')+':'" >
             <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :clearable="true" v-model="queryParams.transportId" />
         </el-form-item>
       </el-row>
       <el-row>
-        <el-form-item :label="$t('控货:')">
+        <el-form-item :label="$t('控货')+':'">
              <dict-selector :type="DICT_TYPE.ECW_YESNO" :clearable="true" v-model="queryParams.isCargoControl" @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item :label="$t('异常状态:')">
+        <el-form-item :label="$t('异常状态')+':'">
              <dict-selector :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :clearable="true" v-model="queryParams.orderExceptionStatus" @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item :label="$t('异常类型:')">
+        <el-form-item :label="$t('异常类型')+':'">
             <dict-selector :type="DICT_TYPE.ORDER_ERROR_TYPE" :clearable="true" v-model="queryParams.orderExceptionType" @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item :label="$t('订单号:')">
+        <el-form-item :label="$t('订单号')+':'">
           <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
       </el-row>
       <el-row>
-        <el-form-item :label="$t('发货人:')">
+        <el-form-item :label="$t('发货人')+':'">
             <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
         </el-form-item>
-        <el-form-item :label="$t('唛头:')">
+        <el-form-item :label="$t('唛头')+':'">
           <el-input v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item :label="$t('品名:')">
+        <el-form-item :label="$t('品名')+':'">
           <product-selector v-model="queryParams.goodsName" :clearable="true" @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item :label="$t('备案:')">
+        <el-form-item :label="$t('备案')+':'">
              <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :clearable="true" v-model="queryParams.productRecord" @keyup.enter.native="handleQuery"/>
         </el-form-item>
       </el-row>
       <el-row>
-        <el-form-item :label="$t('跟进业务:')">
+        <el-form-item :label="$t('跟进业务')+':'">
          <el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择跟进业务')" clearable>
           <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
           </el-select>

src/views/ecw/order/pending.vue

@@ -19,11 +19,11 @@
             <el-descriptions-item :label="$t('运输方式')">
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
               </el-descriptions-item>
-            <el-descriptions-item :label="$t('始发地')" :span="2">
-                 {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
+            <el-descriptions-item :label="$t('始发地')">
+                 {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('目的地')">
-               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
+               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:$t('无')}}
             </el-descriptions-item>
         </el-descriptions>
         <el-descriptions :column="4">
@@ -178,7 +178,7 @@ export default {
             let url = '../../lineProject/product-price/edit'
             this.$router.push(url)
           })
-          
+
         }
 
       }else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){

src/views/ecw/order/splitApply.vue

@@ -186,12 +186,12 @@
         <el-dialog :title="$t('新建拆单')" :visible.sync="open" width="400px" append-to-body>
           <el-form ref="formSplit" :model="form" :rules="rules" label-width="80px">
             <el-row>
-              <el-form-item :label="$t('运输方式')">
+              <el-form-item :label="$t('运输方式')+':'">
                  <dict-selector :clearable="true" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number"/>
               </el-form-item>
             </el-row>
             <el-row>
-              <el-form-item :label="$t('目的仓库:')" >
+              <el-form-item :label="$t('目的仓库')+':'" >
                   <el-select v-model="form.destWarehouseId" :placeholder="$t('请选择目的仓库')" clearable>
                    <el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id" ></el-option>
                   </el-select>
@@ -213,25 +213,25 @@
            <el-dialog :title="$t('放入品名')" :visible.sync="shopOpen" width="400px" append-to-body>
              <el-form ref="shopForm" :model="shopForm" :rules="shopRules" label-width="80px">
                <el-row>
-                <el-form-item :label="$t('中文品名:')" v-if="splitData.length>0">
+                <el-form-item :label="$t('中文品名')+':'" v-if="splitData.length>0">
                    <el-select v-model="shopForm.prodTitleZh" :placeholder="$t('请选择中文品名')"  @change="changeProdTitleZh" clearable>
                     <el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleZh" :value="item.prodTitleZh" :key="item.prodTitleZh" ></el-option>
                    </el-select>
                  </el-form-item>
                </el-row>
                <el-row>
-                <el-form-item :label="$t('英文品名:')" v-if="splitData.length>0">
+                <el-form-item :label="$t('英文品名')+':'" v-if="splitData.length>0">
                      <el-select v-model="shopForm.prodTitleEn" :placeholder="$t('请选择英文品名')"  @change="changeProdTitleEn" clearable>
                       <el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleEn" :value="item.prodTitleEn" :key="item.prodTitleEn" ></el-option>
                      </el-select>
                  </el-form-item>
-                 <el-form-item :label="$t('剩余箱数:')">
+                 <el-form-item :label="$t('剩余箱数')+':'">
                     {{shopForm.sum||0}}
                  </el-form-item>
-                 <el-form-item :label="$t('放入箱数:')">
+                 <el-form-item :label="$t('放入箱数')+':'">
                     <el-input-number v-model="shopForm.num" controls-position="right"  :min="1" :max="shopForm.sum"></el-input-number>
                  </el-form-item>
-                 <el-form-item :label="$t('备注信息:')">
+                 <el-form-item :label="$t('备注信息')+':'">
                     <el-input v-model="shopForm.remarks"></el-input>
                  </el-form-item>
                </el-row>