解决产品价格列表冲突

src/api/ecw/customerCommissionInfo.js

+import request from '@/utils/request'
+
+// 创建客户佣金详情
+export function createCustomerCommissionInfo(data) {
+  return request({
+    url: '/ecw/customer-commission-info/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新客户佣金详情
+export function updateCustomerCommissionInfo(data) {
+  return request({
+    url: '/ecw/customer-commission-info/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户佣金详情
+export function deleteCustomerCommissionInfo(id) {
+  return request({
+    url: '/ecw/customer-commission-info/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得客户佣金详情
+export function getCustomerCommissionInfo(id) {
+  return request({
+    url: '/ecw/customer-commission-info/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得客户佣金详情分页
+export function getCustomerCommissionInfoPage(query) {
+  return request({
+    url: '/ecw/customer-commission-info/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出客户佣金详情 Excel
+export function exportCustomerCommissionInfoExcel(query) {
+  return request({
+    url: '/ecw/customer-commission-info/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/ecw/productBrandEmpower.js

+import request from '@/utils/request'
+
+// 创建商品品牌授权
+export function createProductBrandEmpower(data) {
+  return request({
+    url: '/ecw/product-brand-empower/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新商品品牌授权
+export function updateProductBrandEmpower(data) {
+  return request({
+    url: '/ecw/product-brand-empower/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商品品牌授权
+export function deleteProductBrandEmpower(id) {
+  return request({
+    url: '/ecw/product-brand-empower/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得商品品牌授权
+export function getProductBrandEmpower(id) {
+  return request({
+    url: '/ecw/product-brand-empower/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得商品品牌授权分页
+export function getProductBrandEmpowerPage(query) {
+  return request({
+    url: '/ecw/product-brand-empower/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出商品品牌授权 Excel
+export function exportProductBrandEmpowerExcel(query) {
+  return request({
+    url: '/ecw/product-brand-empower/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/ecw/productBrank.js

+import request from '@/utils/request'
+
+// 创建品牌
+export function createProductBrank(data) {
+  return request({
+    url: '/ecw/product-brank/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新品牌
+export function updateProductBrank(data) {
+  return request({
+    url: '/ecw/product-brank/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品牌
+export function deleteProductBrank(id) {
+  return request({
+    url: '/ecw/product-brank/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得品牌
+export function getProductBrank(id) {
+  return request({
+    url: '/ecw/product-brank/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得品牌分页
+export function getProductBrankPage(query) {
+  return request({
+    url: '/ecw/product-brank/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出品牌 Excel
+export function exportProductBrankExcel(query) {
+  return request({
+    url: '/ecw/product-brank/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/utils/dict.js

@@ -79,6 +79,13 @@ export const DICT_TYPE = {
   ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type',
   ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status',
   PWD_TYPE: 'pwd_type',
+  BRAND_REG_TYPE: 'brand_registry_type',
+  BRAND_AUTH_STATUS: 'brand_authorization_status',
+  BRAND_CUSTOMER_CHARGING_MODEL: 'customer_charging_model',
+  COUNTRY: 'country', // 国家地区
+  AREA_CODE: 'area_code', // 区号
+  SOCIAL: 'customer_social_tools', // 社交软件
+  IS_DEFAULT: 'is_default', // 默认联系人
 
 }
 

src/views/ecw/product/index.vue

@@ -191,33 +191,6 @@
           </el-input>
         </el-form-item>
         
-        <el-form-item label="默认重货标准" prop="zhongLinjie" v-if="false">
-          <el-row  class="mb8">
-            <el-col :span="12">
-              <el-input v-model.number="form.zhongLinjie" type="number">
-                <template slot="append">kg/cbm</template>
-              </el-input>
-            </el-col>
-            <el-col :span="10">
-              <el-switch v-model="zhongLinjieFlag" @change="zhongpaoChange('zhong')"></el-switch>
-            </el-col>
-          </el-row>
-        </el-form-item>
-
-        <el-form-item label="默认泡货标准" prop="paoLinjie" v-if="false">
-          <el-row  class="mb8">
-            <el-col :span="12">
-              <el-input v-model.number="form.paoLinjie" type="number">
-                <template slot="append">kg/cbm</template>
-              </el-input>
-            </el-col>
-            <el-col :span="10">
-              <el-switch v-model="paoLinjieFlag" @change="zhongpaoChange('pao')"></el-switch>
-            </el-col>
-          </el-row>
-        </el-form-item>
-        
-        
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -233,7 +206,6 @@ import { getProductAttrList } from "@/api/ecw/productAttr";
 import { getProductTypeList } from "@/api/ecw/productType";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import { CommonStatusEnum, AuditStatusEnum } from '@/utils/constants';
-import { getZhongPaoPage } from "@/api/ecw/zhongPao";
 import { uploadFile } from "@/api/infra/file";
 
 export default {
@@ -252,12 +224,6 @@ export default {
       packagingList:[],
       //货柜位置
       locationList:[],
-      //重货默认开启状态
-      zhongLinjieFlag: true,
-      //泡货默认开启状态
-      paoLinjieFlag: true,
-      //重泡货默认配置
-      zhongPaoInfo: {},
 
       // 遮罩层
       loading: true,
@@ -297,8 +263,6 @@ export default {
         packaging:[{ required: true, message: "包装要求不能为空", trigger: "blur" }],
         containerLocation:[{ required: true, message: "默认货柜位置不能为空", trigger: "blur" }],
         square:[{ required: true, message: "默认方数不能为空", trigger: "blur" }],
-        // zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
-        // paoLinjie:[{ required: true, message: "默认泡货标准不能为空", trigger: "blur" }],
         needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
       },
 
@@ -351,27 +315,8 @@ export default {
     this.getAttrList();
     this.getTypeList();
     this.getList();
-    this.getZhongPaoInfo();
   },
   methods: {
-    /**获取重泡货默认配置 */
-    getZhongPaoInfo() {
-      getZhongPaoPage({}).then(response => {
-          let list = response.data.list;
-          if (list && list.length > 0) {
-            this.zhongPaoInfo = list[0];
-          } 
-      })
-    },
-
-    zhongpaoChange(type) {
-      if(type == 'zhong') {
-        this.setZhongValue();
-      } else if(type == 'pao') {
-        this.setPaoValue();
-      }
-    },
-
     /** 获取产品属性列表 */
     getAttrList() {
       getProductAttrList().then(response => {
@@ -463,8 +408,6 @@ export default {
       if(this.queryParams.typeId) {
         this.form.typeId = this.queryParams.typeId;
       }
-      this.setZhongValue();
-      this.setPaoValue();
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -480,34 +423,9 @@ export default {
         this.form.attrArray = attrArray;
         this.open = true;
         this.title = "修改商品";
-
-        if(!this.form.zhongLinjie) {
-          this.setZhongValue();
-        }
-        if(!this.form.paoLinjie) {
-          this.setPaoValue();
-        }
-        
-        
       });
     },
 
-    setZhongValue() {
-      if(this.zhongLinjieFlag && this.zhongPaoInfo.zhongLinjie) {
-          this.form.zhongLinjie = parseFloat(this.zhongPaoInfo.zhongLinjie);
-      } else {
-        // this.form.zhongLinjie = null;
-      }
-    },
-
-    setPaoValue() {
-      if(this.paoLinjieFlag && this.zhongPaoInfo.paoLinjie) {
-        this.form.paoLinjie = parseFloat(this.zhongPaoInfo.paoLinjie);
-      } else {
-        // this.form.paoLinjie = null;
-      }
-    },
-
     /** 提交按钮 */
     submitForm() {
       console.log(this.form);

src/views/ecw/warehouse/index.vue

@@ -571,6 +571,7 @@ export default {
     toRouteList(row, tradeType) {
       this.routeQueryParam.id = row.id;
       this.routeQueryParam.tradeType = tradeType;
+      this.routeQueryParam.pageNo = 1;
       this.showRouteList = true;
       this.routeLoadig = true;
       this.getRouteList();
@@ -580,6 +581,7 @@ export default {
     getRouteList() {
         routerList(this.routeQueryParam).then(response => {
           this.routeList = response.data.list;
+          this.routeCount = response.data.total;
           this.routeLoadig = false;
       });
     },