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

src/components/OrderBaseInfo/index.vue

@@ -4,7 +4,6 @@
       <el-descriptions-item label="唛头">{{ order.marks }}</el-descriptions-item>
       <el-descriptions-item label="已到箱数/总箱数">{{ order.sumNum }}/{{ order.costVO.totalNum }}</el-descriptions-item>
       <el-descriptions-item label="订单状态"><dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" :class="{red: order.status === 1, green: order.status === 5 || order.status === 2}" /></el-descriptions-item>
-      <el-descriptions-item label="送货时间">{{ order.deliveryDate || '' }}</el-descriptions-item>
       <el-descriptions-item label="运输方式">
         <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.logisticsInfoDto.transportId"></dict-tag>
       </el-descriptions-item>
@@ -16,6 +15,7 @@
       <el-descriptions-item label="收货人姓名">{{ order.consigneeVO && order.consigneeVO.name || ''}}</el-descriptions-item>
       <el-descriptions-item label="收货人公司">{{ order.consigneeVO && order.consigneeVO.company || '' }}</el-descriptions-item>
       <el-descriptions-item label="收货人电话">{{ order.consigneeVO &&(order.consigneeVO.countryCode + order.consigneeVO.phone) || '' }}</el-descriptions-item>
+      <el-descriptions-item label="送货时间">{{ order.deliveryDate || '' }}</el-descriptions-item>
       <el-descriptions-item label="入仓类型">{{ getDictDataLabel(DICT_TYPE.ECW_WAREHOUSING_TYPE, order.warehouseType) }}</el-descriptions-item>
       <el-descriptions-item label="订单号">{{ order.orderNo }}</el-descriptions-item>
     </el-descriptions>

src/layout/components/Sidebar/SidebarItem.vue

@@ -3,14 +3,14 @@
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="$l(onlyOneChild.meta, 'title')" />
         </el-menu-item>
       </app-link>
     </template>
 
     <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="$l(item.meta, 'title')" />
       </template>
       <sidebar-item
         v-for="child in item.children"

src/views/dashboard/PanelGroup.vue

 <template>
   <el-row :gutter="40" class="panel-group" v-if="data">
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+      <div class="card-panel" @click="checkPermi(['member:user']) ? $router.push('/member/member-user') : $alert($t('暂无权限'))">
         <div class="card-panel-icon-wrapper icon-people">
           <svg-icon icon-class="peoples" class-name="card-panel-icon" />
         </div>
@@ -14,7 +14,7 @@
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
+      <div class="card-panel" @click="$router.push('/system/internalMessage/my-internal-message?status=0')">
         <div class="card-panel-icon-wrapper icon-message">
           <svg-icon icon-class="message" class-name="card-panel-icon" />
         </div>
@@ -27,7 +27,7 @@
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
+      <div class="card-panel" @click="$router.push('/task/todo')">
         <div class="card-panel-icon-wrapper icon-money">
           <svg-icon icon-class="date" class-name="card-panel-icon" />
         </div>
@@ -40,7 +40,7 @@
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+      <div class="card-panel" @click="$router.push('/order/mine')">
         <div class="card-panel-icon-wrapper icon-shopping">
           <svg-icon icon-class="shopping" class-name="card-panel-icon" />
         </div>
@@ -58,6 +58,7 @@
 <script>
 import CountTo from 'vue-count-to'
 import {panelData} from '@/api/system/pannel'
+import {checkPermi} from '@/utils/permission'
 export default {
   components: {
     CountTo
@@ -70,7 +71,8 @@ export default {
   methods: {
     handleSetLineChartData(type) {
       this.$emit('handleSetLineChartData', type)
-    }
+    },
+    checkPermi
   },
   created(){
     panelData().then(res => {

src/views/ecw/offer/edit.vue

@@ -139,11 +139,15 @@
             </div>
             <el-table :data="form.prodCreateReqVOList" border class="product-list">
               <el-table-column :label="$t('序号')" width="60px" fixed>
+
                 <template slot-scope="scope">
                     {{scope.$index + 1}}
                 </template>
               </el-table-column>
               <el-table-column :label="$t('中文品名')" width="160px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('中文品名')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="scope">
                     <el-form-item label=""
                         :prop="`prodCreateReqVOList.${scope.$index}.prodId`"
@@ -157,11 +161,17 @@
                 </template>
               </el-table-column>
               <el-table-column :label="$t('英文品名')" width="160px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('英文品名')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="{row}">
                     <product-selector lang="En" v-model="row.prodId" @change="onProductChange(row, $event)" :disabled="!canAddProduct" />
                 </template>
               </el-table-column>
-               <el-table-column :label="$t('品牌')" width="100px">
+               <el-table-column width="100px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('品牌')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="scope">
                     <el-form-item label=""
                         :prop="`prodCreateReqVOList.${scope.$index}.brand`"
@@ -176,11 +186,17 @@
               </el-table-column>
 
               <el-table-column :label="$t('件数')" width="90px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('件数')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="{row}">
                     <el-input v-model.number="row.num" @input="calculationPrice" :disabled="!canAddProduct" />
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('包装单位')">
+              <el-table-column :label="$t('包装单位')" width="100px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('包装单位')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="{row}">
                     <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGING_TYPE" defaultable @input="calculationPrice" :disabled="!canAddProduct" />
                 </template>
@@ -200,7 +216,10 @@
                     <el-input v-model="row.weight" @input="calculationPrice" :disabled="!canAddProduct" />
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('总货值') + '(RMB)'" width="100px">
+              <el-table-column :label="$t('总货值') + '(RMB)'" width="120px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('总货值')}}(RMB) <span class="red">*</span>
+                </template>
                 <template slot-scope="scope">
                     <el-form-item label=""
                         :prop="`prodCreateReqVOList.${scope.$index}.worth`"
@@ -1038,6 +1057,7 @@ export default {
         let arr = []
         this.form.prodCreateReqVOList.forEach(item => {
             let tmp = {...item}
+            tmp.prodAttrIds = tmp.prodAttrArr.join(',')
             if(!tmp.volume)tmp.volume = 1
             if(!tmp.weight)tmp.weight = 1
             if(!tmp.quantity)tmp.quantity = 1
@@ -1073,4 +1093,10 @@ export default {
 ::v-deep .product-list .el-form-item__error{
     position: static;
 }
+::v-deep .el-table__cell .cell{
+    white-space: nowrap;
+    .red{
+        color: red;
+    }
+}
 </style>

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

@@ -19,10 +19,19 @@
             <el-descriptions-item :label="$t('目的仓')" :span="2">
                 {{order.logisticsInfoDto.destAddressZh}}
             </el-descriptions-item>
-
-            <!-- 提单审核 -->
-            <el-descriptions-item v-if="path == 'order_landing_bill'">
-                <el-button type="primary" @click="getBillOfLandingInProcessing">查看提单</el-button>
+            
+            <!-- 优惠申请 -->
+            <el-descriptions-item :label="$t('申请理由')" v-if="type == 1" :span="4">
+                <div class="bold">
+                    <div>
+                        {{$t('原运费')}}：{{detail.orgFreight}} {{ currentMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}，
+                        {{$t('新运费')}}：{{detail.freight}} {{ currentMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}
+                    </div>
+                    <div>
+                        {{$t('原清关费')}}：{{detail.orgClearanceFreight}} {{ currentMap[detail.clearanceFreightCurrency] }} / {{ unitMap[detail.clearanceFreightVolume] }}，
+                        {{$t('新清关费')}}：{{detail.clearanceFreight}} {{ currentMap[detail.clearanceFreightCurrency] }} / {{ unitMap[detail.clearanceFreightVolume] }}
+                    </div>
+                </div>
             </el-descriptions-item>
         </el-descriptions>
 
@@ -33,7 +42,11 @@
 import {getOrder, getApproval} from '@/api/ecw/order'
 import {getChannel} from '@/api/ecw/channel'
 import {getBillOfLandingInProcessing, getBillService} from '@/api/ecw/box'
+import {getUnitList} from "@/api/ecw/unit"
+import { getCurrencyList } from '@/api/ecw/currency'
+
 /* 
+type含义
 优惠申请	1
 管理优惠	2
 佣金设置	3
@@ -64,10 +77,14 @@ export default {
     },
     data(){
         return {
+            type: null,
             detail: null,
             order: null,
             channel: null,
-            ShowLandingBill: false
+            ShowLandingBill: false,
+
+            unitList:[],
+            currencyList:[],
         }
     },
     watch:{
@@ -81,6 +98,29 @@ export default {
             if(this.order.channelId){
                 this.getChannel()
             }
+        },
+        type(){
+            if([1,2,3,4,5].indexOf(this.type) > -1){
+                // 加载费用体积单位
+                getUnitList().then(res => this.unitList = res.data)
+                getCurrencyList().then(res => this.currencyList = res.data)
+            }
+        }
+    },
+    computed:{
+        currentMap(){
+            let map = {}
+            this.currencyList.forEach(item => {
+                map[item.id] = this.$l(item, 'title')
+            })
+            return map
+        },
+        unitMap(){
+            let map = {}
+            this.unitList.forEach(item => {
+                map[item.id] = this.$l(item, 'title')
+            })
+            return map
         }
     },
     created(){
@@ -91,6 +131,7 @@ export default {
     methods:{
         getData(){
             getApproval(this.id).then(res => {
+                this.type = res.data.type
                 this.detail = JSON.parse(res.data.details)
             })
         },
@@ -123,4 +164,7 @@ export default {
         font-weight: bold;
     }
 }
+.bold{
+    font-weight: bold;
+}
 </style>
\ No newline at end of file

src/views/ecw/order/edit.vue

@@ -103,6 +103,9 @@
                 </template>
               </el-table-column>
               <el-table-column :label="$t('中文品名')" width="160px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('中文品名')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="scope">
                     <el-form-item label=""
                         :prop="`orderItemVOList.${scope.$index}.prodId`"
@@ -116,6 +119,9 @@
                 </template>
               </el-table-column>
               <el-table-column :label="$t('英文品名')" width="160px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('英文品名')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="scope">
                     <product-selector lang="En" v-model="scope.row.prodId" @change="onProductChange(scope.row, $event)" :disabled="!canAddProduct || !productEditable" />
                 </template>
@@ -127,6 +133,9 @@
               </el-table-column> -->
 
               <el-table-column :label="$t('品牌')" width="100px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('品牌')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="scope">
                     <el-form-item label=""
                         :prop="`orderItemVOList.${scope.$index}.brandType`"
@@ -140,11 +149,17 @@
                 </template>
               </el-table-column>
               <el-table-column :label="$t('件数')" width="90px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('件数')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="{row}">
                     <el-input v-model.number="row.num" :disabled="!canAddProduct || !productEditable" />
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('包装单位')">
+              <el-table-column :label="$t('包装单位')" width="100px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('包装单位')}} <span class="red">*</span>
+                </template>
                 <template slot-scope="{row}">
                     <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGING_TYPE" defaultable :disabled="!canAddProduct || !productEditable" />
                 </template>
@@ -165,6 +180,9 @@
                 </template>
               </el-table-column>
               <el-table-column :label="$t('总货值') + '(RMB)'" width="100px">
+                <template slot="header" slot-scope="scope">
+                    {{$t('货值')}}(RMB) <span class="red">*</span>
+                </template>
                 <template slot-scope="scope">
                     <el-form-item label=""
                         :prop="`orderItemVOList.${scope.$index}.worth`"
@@ -407,8 +425,8 @@
             </template>
             <template v-else>
                 <el-button type="primary" @click="submitForm(0)" v-if="!form.status">{{$t('保存草稿')}}</el-button> <!--草稿-->
-                <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId || !form.status">{{$t('新建订单')}}</el-button> <!--待入仓-->
-                <el-button type="primary" @click="submitForm(2)" v-else>{{$t('保存订单')}}</el-button> <!--修改-->
+                <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId || !form.status">{{$t('提交报价')}}</el-button> <!--待入仓-->
+                <el-button type="primary" @click="submitForm(2)" v-else>{{$t('编辑')}}</el-button> <!--修改-->
             </template>
             <el-button @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
         </el-form-item>
@@ -1038,4 +1056,10 @@ export default {
 ::v-deep .product-list .el-form-item__error{
     position: static;
 }
+::v-deep .el-table__cell .cell{
+    white-space: nowrap;
+    .red{
+        color: red;
+    }
+}
 </style>

src/views/ecw/order/index.vue

@@ -228,7 +228,8 @@
                 <template v-if="
                   exclude(scope.row.status, [0,2]) &&
                   exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
-                  exclude(scope.row.shipmentState, [320,322,323])
+                  exclude(scope.row.shipmentState, [320,322,323]) &&
+                  exclude(scope.row.inWarehouseState, [201])
                   ">
                   <el-dropdown-item @click.native="$router.push(`/order/release?orderId=${scope.row.orderId}`)" >{{$t('确认提货')}}</el-dropdown-item>
                 </template>
@@ -237,7 +238,8 @@
                 <template v-if="
                   exclude(scope.row.status, [0,2]) &&
                   exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
-                  scope.row.shipmentState < 320
+                  scope.row.shipmentState < 320 &&
+                  exclude(scope.row.inWarehouseState, [201])
                   ">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)" >{{$t('合单申请')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"  >{{$t('拆单申请')}}</el-dropdown-item>

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -296,8 +296,18 @@
       </div>
 
       <span slot="footer">
-        <el-button @click="opened = false">关 闭</el-button>
-        <el-button type="primary" @click="handleSubmit()">{{ edit ? '确认修改' : '提 交' }}</el-button>
+        <template v-if="true">
+          <el-button @click="opened = false">关 闭</el-button>
+          <el-button type="primary" @click="handleSubmit()">{{ edit ? '确认修改' : '提 交' }}</el-button>
+        </template>
+        <template v-else>
+          <el-button type="primary">审核中</el-button>
+          <el-button type="primary">取消审核</el-button>
+          <el-button @click="opened = false">返回</el-button>
+        </template>
+        <template v-else>
+
+        </template>
       </span>
     </el-dialog>
   </div>

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

@@ -133,7 +133,7 @@
           <el-button type="primary" @click="handleLabelSubmit">修改箱号</el-button>
         </div>
       </template>
-      <div style="text-align: center;margin-top: 15px" v-if="order.status !== 5">
+      <div style="text-align: center;margin-top: 15px" v-if="!isEdit">
         <el-button @click="escapeBol = true;" type="primary">转异</el-button>
         <el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
       </div>