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

src/store/modules/tagsView.js

@@ -82,6 +82,26 @@ const mutations = {
       }
       return false
     })
+  },
+  DEL_LEFT_VIEWS: (state, view) => {
+    const index = state.visitedViews.findIndex(v => v.path === view.path)
+    if (index === -1) {
+      return
+    }
+    state.visitedViews = state.visitedViews.filter((item, idx) => {
+      if (idx >= index || (item.meta && item.meta.affix)) {
+        return true
+      }
+      const i = state.cachedViews.indexOf(item.name)
+      if (i > -1) {
+        state.cachedViews.splice(i, 1)
+      }
+      if(item.meta.link) {
+        const fi = state.iframeViews.findIndex(v => v.path === item.path)
+        state.iframeViews.splice(fi, 1)
+      }
+      return false
+    })
   }
 }
 
@@ -176,6 +196,12 @@ const actions = {
       resolve([...state.visitedViews])
     })
   },
+  delLeftTags({ commit }, view){
+    return new Promise(resolve => {
+      commit('DEL_LEFT_VIEWS', view)
+      resolve([...state.visitedViews])
+    })
+  },
   delCurrentView({ dispatch }){
     const view = router.history.current
     return dispatch('delView', view).then(({visitedViews}) => {

src/views/bpm/processInstance/detail.vue

@@ -131,7 +131,7 @@ import {approveTask, getTaskListByProcessInstanceId, rejectTask, updateTaskAssig
 import {getDate} from "@/utils/dateUtils";
 import {listSimpleUsers} from "@/api/system/user";
 import {getActivityList} from "@/api/bpm/activity";
-import SpecialDetail from "@/views/ecw/offer/components/SpecialDetail"
+import SpecialDetail from "@/views/ecw/offer/components/specialDetail"
 import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
 import shippingDetail from '@/views/ecw/box/shippingDetail'
 import SplitDetail from '@/views/ecw/order/components/SplitDetail'

src/views/ecw/customerCommission/index.vue

@@ -53,7 +53,7 @@
             <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button></div>
           <div style="flex: 1; text-align: right;">
             <router-link :to="'/customerCommissionInfo/'+ 0 ">
-              <el-button>佣金设置</el-button>
+              <el-button type="primary">佣金设置</el-button>
             </router-link>
           </div>
         </div>
@@ -119,7 +119,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>
+<!--          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>-->
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>

src/views/ecw/customerCommissionInfo/customSelectorsDictionary.vue

 <template>
   <el-select v-if="options" v-model="selectVal" placeholder="请选择">
+    <el-option v-if="allShow"  label="全部" :value='0'></el-option>
     <el-option
       v-for="item in options"
       :key="item[valueKey]"
@@ -26,6 +27,10 @@ export default {
       type:String,
       default: 'value',
     },
+    allShow:{
+      type:Boolean,
+      default:false
+    }
   },
   data(){
     return{

src/views/ecw/financial/creatPayment.vue

@@ -736,7 +736,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 .card {
   margin-top: 20px;
 }

src/views/ecw/financial/paymentVoucher.vue

@@ -330,7 +330,7 @@ export default {
 };
 </script>
 
- <style>
+ <style scoped>
 .card {
   margin-top: 20px;
 }

src/views/ecw/financial/receivable.vue

@@ -319,7 +319,7 @@ export default {
 };
 </script>
 
- <style>
+ <style scoped>
 .card {
   margin-top: 20px;
 }

src/views/ecw/financial/voucher.vue

@@ -384,7 +384,7 @@ export default {
 };
 </script>
 
- <style>
+ <style scoped>
 .card {
   margin-top: 20px;
 }

src/views/ecw/offer/special.vue

@@ -98,7 +98,7 @@ import {getProductAttrList} from "@/api/ecw/productAttr"
 import { parseTime } from '@/utils/ruoyi'
 import {listByIds} from '@/api/ecw/region'
 import {getChannel} from '@/api/ecw/channel'
-import SpecialDiscount from '@/views/ecw/offer/components/SpecialDiscount'
+import SpecialDiscount from '@/views/ecw/offer/components/specialDiscount'
 import Commossion from '@/views/ecw/offer/components/Commossion'
 
 export default {

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

@@ -9,12 +9,12 @@
       v-bind="$attrs"
     >
       <el-tabs v-model="activeName" type="card" @tab-click="activeWarehouse = {}">
-        <el-tab-pane v-if="item.warehouseId === warehouseId"   :label="item.name" :name="'' + index" v-for="(item, index) in area"  :key="index">
+        <el-tab-pane v-if="item.warehouseId === warehouseId"   :label="item.name" :name="'' + index" v-for="(item, index) in area"  :key="item.id + index">
           <div>
             <div style="text-align: center">区域</div>
             <div style="background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px">
               <el-row :gutter="20">
-                <el-col :span="12" v-for="(warehouse, i) in item.children" :key="i">
+                <el-col :span="12" v-for="(warehouse, i) in item.children" :key="warehouse.id + i">
                   <div
                     class="warehouse-block"
                     :class="{'warehouse-block-selected': warehouse.selected, 'warehouse-block-active': warehouse.id === activeWarehouse.id}"
@@ -29,7 +29,7 @@
           <div>
             <div style="text-align: center">仓位</div>
             <div class="position-group">
-              <div class="position" v-for="position in activeWarehouse.positionList" :key="item.id">
+              <div class="position" v-for="(position ,index) in activeWarehouse.positionList" :key="item.id + index ">
                 <div
                   class="position-item"
                   v-for="item in position.children"

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

@@ -4,7 +4,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-row>
         <el-form-item >
-          <el-select v-model="queryParams.dateType" style="width: 172px;">
+          <el-select v-model="queryParams.dateType" style="width: 172px;" clearable>
              <el-option :label="$t('入仓时间')" value="1"/>
              <el-option :label="$t('处理时间')" value="2"/>
           </el-select>
@@ -13,28 +13,28 @@
           <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-select v-model="queryParams.originId" :placeholder="$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-select v-model="queryParams.destinationId" :placeholder="$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('运输方式:')" >
-            <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number"/>
+            <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('控货:')">
-             <dict-selector :type="DICT_TYPE.ECW_YESNO" v-model="queryParams.isCargoControl" @keyup.enter.native="handleQuery"/>
+             <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('异常状态:')">
-             <dict-selector :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" v-model="queryParams.orderExceptionStatus" @keyup.enter.native="handleQuery"/>
+             <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('异常类型:')">
-            <dict-selector :type="DICT_TYPE.ORDER_ERROR_TYPE" v-model="queryParams.orderExceptionType" @keyup.enter.native="handleQuery"/>
+            <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-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/>
@@ -42,21 +42,21 @@
       </el-row>
       <el-row>
         <el-form-item :label="$t('发货人:')">
-            <customer-selector v-model="queryParams.consignor" @change="consignor = $event" />
+            <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
         </el-form-item>
         <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('品名:')">
-          <product-selector v-model="queryParams.goodsName" @keyup.enter.native="handleQuery" />
+          <product-selector v-model="queryParams.goodsName" :clearable="true" @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('备案:')">
-             <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" @keyup.enter.native="handleQuery"/>
+             <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-select v-model="queryParams.salesmanId" :placeholder="$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>
         </el-form-item>
@@ -98,7 +98,8 @@
       </el-table-column>
       <el-table-column :label="$t('体积/重量')" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+            <span v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+            <span v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
           </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式/目的地')" align="center">
@@ -144,7 +145,8 @@
 import {getOrderExceptionPage} from "@/api/ecw/orderException"
 import {getTradeCityList} from '@/api/ecw/region'
 import {DICT_TYPE} from  '@/utils/dict'
-import { userList } from "@/api/system/user"
+// import { userList } from "@/api/system/user"
+import {listServiceUser} from "@/api/system/user"
 import CustomerSelector from '@/components/CustomerSelector'
 import ProductSelector from '@/components/ProductSelector'
 
@@ -176,7 +178,10 @@ export default {
   created() {
     this.getList();
     getTradeCityList().then(res => this.tradeCityList = res.data)
-    userList('salesman').then(res =>this.creatorData = res.data)
+    listServiceUser().then(r => {
+      this.creatorData = r.data
+    })
+    // userList('salesman').then(res =>this.creatorData = res.data)
   },
   computed:{
     expoerCityList(){
@@ -198,6 +203,7 @@ export default {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
+        this.reset()
       });
     },
     /** 表单重置 */
@@ -206,14 +212,12 @@ export default {
         page: 1,
         rows: 10,
       };
-      this.resetForm("queryForm");
     },
     importCityName(id){
         return this.tradeCityList.filter(item => item.id == id)
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.page = 1;
       this.getList();
     },
     handEdit(id){

src/views/ecw/order/pending.vue

@@ -89,7 +89,7 @@
           </el-table-column>
         <el-table-column :label="$t('操作')" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.orderExceptionStatus>0">{{$t('已完成')}}</el-tag>
+            <el-tag v-if="scope.row.orderExceptionStatus==2">{{$t('已完成')}}</el-tag>
             <el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
           </template>
         </el-table-column>

src/views/ecw/order/transferWarehousing.vue

@@ -67,25 +67,26 @@
     <el-descriptions style="margin-top: 20px" :column="4" border>
       <el-descriptions-item label="集运仓库">{{ warehouseDetails && warehouseDetails.warehouseOutName  ?  warehouseDetails.warehouseOutName : '' }}</el-descriptions-item>
       <el-descriptions-item label="储位">
-         <div v-for="item in storageSpaceList"  style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}</div><div>{{item.warehouseName ? item.regionName :''}} 区</div></div>
+         <div v-for="item in storageSpaceList"  style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}</div><div>{{item.warehouseName ? item.regionName :''}} 区</div> <div>{{item.code}}</div></div>
       </el-descriptions-item>
       <el-descriptions-item v-if="type == 2" label="选择储位">
         <div @click="areaVisible = true" style="color: #0a84ff;cursor: pointer;">选择储位</div>
       </el-descriptions-item>
       <el-descriptions-item label="调拨目标仓">{{ warehouseDetails && warehouseDetails.warehouseInName ? warehouseDetails.warehouseInName : '' }}</el-descriptions-item>
       <el-descriptions-item label="物流公司">
-        <el-select v-model="params.logisticsCompany" >
+        <el-select :disabled="type == 2" v-model="params.logisticsCompany" >
           <el-option v-for="(item,index) in expressList " :key="index"  :value="item.id" :label="item.companyZh"></el-option>
         </el-select>
       </el-descriptions-item>
       <el-descriptions-item label="物流单号">
-        <el-input v-model="params.logisticsNo"></el-input>
+        <el-input :disabled="type == 2" v-model="params.logisticsNo"></el-input>
       </el-descriptions-item>
       <el-descriptions-item label="联系电话">
-        <el-input v-model="params.phone"></el-input>
+        <el-input :disabled="type == 2" v-model="params.phone"></el-input>
       </el-descriptions-item>
       <el-descriptions-item label="出仓日期" >
         <el-date-picker
+          :disabled="type == 2"
           value-format="yyyy-MM-dd HH:mm:ss"
           v-model="params.deliveryDate"
           type="date"
@@ -276,15 +277,27 @@ export default {
                 if(item.wareId === itemm.id){
                   itemm.children.forEach(itemmm => {
                    if(itemmm.id === item.areaId){
+                     if(itemmm.positionList.length > 0){
+                       itemmm.positionList.forEach(ic =>{
+                         if(ic.children.length > 0){
+                           ic.children.forEach(icc => {
+                             if(icc.id === item.locationId){
                                obj.push({
                                  warehouseName:itemm.name,
-                       regionName:itemmm.name
+                                 regionName:itemmm.name,
+                                 code:icc.code
                                })
                              }
                            })
                          }
                        })
+                     }
+                   }
+                  })
+                }
               })
+            })
+            console.log(obj)
             this.storageSpaceList = obj;
           })
         }
@@ -366,6 +379,42 @@ export default {
       });
     },
   },
+  watch:{
+    'params.orderLocationCreateReqVOList'(val){
+      console.log(val,'123')
+      getByWarehouseId().then(r =>{
+        console.log(r,'仓库')
+        let obj = [];
+        val.forEach(item => {
+          r.data.forEach(itemm => {
+            if(item.wareId === itemm.id){
+              itemm.children.forEach(itemmm => {
+                if(itemmm.id === item.areaId){
+                  if(itemmm.positionList.length > 0){
+                    itemmm.positionList.forEach(ic =>{
+                    if(ic.children.length > 0){
+                      ic.children.forEach(icc => {
+                        if(icc.id === item.locationId){
+                          obj.push({
+                            warehouseName:itemm.name,
+                            regionName:itemmm.name,
+                            code:icc.code
+                          })
+                        }
+                      })
+                    }
+                    })
+                  }
+                }
+              })
+            }
+          })
+        })
+        console.log(obj,'obj')
+        this.storageSpaceList = obj;
+      })
+    }
+  }
 }
 </script>