浏览代码

缩小间距

chenrui 4 年之前
父节点
当前提交
89ec94e6a0
共有 39 个文件被更改,包括 497 次插入108 次删除
  1. 28 0
      src/api/dealerScope.js
  2. 11 0
      src/config/router.config.js
  3. 2 2
      src/views/allocationManagement/transferOut/detail.vue
  4. 2 2
      src/views/allocationManagement/transferOut/edit.vue
  5. 1 1
      src/views/basicData/warehouse/storingLocation/list.vue
  6. 1 1
      src/views/customerManagement/customerInfo/edit.vue
  7. 50 35
      src/views/dealerManagement/merchantInfoManagement/detailModal.vue
  8. 9 3
      src/views/dealerManagement/merchantInfoManagement/edit.vue
  9. 20 12
      src/views/dealerManagement/merchantInfoManagement/list.vue
  10. 329 0
      src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue
  11. 5 9
      src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue
  12. 5 9
      src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue
  13. 1 1
      src/views/financialManagement/inventoryReview/detail.vue
  14. 1 1
      src/views/financialManagement/returnConfirmation/detail.vue
  15. 1 1
      src/views/inventoryManagement/inventoryChecking/detail.vue
  16. 1 1
      src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue
  17. 1 1
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  18. 1 1
      src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue
  19. 1 1
      src/views/inventoryManagement/inventoryChecking/overall.vue
  20. 2 2
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  21. 2 2
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  22. 1 1
      src/views/productManagement/productInfo/edit.vue
  23. 1 1
      src/views/promotionRulesManagement/promotionRules/detail.vue
  24. 1 1
      src/views/promotionRulesManagement/promotionRules/importGuideModal.vue
  25. 1 1
      src/views/promotionRulesManagement/promotionRules/rule.vue
  26. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/detail.vue
  27. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  28. 2 2
      src/views/salesManagement/backorder/detail.vue
  29. 2 2
      src/views/salesManagement/outboundOrder/detail.vue
  30. 2 2
      src/views/salesManagement/pushOrderManagement/detail.vue
  31. 2 2
      src/views/salesManagement/salesQuery/detail.vue
  32. 2 2
      src/views/salesManagement/salesReturn/detail.vue
  33. 1 1
      src/views/salesManagement/salesReturn/list.vue
  34. 1 1
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  35. 1 1
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  36. 1 1
      src/views/salesManagement/waitDispatch/queryPart.vue
  37. 1 1
      src/views/supplierManagement/associatedProduct/add.vue
  38. 1 1
      src/views/supplierManagement/supplierInfo/edit.vue
  39. 1 1
      vue.config.js

+ 28 - 0
src/api/dealerScope.js

@@ -0,0 +1,28 @@
+import { axios } from '@/utils/request'
+
+//  经销权 列表 有分页
+export const dealerScopeList = (params) => {
+  const url = `/dealerScope/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  经销权  添加
+export const dealerScopeSave = (params) => {
+  return axios({
+    url: '/dealerScope/addDealerScope',
+    data: params,
+    method: 'post'
+  })
+}
+// 经销权 删除
+export const dealerScopeDel = (params) => {
+  return axios({
+    url: `/dealerScope/deleteBySn/${params.sn}`,
+    method: 'get'
+  })
+}

+ 11 - 0
src/config/router.config.js

@@ -414,6 +414,17 @@ export const asyncRouterMap = [
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
+              },
+              {
+                path: 'permissionSetting/:sn',
+                name: 'merchantInfoManagementSet',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/dealerManagement/merchantInfoManagement/permissionSetting.vue'),
+                meta: {
+                  title: '经销权设置',
+                  icon: 'file-text',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
               }
             ]
           },

+ 2 - 2
src/views/allocationManagement/transferOut/detail.vue

@@ -137,10 +137,10 @@ export default {
 <style lang="less">
   .allocateBillDetail-wrap{
     .allocateBillDetail-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .allocateBillDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 2 - 2
src/views/allocationManagement/transferOut/edit.vue

@@ -382,10 +382,10 @@ export default {
 <style lang="less">
   .allocateBillEdit-wrap{
     .allocateBillEdit-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .allocateBillEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 1 - 1
src/views/basicData/warehouse/storingLocation/list.vue

@@ -153,7 +153,7 @@ export default {
 <style lang="less">
   .storingLocationList-wrap{
     .storingLocationList-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 1 - 1
src/views/customerManagement/customerInfo/edit.vue

@@ -334,7 +334,7 @@ export default {
 <style lang="less">
 .customerManagementEdit-wrap {
 	.customerManagementEdit-back {
-		margin-bottom: 15px;
+		margin-bottom: 10px;
 	}
 }
 </style>

+ 50 - 35
src/views/dealerManagement/merchantInfoManagement/detailModal.vue

@@ -11,50 +11,62 @@
     <div v-if="form">
       <a-collapse :activeKey="['1','2','3']" class="merchantInfoManagement-cont-m">
         <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions :column="4" bordered>
-            <a-descriptions-item label="经销商名称">{{ form.dealerName }}</a-descriptions-item>
-            <a-descriptions-item label="经销商别名">{{ form.dealerAlias }}</a-descriptions-item>
-            <a-descriptions-item label="商户类型">{{ form.dealerTypeDictValue }}</a-descriptions-item>
-            <a-descriptions-item label="联系人1">{{ form.contact }}</a-descriptions-item>
-            <a-descriptions-item label="联系手机1">{{ form.contactMobile }}</a-descriptions-item>
-            <a-descriptions-item label="联系角色1">{{ form.contactRole }}</a-descriptions-item>
-            <a-descriptions-item label="联系电话">{{ form.dealerTelephone }}</a-descriptions-item>
-            <a-descriptions-item label="地址">{{ form.provinceName }}-{{ form.cityName }}-{{ form.districtName }} {{ form.address }}</a-descriptions-item>
+          <a-descriptions :column="2" bordered>
+            <a-descriptions-item label="经销商名称">{{ form.dealerName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="经销商别名">{{ form.dealerAlias || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="商户类型">{{ form.dealerTypeDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="联系人1">{{ form.contact || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="联系手机1">{{ form.contactMobile || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="联系角色1">{{ form.contactRole || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="联系电话">{{ form.dealerTelephone || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="地址">
+              <span v-if="form.provinceName || form.cityName || form.districtName || form.address">{{ form.provinceName }}{{ form.cityName }}{{ form.districtName }}{{ form.address }}</span>
+              <span v-else>--</span>
+            </a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>
       </a-collapse>
       <a-collapse class="merchantInfoManagement-cont-m">
         <a-collapse-panel key="2" header="公司信息">
-          <a-descriptions :column="4" bordered>
-            <a-descriptions-item label="经营方式">{{ form.busniessMode }}</a-descriptions-item>
-            <a-descriptions-item label="经营项目">{{ form.busniessItmes }}</a-descriptions-item>
-            <a-descriptions-item label="公司规模">{{ form.busniessScope }}</a-descriptions-item>
-            <a-descriptions-item label="成立时间">{{ form.buildDate }}</a-descriptions-item>
-            <a-descriptions-item label="一般纳税人">{{ form.isTaxpayer == 1 ? '是':'否' }}</a-descriptions-item>
-            <a-descriptions-item label="身份证号码">{{ form.indentityCard }}</a-descriptions-item>
-            <a-descriptions-item label="生日">{{ form.brithday }}</a-descriptions-item>
-            <a-descriptions-item label="籍贯">{{ form.nativePlace }}</a-descriptions-item>
-            <a-descriptions-item label="邮箱">{{ form.mail }}</a-descriptions-item>
-            <a-descriptions-item label="联系人2">{{ form.contact2 }}</a-descriptions-item>
-            <a-descriptions-item label="联系角色2">{{ form.contractRole2 }}</a-descriptions-item>
-            <a-descriptions-item label="联系手机2">{{ form.contactMobile2 }}</a-descriptions-item>
-            <a-descriptions-item label="邮政编码">{{ form.zipCode }}</a-descriptions-item>
-            <a-descriptions-item label="收货人">{{ form.receiveContact }}</a-descriptions-item>
-            <a-descriptions-item label="收货人电话">{{ form.receiveMobile }}</a-descriptions-item>
-            <a-descriptions-item label="收货地址">{{ form.receiveProvinceName }}-{{ form.receiveCityName }}-{{ form.receiveDistrictName }} {{ form.receiveAddress }}</a-descriptions-item>
-            <a-descriptions-item label="银行账户">{{ form.tradeAccountName }}</a-descriptions-item>
-            <a-descriptions-item label="开户行">{{ form.tradeBankName }}</a-descriptions-item>
-            <a-descriptions-item label="银行账号">{{ form.tradeBankAccount }}</a-descriptions-item>
+          <a-descriptions :column="2" bordered>
+            <a-descriptions-item label="经营方式">{{ form.busniessMode || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="经营项目">{{ form.busniessItmes || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="公司规模">{{ form.busniessScope || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="成立时间">{{ form.buildDate || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="一般纳税人">
+              <span v-if="form.isTaxpayer">{{ form.isTaxpayer == 1 ? '是':'否' }}</span>
+              <span v-else>--</span>
+            </a-descriptions-item>
+            <a-descriptions-item label="身份证号码">{{ form.indentityCard || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="生日">{{ form.brithday || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="籍贯">{{ form.nativePlace || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="邮箱">{{ form.mail || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="联系人2">{{ form.contact2 || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="联系角色2">{{ form.contractRole2 || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="联系手机2">{{ form.contactMobile2 || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="邮政编码">{{ form.zipCode || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货人">{{ form.receiveContact || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货人电话">{{ form.receiveMobile || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货地址">
+              <span v-if="form.receiveProvinceName || form.receiveCityName || form.receiveDistrictName || form.receiveAddress">{{ form.receiveProvinceName }}{{ form.receiveCityName }}{{ form.receiveDistrictName }}{{ form.receiveAddress }}</span>
+              <span v-else>--</span>
+            </a-descriptions-item>
+            <a-descriptions-item label="银行账户">{{ form.tradeAccountName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="开户行">{{ form.tradeBankName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="银行账号">{{ form.tradeBankAccount || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>
       </a-collapse>
       <a-collapse class="merchantInfoManagement-cont-m">
         <a-collapse-panel key="3" header="总部信息">
-          <a-descriptions :column="4" bordered>
-            <a-descriptions-item label="箭冠汽配代码">{{ form.jgAutoPartsCode }}</a-descriptions-item>
-            <a-descriptions-item label="门头更换日期">{{ form.jgDoorHeaderChangeTime }}</a-descriptions-item>
-            <a-descriptions-item label="特约价是否可见">{{ form.isShowSpecialPrice == 1 ? '是':'否' }}</a-descriptions-item>
-            <a-descriptions-item label="备注">{{ form.remark }}</a-descriptions-item>
+          <a-descriptions :column="2" bordered>
+            <a-descriptions-item label="箭冠汽配代码">{{ form.jgAutoPartsCode || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="门头更换日期">{{ form.jgDoorHeaderChangeTime || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="特约价是否可见">
+              <span v-if="form.isShowSpecialPrice">{{ form.isShowSpecialPrice == 1 ? '是':'否' }}</span>
+              <span v-else>--</span>
+            </a-descriptions-item>
+            <a-descriptions-item label="备注">{{ form.remark || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>
       </a-collapse>
@@ -177,8 +189,11 @@ export default {
     .ant-modal-body {
       padding: 40px 40px 24px;
     }
+    .ant-descriptions-item-label.ant-descriptions-item-colon{
+      width: 147px;
+    }
     .merchantInfoManagement-cont-m{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .btn-cont {
       text-align: center;

+ 9 - 3
src/views/dealerManagement/merchantInfoManagement/edit.vue

@@ -350,8 +350,14 @@
       </a-card>
     </a-form-model>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="merchantInfoManagementEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button
+          type="primary"
+          class="button-primary"
+          id="merchantInfoManagementEdit-submit-btn"
+          size="large"
+          @click="handleSubmit"
+          style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
   </div>
@@ -626,7 +632,7 @@ export default {
 <style lang="less">
   .merchantInfoManagementEdit-wrap{
     .merchantInfoManagementEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 20 - 12
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -58,11 +58,16 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2070 }"
+      :scroll="{ x: 2240, y: tableHeight }"
       bordered>
+      <!-- 经销商 -->
+      <template slot="dealerName" slot-scope="text, record">
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dealerName }}</span>
+      </template>
       <!-- 区域 -->
       <template slot="area" slot-scope="text, record">
-        {{ record.subareaNameSet&&record.subareaNameSet[0] }}
+        <span v-if="record.subareaNameSet&&record.subareaNameSet[0]">{{ record.subareaNameSet&&record.subareaNameSet[0] }}</span>
+        <span v-else>--</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -71,8 +76,6 @@
         <a-button size="small" type="link" class="button-primary" v-if="record.auditState != 'WAIT'" @click="handleDistribution(record)">经销权</a-button>
         <a-button size="small" type="link" class="button-primary" @click="handleLevel(record)">价格级别</a-button>
         <a-button size="small" type="link" class="button-info" @click="handleEdit(record)">编辑</a-button>
-        <a-button size="small" type="link" class="button-success" @click="handleDetail(record)">详情</a-button>
-        <!-- <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'PASS'" @click="handleDel(record)">删除</a-button> -->
       </template>
     </s-table>
     <!-- 产品详情 -->
@@ -96,6 +99,7 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
+      tableHeight: 0,
       queryParam: { //  查询条件
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
@@ -110,24 +114,26 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '区域', scopedSlots: { customRender: 'area' }, width: 140, align: 'center' },
-        { title: '商户名称', dataIndex: 'dealerName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '商户别名', dataIndex: 'dealerAlias', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域', scopedSlots: { customRender: 'area' }, width: 200, align: 'center' },
+        { title: '商户名称', scopedSlots: { customRender: 'dealerName' }, align: 'center', ellipsis: true },
+        { title: '商户别名', dataIndex: 'dealerAlias', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '联系人', dataIndex: 'contact', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '联系电话', dataIndex: 'dealerTelephone', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系人', dataIndex: 'contact', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系电话', dataIndex: 'dealerTelephone', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '绑定手机号码', dataIndex: 'contactMobile', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核状态', dataIndex: 'auditStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '生效时间', dataIndex: 'cooperateEffectiveTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 260, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center', fixed: 'right' }
       ],
       loading: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        // 创建时间
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 440
+        }
         return dealerQueryList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -185,7 +191,9 @@ export default {
       this.$refs.updateDealerLevel.setData(row)
     },
     // 经销权
-    handleDistribution () {},
+    handleDistribution (row) {
+      this.$router.push({ name: `merchantInfoManagementSet`, params: { sn: row.dealerSn } })
+    },
     // 审核
     handleAudit (row) {
       this.itemId = row.dealerSn

+ 329 - 0
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="permissionSetting-wrap">
+    <a-page-header :ghost="false" :backIcon="false" @back="handleBack" class="permissionSetting-cont">
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="permissionSetting-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+      </template>
+    </a-page-header>
+    <a-card size="small" :bordered="false" class="permissionSetting-main">
+      <!-- 搜索条件 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品名称">
+                <a-input id="permissionSetting-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品编码">
+                <a-input id="permissionSetting-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="品牌">
+                <a-select
+                  placeholder="请选择"
+                  id="permissionSetting-productBrandSn"
+                  allowClear
+                  v-model="queryParam.productBrandSn"
+                  :showSearch="true"
+                  option-filter-prop="children"
+                  :filter-option="filterOption">
+                  <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品分类">
+                  <a-cascader
+                    @change="changeProductType"
+                    expand-trigger="hover"
+                    change-on-select
+                    :options="productTypeList"
+                    :fieldNames="{ label: 'productTypeName', value: 'id', children: 'children' }"
+                    id="permissionSetting-productType"
+                    placeholder="请选择产品分类"
+                    allowClear
+                    v-model="productType" />
+                </a-form-item>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24">
+              <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="permissionSetting-refresh">查询</a-button>
+              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="permissionSetting-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 操作按钮 -->
+      <div class="table-operator">
+        <a-button id="permissionSetting-brand" type="primary" class="button-error" @click="choosePModal('brand')">选择产品品牌</a-button>
+        <a-button id="permissionSetting-type" type="primary" class="button-info" @click="choosePModal('type')">选择产品分类</a-button>
+        <a-button id="permissionSetting-product" type="primary" class="button-success" @click="choosePModal('product')">选择产品</a-button>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="default"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 1200, y: tableHeight }"
+        bordered>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <a-button size="small" type="link" class="button-error" @click="handleDel(record)">删除</a-button>
+        </template>
+      </s-table>
+    </a-card>
+    <!-- 选择产品品牌 -->
+    <chooseBrandModal :openModal="openBrandModal" :chooseData="chooseBrand" @close="openBrandModal=false" @ok="handleBrandOk" />
+    <!-- 选择产品分类 -->
+    <chooseTypeModal :openModal="openTypeModal" :chooseData="chooseType" @close="openTypeModal=false" @ok="handleTypeOk" />
+    <!-- 选择产品 -->
+    <chooseProductsModal :openModal="openProductsModal" :chooseData="chooseProducts" @close="openProductsModal=false" @ok="handleProductsOk" />
+  </div>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+import ChooseProductsModal from '@/views/common/chooseProductsModal.vue'
+import ChooseBrandModal from '@/views/common/chooseBrandModal.vue'
+import ChooseTypeModal from '@/views/common/chooseTypeModal.vue'
+import { productBrandQuery } from '@/api/productBrand'
+import { productTypeQuery } from '@/api/productType'
+import { dealerScopeList, dealerScopeDel } from '@/api/dealerScope'
+export default {
+  components: { STable, VSelect, ChooseProductsModal, ChooseBrandModal, ChooseTypeModal },
+  data () {
+    return {
+      advanced: false, // 高级搜索 展开/关闭
+      tableHeight: 0,
+      queryParam: { //  查询条件
+        name: '', //  产品名称
+        productCode: '', // 产品编码
+        productBrandSn: undefined, //  产品品牌
+        productTypeSn1: '', //  产品一级分类
+        productTypeSn2: '', //  产品二级分类
+        productTypeSn3: '' //  产品三级分类
+      },
+      productType: [],
+      disabled: false, //  查询、重置按钮是否可操作
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '添加时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型名称', dataIndex: 'origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 380
+        }
+        return dealerScopeList(Object.assign(parameter, this.queryParam, { dealerSn: this.$route.params.sn })).then(res => {
+          const data = res.data
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          this.disabled = false
+          return data
+        })
+      },
+      productBrandList: [], //  品牌下拉数据
+      productTypeList: [], //  分类下拉数据
+      openBrandModal: false, //  选择产品品牌
+      openTypeModal: false, //  选择产品分类
+      openProductsModal: false, //  选择产品
+      chooseBrand: [], //  所选品牌
+      chooseProducts: [], //  所选产品
+      chooseType: [] //  所选分类
+    }
+  },
+  methods: {
+    // 选择产品
+    choosePModal (type) {
+      const productList = []
+      const brandList = []
+      const typeList = []
+      // this.loadData.map(item => {
+      //   if (item.goodsType == 'PRODUCT') {
+      //     productList.push(item)
+      //   } else if (item.goodsType == 'BRAND') {
+      //     brandList.push(item)
+      //   } else if ((item.goodsType == 'TYPE_1') || (item.goodsType == 'TYPE_2') || (item.goodsType == 'TYPE_3')) {
+      //     typeList.push(item)
+      //   }
+      // })
+      if (type == 'product') { //  选择产品
+        this.chooseProducts = productList
+        this.openProductsModal = true
+      } else if (type == 'brand') { //  选择品牌
+        this.chooseBrand = brandList
+        this.openBrandModal = true
+      } else if (type == 'type') { //  选择分类
+        this.chooseType = typeList
+        this.openTypeModal = true
+      }
+    },
+    // 品牌
+    handleBrandOk (obj) {
+      console.log(obj, '---------------品牌')
+      this.chooseBrand = obj
+      this.changeData('brand')
+    },
+    // 产品
+    handleProductsOk (obj) {
+      console.log(obj, '---------------产品')
+      this.chooseProducts = obj
+      this.changeData('product')
+    },
+    // 分类
+    handleTypeOk (obj) {
+      console.log(obj, '---------------分类')
+      this.chooseType = obj
+      this.changeData('type')
+    },
+    changeData (type) {
+      const _this = this
+      if (type == 'product') { //  选择产品
+
+      } else if (type == 'brand') { //  选择品牌
+        if (_this.chooseBrand.length > 0) {
+          _this.chooseBrand.map(item => {
+            item.goodsType = 'BRAND'
+            item.goodsTypeName = '品牌'
+            item.goodsName = item.brandName
+            item.goodsSn = item.brandSn
+            delete item.id
+          })
+          this.setData()
+        }
+      } else if (type == 'type') { //  选择分类
+
+      }
+      const loadData = []
+
+      if (_this.chooseType.length > 0) {
+        _this.chooseType.map(item => {
+          const obj = {
+            goodsType: 'TYPE_' + item.productTypeLevel,
+            goodsTypeName: (item.productTypeLevel == 1 ? '一级' : item.productTypeLevel == 2 ? '二级' : item.productTypeLevel == 3 ? '三级' : '') + '分类',
+            goodsName: item.productTypeName,
+            goodsSn: item.productTypeSn,
+            orderGoodsUnit: undefined,
+            orderGoodsQty: ''
+          }
+          delete item.id
+          loadData.push(Object.assign(obj, item))
+        })
+      }
+      if (_this.chooseProducts.length > 0) {
+        _this.chooseProducts.map(item => {
+          const obj = {
+            goodsType: 'PRODUCT',
+            goodsTypeName: '产品',
+            goodsName: item.name,
+            name: item.name,
+            goodsCode: item.code,
+            goodsSn: item.productSn,
+            orderGoodsUnit: undefined,
+            orderGoodsQty: ''
+          }
+          delete item.id
+          loadData.push(Object.assign(obj, item))
+        })
+      }
+    },
+    // 删除
+    handleDel (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确认要删除吗?',
+        centered: true,
+        onOk () {
+          dealerScopeDel({ sn: row.dealerScopeSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetSearchForm () {
+      this.queryParam.name = ''
+      this.queryParam.productCode = ''
+      this.queryParam.productBrandSn = undefined
+      this.queryParam.productTypeSn1 = ''
+      this.queryParam.productTypeSn2 = ''
+      this.queryParam.productTypeSn3 = ''
+      this.productType = []
+      this.$refs.table.refresh(true)
+    },
+    // 返回
+    handleBack () {
+      this.$router.push({ name: 'merchantInfoManagementList' })
+    },
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    //  产品分类  change
+    changeProductType (val, opt) {
+      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    },
+    //  产品品牌  列表
+    getProductBrand () {
+      productBrandQuery({}).then(res => {
+        if (res.status == 200) {
+          this.productBrandList = res.data
+        } else {
+          this.productBrandList = []
+        }
+      })
+    },
+    //  产品分类  列表
+    getProductType () {
+      productTypeQuery({}).then(res => {
+        if (res.status == 200) {
+          this.productTypeList = res.data
+        } else {
+          this.productTypeList = []
+        }
+      })
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getProductBrand()
+      vm.getProductType()
+    })
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .permissionSetting-wrap{
+    .permissionSetting-cont{
+      margin-bottom: 10px;
+    }
+  }
+</style>

+ 5 - 9
src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue

@@ -7,7 +7,7 @@
     :title="title"
     v-model="isShow"
     @cancle="isShow=false"
-    width="40%">
+    :width="600">
     <div>
       <a-form-model
         ref="ruleForm"
@@ -32,12 +32,8 @@
             placeholder="请选择日期" />
         </a-form-model-item>
         <div style="display: flex;justify-content: center;padding: 30px 0;">
-          <a-button size="large" type="primary" @click="onSubmit">
-            确定
-          </a-button>
-          <a-button size="large" style="margin-left: 50px;" @click="cansel">
-            取消
-          </a-button>
+          <a-button type="primary" @click="onSubmit">确定</a-button>
+          <a-button style="margin-left: 50px;" @click="cansel">取消</a-button>
         </div>
       </a-form-model>
     </div>
@@ -62,8 +58,8 @@ export default {
       isShow: this.openUcModal, //  是否打开弹框
       title: '合作设置',
       dateFormat: 'YYYY-MM-DD hh:mm:ss',
-      labelCol: { span: 6 },
-      wrapperCol: { span: 14 },
+      labelCol: { span: 5 },
+      wrapperCol: { span: 16 },
       other: '',
       form: {
         dealerName: '',

+ 5 - 9
src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue

@@ -7,7 +7,7 @@
     :title="title"
     v-model="isShow"
     @cancle="isShow=false"
-    width="40%">
+    :width="600">
     <div>
       <a-form-model
         ref="ruleForm"
@@ -23,12 +23,8 @@
           <v-select code="DEALER_LEVEL" id="ucModal-dealerLevel" v-model="form.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
         </a-form-model-item>
         <div style="display: flex;justify-content: center;padding: 30px 0;">
-          <a-button size="large" type="primary" @click="onSubmit">
-            确定
-          </a-button>
-          <a-button size="large" style="margin-left: 50px;" @click="cansel">
-            取消
-          </a-button>
+          <a-button type="primary" @click="onSubmit">确定</a-button>
+          <a-button style="margin-left: 50px;" @click="cansel">取消</a-button>
         </div>
       </a-form-model>
     </div>
@@ -51,8 +47,8 @@ export default {
     return {
       isShow: this.openUdModal, //  是否打开弹框
       title: '价格级别设置',
-      labelCol: { span: 6 },
-      wrapperCol: { span: 14 },
+      labelCol: { span: 5 },
+      wrapperCol: { span: 16 },
       other: '',
       form: {
         dealerName: '',

+ 1 - 1
src/views/financialManagement/inventoryReview/detail.vue

@@ -149,7 +149,7 @@ export default {
 <style lang="less">
   .inventoryReviewDetail-wrap{
     .inventoryReviewDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .green{
       color: #19be6b;

+ 1 - 1
src/views/financialManagement/returnConfirmation/detail.vue

@@ -130,6 +130,6 @@ export default {
 
 <style lang="less">
   .warehousingAuditDetail-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/detail.vue

@@ -178,6 +178,6 @@ export default {
 <style lang="less">
 .inventoryCheckingDetail-cont,
 .inventoryCheckingDetail-back {
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 </style>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue

@@ -141,6 +141,6 @@
 
 <style lang="less">
   .financialAuditDetail-cont, .financialAuditDetail-back{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -182,6 +182,6 @@ export default {
 
 <style lang="less">
   .makeInventory-cont, .makeInventory-back{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue

@@ -139,6 +139,6 @@
 
 <style lang="less">
   .makeInventoryDetail-cont, .makeInventoryDetail-back{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 </style>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -102,7 +102,7 @@ export default {
       margin-bottom: 25px;
     }
     .inventoryCheckingOverall-cont, .inventoryCheckingOverall-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -314,10 +314,10 @@ export default {
 <style lang="less">
   .selfDisk-wrap{
     .selfDisk-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .selfDisk-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .import-btn{
         margin-left: 15px;
       }

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -213,10 +213,10 @@ export default {
 <style lang="less">
   .inventoryQueryWarehouseDetail-wrap{
     .inventoryQueryWarehouseDetail-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .inventoryQueryWarehouseDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .green{
       color: #19be6b;

+ 1 - 1
src/views/productManagement/productInfo/edit.vue

@@ -382,7 +382,7 @@ export default {
 <style lang="less">
   .productInfoEdit-wrap{
     .productInfoEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .upload{
       width: 100%!important;

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/detail.vue

@@ -224,7 +224,7 @@ export default {
 <style lang="less" scoped>
   .promotionRulesDetail-wrap{
     .promotionRulesDetail-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/importGuideModal.vue

@@ -103,7 +103,7 @@ export default {
     .importGuide-con{
       .explain-con{
         .explain-item{
-          margin-bottom: 15px;
+          margin-bottom: 10px;
           .explain-tit{
             font-weight: bold;
             span{

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/rule.vue

@@ -137,7 +137,7 @@ export default {
 <style lang="less" scoped>
   .promotionRulesList-rule-wrap{
     .promotionRulesList-rule-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/detail.vue

@@ -172,7 +172,7 @@ export default {
 
 <style lang="less">
   .bulkWarehousingOrderDetail-cont{
-    margin-bottom: 15px;
+    margin-bottom: 10px;
     .timeline-box{
       margin-top: 30px;
       .auxiliary-txt{

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -529,7 +529,7 @@ export default {
 <style lang="less">
   .bulkWarehousingOrderEdit-wrap{
     .bulkWarehousingOrderEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
       .sub-title{
         font-size: 12px;
         color: #808695;

+ 2 - 2
src/views/salesManagement/backorder/detail.vue

@@ -119,10 +119,10 @@ export default {
 <style lang="less">
   .backorderDetail-wrap{
     .backorderDetail-back{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .backorderDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 2 - 2
src/views/salesManagement/outboundOrder/detail.vue

@@ -42,7 +42,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="outboundOrderDetail-cont">
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom: 15px;">
+      <a-alert type="info" style="margin-bottom: 10px;">
         <div slot="message">
           总款数:<strong>12</strong>;总数量:<strong>12</strong>;总赠品数量:<strong>12</strong>;急件总款数:<strong>12</strong>;急件总数量:<strong>12</strong>;<br/>
           总售价:<strong>12</strong>;总成本:<strong>12</strong>;总毛利:<strong>12</strong>;折后总售价:<strong>12</strong>;折扣:<strong>12%</strong>;折扣金额:<strong>12</strong>;
@@ -150,7 +150,7 @@ export default {
 <style lang="less">
   .outboundOrderDetail-wrap{
     .outboundOrderDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 2 - 2
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -26,7 +26,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="pages-wrap">
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData!=null">
+      <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData!=null">
         <div slot="message">
           总销售数量:<strong>{{ detailData.totalSalesQty || 0 }}</strong>;本次下推数量:<strong>{{ detailData.totalQty || 0 }}</strong>;
           </strong></strong></div>
@@ -122,7 +122,7 @@ export default {
 <style lang="less">
   .salesDetail-wrap{
     .salesDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .footer-cont{
       margin-top: 5px;

+ 2 - 2
src/views/salesManagement/salesQuery/detail.vue

@@ -38,7 +38,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="pages-wrap">
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
+      <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">
         <div slot="message">
           总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.totalCancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.totalPushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.totalUnpushedQty || 0 }}</strong>;已发货数量:<strong>{{ detailData.totalDispatchQty || 0 }}</strong>;待发货数量:<strong>{{ detailData.totalUndispatchQty || 0 }}</strong>;<br/>
           总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }};已发货金额:<strong>{{ detailData.totalDispatchAmount || 0 }};待发货金额:<strong>{{ detailData.totalUndispatchAmount || 0 }}</strong>;
@@ -179,7 +179,7 @@ export default {
 <style lang="less">
   .salesDetail-wrap{
     .salesDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .footer-cont{
       margin-top: 5px;

+ 2 - 2
src/views/salesManagement/salesReturn/detail.vue

@@ -27,7 +27,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="pages-wrap">
       <!-- alert -->
-      <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
+      <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">
         <div slot="message">
           总款数:<strong>{{ countData.totalCategory || 0 }}</strong>;总数量:<strong>{{ countData.totalQty || 0 }}</strong>;废品数量:<strong>{{ countData.totalCelQty || 0 }}</strong>;<br/>
           退货总金额:<strong>{{ countData.totalAmount || 0 }}</strong>;折扣金额:<strong>{{ countData.discountAmount || 0 }}</strong>;折扣:<strong>{{ countData.discountRate || 0 }}%</strong>;折后金额:<strong>{{ countData.discountedAmount || 0 }}</strong>;
@@ -133,7 +133,7 @@ export default {
 <style lang="less">
   .salesReturnDetail-wrap{
     .salesReturnDetail-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 1 - 1
src/views/salesManagement/salesReturn/list.vue

@@ -78,7 +78,7 @@
       <a-button type="primary" class="button-error" @click="openModal = true">新增</a-button>
     </div>
     <!-- alert -->
-    <a-alert type="info" style="margin-bottom: 15px;">
+    <a-alert type="info" style="margin-bottom: 10px;">
       <div slot="message">
         退货总金额:<strong>{{ countData&&countData.totalAmount }}</strong>元;
         总单数:<strong>{{ countData&&countData.totalBillNumber }}</strong>;

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -30,7 +30,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="pages-wrap">
       <!-- alert -->
-      <a-alert style="margin-bottom: 15px;" type="info">
+      <a-alert style="margin-bottom: 10px;" type="info">
         <div slot="message" class="total-bar">
           <div>
             <span>退货总金额:{{ countData&&countData.totalAmount }}元;</span>

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -30,7 +30,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="pages-wrap">
       <!-- alert -->
-      <a-alert style="margin-bottom: 15px;" type="info">
+      <a-alert style="margin-bottom: 10px;" type="info">
         <div slot="message" class="total-bar">
           <div>
             <span>退货总金额:{{ countData&&countData.totalAmount }}元;</span>

+ 1 - 1
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -57,7 +57,7 @@
       <a-button type="primary" :disabled="newLoading" class="button-warning" @click="handleOneDispatch">有货一键下推</a-button>
     </div>
     <!-- alert -->
-    <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
+    <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">
       <div slot="message">
         总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.totalCancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.totalPushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.totalUnpushedQty || 0 }}</strong>;<br/>
         总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }}</strong>;

+ 1 - 1
src/views/supplierManagement/associatedProduct/add.vue

@@ -213,7 +213,7 @@ export default {
 <style lang="less">
   .associatedProduct-wrap{
     .associatedProduct-head{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
   }
 </style>

+ 1 - 1
src/views/supplierManagement/supplierInfo/edit.vue

@@ -435,7 +435,7 @@ export default {
 <style lang="less">
   .supplierInfoEdit-wrap{
     .supplierInfoEdit-cont{
-      margin-bottom: 15px;
+      margin-bottom: 10px;
     }
     .upload{
       width: 100%!important;

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.104:8602/ocs-admin',
+        target: 'http://192.168.16.105:8602/ocs-admin',
         // target: 'http://ocs-admin.360arrow.com.cn/ocs-admin',
         ws: false,
         changeOrigin: true,