Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/channel.js

@@ -21,7 +21,7 @@ export function updateChannel(data) {
 // 删除渠道管理
 export function deleteChannel(id) {
   return request({
-    url: '/ecw/channel/delete?id=' + id,
+    url: '/ecw/channel/delete?channelId=' + id,
     method: 'delete'
   })
 }

src/api/ecw/coupon.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建优惠券信息
 export function createCoupon(data) {
   return request({
-    url: '/ecw/coupon/createOrUpdate',
+    url: '/product/coupon/createOrUpdate',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function createCoupon(data) {
 // 更新优惠券信息
 export function updateCoupon(data) {
   return request({
-    url: '/ecw/coupon/update',
+    url: '/product/coupon/update',
     method: 'put',
     data: data
   })
@@ -21,7 +21,7 @@ export function updateCoupon(data) {
 // 删除优惠券信息
 export function deleteCoupon(id) {
   return request({
-    url: '/ecw/coupon/delete?id=' + id,
+    url: '/product/coupon/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -29,7 +29,7 @@ export function deleteCoupon(id) {
 // 获得优惠券信息
 export function getCoupon(id) {
   return request({
-    url: '/ecw/coupon/get?couponId=' + id,
+    url: '/product/coupon/get?couponId=' + id,
     method: 'get'
   })
 }
@@ -37,7 +37,7 @@ export function getCoupon(id) {
 // 获得优惠券信息分页
 export function getCouponPage(query) {
   return request({
-    url: '/ecw/coupon/page',
+    url: '/product/coupon/page',
     method: 'get',
     params: query
   })
@@ -46,7 +46,7 @@ export function getCouponPage(query) {
 // 获得优惠券下拉
 export function getCouponSelect(query) {
   return request({
-    url: '/ecw/coupon/select',
+    url: '/product/coupon/select',
     method: 'get',
     params: query
   })
@@ -55,7 +55,7 @@ export function getCouponSelect(query) {
 // 导出优惠券信息 Excel
 export function exportCouponExcel(query) {
   return request({
-    url: '/ecw/coupon/export-excel',
+    url: '/product/coupon/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/api/ecw/zhongPao.js

@@ -18,6 +18,14 @@ export function updateZhongPao(data) {
   })
 }
 
+// 删除重泡货配置
+export function deleteZhongPao(id) {
+  return request({
+    url: '/ecw/zhong-pao/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
 // 获得重泡货配置
 export function getZhongPao(id) {
   return request({

src/components/ProductsSelector/index.vue

@@ -36,92 +36,113 @@
   </el-row>
 </template>
 <script>
-import {getProductPage} from '@/api/ecw/product'
-import {getProductTypeList} from '@/api/ecw/productType'
-import {getProductAttrList} from '@/api/ecw/productAttr'
+import { getProductPage } from '@/api/ecw/product'
+import { getProductTypeList } from '@/api/ecw/productType'
+import { getProductAttrList } from '@/api/ecw/productAttr'
 
 export default {
-    data(){
+  props: {
+    defaultIds: {
+      type: Array,
+      default: []
+    }
+  },
+  data() {
     return {
-            list:[],
+      list: [],
       page: 1,
       pages: 1,
-            queryParams:{
+      queryParams: {
         page: 1,
         attrId: null,
         titleZh: null,
         typeId: null
       },
-            choosedList:[],
-            typeList:[],
-            attrList:[]
+      choosedList: [],
+      typeList: [],
+      attrList: []
     }
   },
-    computed:{
-        ids(){
+  computed: {
+    ids: {
+      get() {
         let arr = []
         this.choosedList.forEach(item => {
           arr.push(item.id)
         })
         return arr
+      },
+      set(v) {
+
+      }
     }
   },
-    watch:{
-        ids(val){
+  watch: {
+    ids(val) {
       this.$emit('input', val)
     }
   },
-    created(){
+  created() {
     getProductTypeList().then(res => this.typeList = res.data)
     getProductAttrList().then(res => this.attrList = res.data)
-
     this.reLoad()
+    this.ids = this.defaultIds //数据回显
   },
-    methods:{
-        reLoad(){
+  methods: {
+    reLoad() {
       this.queryParams.page = 1
       this.list = []
       this.getList()
     },
-        loadNextPage(){
-            if(this.page >= this.pages){
+    loadNextPage() {
+      if (this.page >= this.pages) {
         return this.$message.error('已加载全部')
       }
-            this.queryParams.page ++
+      this.queryParams.page++
       this.getList()
     },
-        getList(){
+    getList() {
       getProductPage(this.queryParams).then(res => {
         this.list = res.data.list //.concat(res.data.list || [])
         this.page = res.data.page
         this.pages = res.data.pages
+        this.choosedList = [] //搜搜重置，数据回显
+        if (this.defaultIds.length > 0) {
+          this.defaultIds.map(item => {
+            this.list.map(items => {
+              if (items.id == item) {
+                this.choosedList.push(items)
+              }
+            })
+          })
+        }
       })
     },
-        toggleCheck(item, checked){
-            if(checked){
+    toggleCheck(item, checked) {
+      if (checked) {
         this.choose(item)
-            }else{
+      } else {
         this.remove(item)
       }
     },
-        choose(item){
+    choose(item) {
       this.choosedList.push(item)
     },
-        remove(item){
-            this.choosedList.forEach((choosed,index) => {
-                if(choosed.id==item.id) this.choosedList.splice(index,1)
+    remove(item) {
+      this.choosedList.forEach((choosed, index) => {
+        if (choosed.id == item.id) this.choosedList.splice(index, 1)
       })
     }
   }
 }
 </script>
 <style scoped lang="scss">
-.header{
-    >div{
+.header {
+  > div {
     margin-right: 5px;
   }
 }
-.list{
+.list {
   height: 200px;
   border: 1px solid #ccc;
   overflow-y: auto;
@@ -130,7 +151,7 @@ export default {
 
   display: flex;
   flex-wrap: wrap;
-    .item{
+  .item {
     width: 50%;
     line-height: 20px;
     height: 50px;

src/utils/dict.js

@@ -97,6 +97,8 @@ export const DICT_TYPE = {
   ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type',
   ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status',
   PWD_TYPE: 'pwd_type',
+  ZHONG_PAO_TYPE: 'zhong_pao_type',
+  TRANSPORT_TYPE: 'transport_type',
   BRAND_REG_TYPE: 'brand_registry_type',
   BRAND_AUTH_STATUS: 'brand_authorization_status',
   BRAND_CUSTOMER_CHARGING_MODEL: 'customer_charging_model',

src/views/ecw/channel/index.vue

@@ -73,11 +73,23 @@
       <el-table-column label="名称" align="center" prop="nameZh" />
       <!-- <el-table-column label="名称-英文" align="center" prop="nameEn" /> -->
       <el-table-column label="内部名称" align="center" prop="internalNameZh" />
-      <!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" /> -->
+      <!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" />
       <el-table-column label="类型编码" align="center" prop="typeNumber" />
-      <el-table-column label="仓库ID字符串" align="center" prop="warehouseIds" />
+      <!-- <el-table-column label="仓库id字符串" align="center" prop="warehouseIds" /> -->
+      <el-table-column label="仓库名" align="center" prop="warehouseNameList" width="180">
+       <template slot-scope="scope">
+       <el-scrollbar style="margin-right: 6px;">
+           <div class="left">
+          <el-tag v-for="warehouseName in scope.row.warehouseNameList"
+             :key="warehouseName.index">
+             <span>{{warehouseName}}</span>
+           </el-tag>
+          </div>
+       </el-scrollbar>
+       </template>
+      </el-table-column>
       <el-table-column label="排序" align="center" prop="sort" />
-      <el-table-column label="快递ID" align="center" prop="expressId" />
+      <el-table-column label="快递公司" align="center" prop="companyName" />
       <el-table-column label="预计时间(天)" align="center" prop="etaTime" />
       <el-table-column label="渠道代理" align="center" prop="channelAgent" />
       <el-table-column label="备注" align="center" prop="remarksZh" />
@@ -262,3 +274,26 @@ export default {
   }
 };
 </script>
+
+<style lang="scss">
+
+  .left {
+
+    .el-tag {
+            background-color: #e6f6fd;
+            border: 1px solid #ccecfb;
+            display: inline-block;
+            height:auto;
+            padding: 0 10px;
+            line-height: 30px;
+            font-size: 12px;
+            color: #02a1e9;
+            border-radius: 4px;
+            box-sizing: border-box;
+            white-space: nowrap;
+
+        }
+
+   }
+
+</style>

src/views/ecw/currency/index.vue

@@ -47,7 +47,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
+    100外币兑人民币（CNY）汇率表
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="" align="center" prop="id" />

src/views/ecw/productAttr/edit.vue

@@ -2,8 +2,8 @@
   <div class="app-container">
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
-      <el-form-item label="适用商品" prop="idList" v-if="form.type != 1">
-        <products-selector v-model="form.idList" />
+      <el-form-item label="适用商品" prop="idList">
+        <products-selector :defaultIds="form.idList" v-model="form.idList" />
       </el-form-item>
 
       <el-form-item label="货柜位置" prop="containerLocation">
@@ -36,10 +36,10 @@
         <el-checkbox style="width: 100px" v-model="checked[6]">需要修改</el-checkbox>
         <dict-selector v-if="checked[6]" form-type="checkbox" :type="DICT_TYPE.ECW_ORDER_ATTR" v-model="form.attrId" multiple />
       </el-form-item>
-      <!-- <el-form-item label="商品材质" prop="">
+      <el-form-item label="商品材质" prop="materialType">
         <el-checkbox style="width: 100px" v-model="checked[7]">需要修改</el-checkbox>
-        <dict-selector v-if="checked[7]" form-type="checkbox" :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.status" multiple />
-      </el-form-item> -->
+        <dict-selector v-if="checked[7]" form-type="checkbox" :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.materialType" multiple />
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -75,11 +75,12 @@ export default {
         "needBook": undefined,
         "packaging": undefined,
         "requirements": undefined,
-        "square": undefined
+        "square": undefined,
+        "materialType": undefined
       },
       // 表单校验
       rules: {},
-      checked: [false, false, false, false, false, false, false]
+      checked: [false, false, false, false, false, false, false, false]
     };
   },
   computed: {
@@ -88,7 +89,7 @@ export default {
   watch: {
     'form.idList'(val) {
       if (val.length > 0) {
-        this.form.isAllProduct = undefined
+        this.form.isAllProduct = 0
       } else {
         this.form.isAllProduct = 1
       }
@@ -96,6 +97,7 @@ export default {
   },
   created() {
     this.reset()
+    this.form.idList = this.$route.query && this.$route.query.ids ? [...this.$route.query.ids].map(item => { return Number(item) }) : []
   },
   methods: {
     /** 表单重置 */
@@ -109,7 +111,8 @@ export default {
         "needBook": undefined,
         "packaging": undefined,
         "requirements": undefined,
-        "square": undefined
+        "square": undefined,
+        "materialType": undefined
       };
       this.resetForm("form");
     },
@@ -130,17 +133,3 @@ export default {
   },
 };
 </script>
\ No newline at end of file
-<style scoped lang="scss">
-.fee-item {
-  padding: 5px 0;
-  > div {
-    margin-right: 5px;
-  }
-}
-.coupon-list {
-  max-height: 200px;
-  border: 1px solid #ccc;
-  padding: 10px;
-  overflow-y: auto;
-}
-</style>
\ No newline at end of file

src/views/system/helpDoc/index.vue

@@ -82,7 +82,7 @@
           <editor  v-model="form.contentZh" :min-height="192"/>
         </el-form-item>
         <el-form-item label="内容英语" prop="contentEn">
-          <editor v-model="form.contentZh" :min-height="192"/>
+          <editor  v-model="form.contentEn" :min-height="192"/>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">