文案“经销商”改“门店”、二级渠道停用的权限修改

src/views/business/channel/childs.vue

@@ -149,7 +149,7 @@
                  size="mini"
                  type="text"
                  @click="handleStatusChange(scope.row)"
-                 v-hasPermi="['admin:channel:edit']"
+                 v-hasPermi="['business:channel:edit']"
                >
                  <span v-if="getValue(scope.row.status) == 1" > 停用</span>
                  <span v-if="getValue(scope.row.status) == 2" > 启用</span>

src/views/business/channel/components/Detail.vue

@@ -66,7 +66,7 @@
          class="ygp-form-items"
          align="flex-start"
          justify="flex-start">
-         <el-form-item label="经销商" style="width: 50%;margin-bottom:5px;" >
+         <el-form-item label="门店" style="width: 50%;margin-bottom:5px;" >
            <span :class="loading?'el-icon-loading':''"></span>
            {{detail.siteCnt}}
          </el-form-item>
@@ -92,7 +92,7 @@
          align="flex-start"
          justify="flex-start">
          <el-form-item label="佣金" style="width: 50%;margin-bottom:5px;" >
-           <span :class="loading?'el-icon-loading':''"></span>￥{{detail.operData && detail.operData.commAmt/100}} 
+           <span :class="loading?'el-icon-loading':''"></span>￥{{detail.operData && detail.operData.commAmt/100}}
          </el-form-item>
      </flexbox>
    </el-form>

src/views/business/channel/index.vue

@@ -140,7 +140,7 @@
               {{scope.row.level}}级渠道
             </template>
           </el-table-column>
-          <el-table-column label="经销商数" sortable="custom" prop="siteCnt"  />
+          <el-table-column label="门店数" sortable="custom" prop="siteCnt"  />
           <el-table-column label="用户数" sortable="custom" prop="userCnt"  />
           <el-table-column label="注册时间" prop="createdTime" min-width="150px">
             <template slot-scope="{ row }">

src/views/business/salesite/components/Create.vue

@@ -17,8 +17,8 @@
       style="max-height: 375px;overflow: auto;"
     >
     <flexbox class="ygp-form-items" align="flex-start" justify="flex-start">
-      <el-form-item label="经销商名称" prop="colAddress" style="width: 50%;">
-        <el-input v-model="form.name" placeholder="请输入经销商名称" />
+      <el-form-item label="门店名称" prop="colAddress" style="width: 50%;">
+        <el-input v-model="form.name" placeholder="请输入门店名称" />
       </el-form-item>
        <el-form-item label="手机号码" prop="mobile" style="width: 50%;">
          <el-input v-model="form.mobile" placeholder="请输入采集器编号"/>
@@ -255,7 +255,7 @@ export default {
   computed: {
     ...mapGetters(["userInfo"]),
     title() {
-      return this.editId ? "编辑经销商" : "添加经销商";
+      return this.editId ? "编辑门店" : "添加门店";
     }
   },
 

src/views/business/salesite/components/Detail.vue

@@ -12,7 +12,7 @@
          class="ygp-form-items"
          align="flex-start"
          justify="flex-start">
-        <el-form-item label="经销商名称" style="width: 50%; margin-bottom:5px;" >
+        <el-form-item label="门店名称" style="width: 50%; margin-bottom:5px;" >
           <span :class="loading?'el-icon-loading':''"></span>
           {{detail.name}}
         </el-form-item>
@@ -118,7 +118,7 @@
              <span :class="loading?'el-icon-loading':''"></span>￥{{detail.operData &&detail.operData.saleAmt/100}}
           </el-form-item>
           <el-form-item label="佣金" style="width: 50%;margin-bottom:5px;" >
-            <span :class="loading?'el-icon-loading':''"></span>￥{{detail.operData && detail.operData.commAmt/100}} 
+            <span :class="loading?'el-icon-loading':''"></span>￥{{detail.operData && detail.operData.commAmt/100}}
           </el-form-item>
      </flexbox>
    </el-form>
@@ -153,7 +153,7 @@ export default {
   computed: {
     ...mapGetters(['userInfo']),
     title() {
-      return '经销商详情'
+      return '门店详情'
     }
   },
 

src/views/business/salesite/index.vue

@@ -29,10 +29,10 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="经销商名称" prop="name" label-width="90px">
+      <el-form-item label="门店名称" prop="name" label-width="90px">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入经销商名称"
+          placeholder="请输入门店名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -99,7 +99,7 @@
           disabled
           @click="handleAdd"
           v-hasPermi="['system:post:add']"
-        >添加经销商</el-button>
+        >添加门店</el-button>
       </el-col> -->
       <el-col :span="1.5">
         <el-button
@@ -109,7 +109,7 @@
           size="mini"
           @click="handleOrderExport"
           v-hasPermi="['business:salesite:export']"
-        >导出经销商</el-button
+        >导出门店</el-button
         >
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -117,8 +117,8 @@
 
     <el-table v-loading="loading" :data="siteList" @sort-change="sortChannelId" @selection-change="handleSelectionChange">
      <!-- <el-table-column type="selection" width="55"  /> -->
-      <el-table-column label="经销商编号" sortable="custom" prop="channelId" width="110px"/>
-      <el-table-column label="经销商名称" show-overflow-tooltip  prop="name" min-width="110px" >
+      <el-table-column label="门店编号" sortable="custom" prop="channelId" width="110px"/>
+      <el-table-column label="门店名称" show-overflow-tooltip  prop="name" min-width="110px" >
         <template slot-scope="scope">
           <pre>{{scope.row.name}}</pre>
         </template>
@@ -262,7 +262,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 经销商表格数据
+      // 门店表格数据
       siteList: [],
       // 弹出层标题
       title: "",
@@ -301,7 +301,7 @@ export default {
     });
   },
   methods: {
-    /** 查询经销商列表 */
+    /** 查询门店列表 */
     getList() {
       this.loading = true;
       listSaleSite('pageNum='+this.pageParams.pageNum + '&pageSize='+this.pageParams.pageSize+'&orderByColumn='+ this.pageParams.orderByColumn +'&isAsc='+ this.pageParams.isAsc +'&',this.queryParams).then(response => {
@@ -345,7 +345,7 @@ export default {
 
     // 导出订单
     handleOrderExport() {
-      this.$confirm("是否确认导出经销商?", "提示", {
+      this.$confirm("是否确认导出门店?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -473,7 +473,7 @@ export default {
     handleStatusChange(row) {
       var newStatus = this.getValue(row.status) == 2?1:2
       let text = this.getValue(row.status) == 2 ? "启用" : "停用";
-      this.$confirm('确认要"' + text + '""' + row.name + '"经销商吗?', "警告", {
+      this.$confirm('确认要"' + text + '""' + row.name + '"门店吗?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

src/views/business/ticket/create.vue

@@ -124,7 +124,7 @@
             </el-input>
           </el-form-item>
           <div class="tip">
-            例如：一张盲票用户支付10元，盲票佣金系数90%，经销商佣金比例20%，那么经销商佣金为10元*90%*20%=1.8元
+            例如：一张盲票用户支付10元，盲票佣金系数90%，门店佣金比例20%，那么门店佣金为10元*90%*20%=1.8元
           </div>
           <el-form-item label="销售范围" prop="saleChannelType" v-if="form.type == 'offline'">
             <el-radio-group v-model="form.saleChannelType" size="small" @change="$refs['form'].clearValidate()">
@@ -153,7 +153,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <div class="tip" v-if="form.type == 'offline'">注：盲票只对所选渠道下的经销商可见</div>
+          <div class="tip" v-if="form.type == 'offline'">注：盲票只对所选渠道下的门店可见</div>
         </el-form>
       </div>
       <div class="base-info-title" >奖级设置</div>

src/views/finance/withdraw/components/Detail.vue

@@ -8,7 +8,7 @@
     >
       <el-form label-width="130px">
         <div class="form-flex">
-          <el-form-item label="渠道/经销商名称：">
+          <el-form-item label="渠道/门店名称：">
             <span>{{ info.name || "--" }}</span>
           </el-form-item>
           <el-form-item label="手机号码：">
@@ -17,7 +17,7 @@
         </div>
         <div class="form-flex">
           <el-form-item label="渠道类型：">
-            <span>{{ info.level == 0 ? "经销商" : "渠道" }}</span>
+            <span>{{ info.level == 0 ? "门店" : "渠道" }}</span>
           </el-form-item>
           <el-form-item label="提现状态：">
             <span>{{ JSON.parse(info.status).desc || "--" }}</span>
@@ -144,4 +144,4 @@ export default {
     width: 200px;
   }
 }
-</style>
+</style>

src/views/finance/withdraw/index.vue

@@ -7,10 +7,10 @@
       v-show="showSearch"
       label-width="120px"
     >
-      <el-form-item label="渠道/经销商名称">
+      <el-form-item label="渠道/门店名称">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入渠道/经销商名称"
+          placeholder="请输入渠道/门店名称"
           clearable
           size="small"
           style="width: 240px"
@@ -91,7 +91,7 @@
       <el-table-column label="手机号码" prop="mobile" min-width="85" />
       <el-table-column label="渠道类型" prop="addr" min-width="80">
         <template slot-scope="{ row }">
-          <div>{{ row.level == 0 ? "经销商" : "渠道" }}</div>
+          <div>{{ row.level == 0 ? "门店" : "渠道" }}</div>
         </template>
       </el-table-column>
       <el-table-column label="提现金额(元)" align="center">

src/views/order/channel/detail.vue

@@ -8,7 +8,7 @@
           <div class="title">订单编号：{{ info.orderId }}</div>
         </el-col>
         <el-col :span="7" :xs="{span: 24, offset: 0}">
-          <div class="title">订单类型：经销商订单</div>
+          <div class="title">订单类型：门店订单</div>
         </el-col>
         <el-col :span="8" :xs="{span: 24, offset: 0}">
           <div class="title">下单时间：{{ parseTime(info.createdTime) }}</div>
@@ -20,7 +20,7 @@
       <el-col :span="22" :offset="1">
         <div class="info-title">买家信息</div>
         <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}">
-          <div class="title">经销商：{{ info.channel && info.channel.name }}</div>
+          <div class="title">门店：{{ info.channel && info.channel.name }}</div>
         </el-col>
         <el-col :span="7" :xs="{span: 24, offset: 0}">
           <div class="title">上级渠道：{{ info.channel && info.channel.parentName }}</div>

src/views/order/channel/index.vue

@@ -35,10 +35,10 @@
           @change="pageParams.pageNum = 1;handleQuery()"
         />
       </el-form-item>
-      <el-form-item label="经销商" prop="channelId">
+      <el-form-item label="门店" prop="channelId">
         <el-select
           v-model="queryParams.channelId"
-          placeholder="请选择经销商"
+          placeholder="请选择门店"
           style="width: 100%;"
           filterable
           clearable
@@ -57,10 +57,10 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="经销商">
+      <!-- <el-form-item label="门店">
         <el-select
           v-model="queryParams.channelId"
-          placeholder="可输入经销商名称/手机号码搜索"
+          placeholder="可输入门店名称/手机号码搜索"
           clearable
           filterable
           size="small"
@@ -188,7 +188,7 @@
           <div>{{ $numberFormat(row.payAmt) }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="经销商" prop="channelName" min-width="80" />
+      <el-table-column label="门店" prop="channelName" min-width="80" />
       <el-table-column label="收货人/收货地址" prop="addr" min-width="120">
         <template slot-scope="{ row }">
           <div>
@@ -282,7 +282,7 @@ export default {
       // 总条数
       total: 0,
       list: [],
-      // 经销商
+      // 门店
       merchantArr: [],
       // 下单时间
       tradeTimeArr: [],
@@ -352,7 +352,7 @@ export default {
       });
     },
 
-    // 获取经销商下拉列表
+    // 获取门店下拉列表
     getSaleSiteList(){
       listAllSaleSite({}).then(response => {
          this.siteList = response.data || [];

src/views/order/deliver/index.vue

@@ -322,7 +322,7 @@ export default {
       // 总条数
       total: 0,
       list: [],
-      // 经销商
+      // 门店
       merchantArr: [],
       // 下单时间
       tradeTimeArr: [],

src/views/order/userTicket/detail.vue

@@ -58,7 +58,7 @@
           <div class="title">盲票售价：{{ $numberFormat(info.salePrice) }}元</div>
         </el-col>
         <el-col :span="8" :xs="{span: 24, offset: 0}">
-          <div class="title">经销商：{{ info.channelName ? info.channelName : '--' }}</div>
+          <div class="title">门店：{{ info.channelName ? info.channelName : '--' }}</div>
         </el-col>
       </el-col>
     </el-row>

src/views/order/userTicket/index.vue

@@ -54,10 +54,10 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="经销商" prop="parentId">
+      <el-form-item label="门店" prop="parentId">
         <el-select
           v-model="queryParams.channelId"
-          placeholder="输入经销商名称或手机号码"
+          placeholder="输入门店名称或手机号码"
           style="width: 100%;"
           filterable
           clearable
@@ -157,7 +157,7 @@
           <div>{{ row.nickName }}/{{ row.phone }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="经销商" prop="channelName" min-width="95" >
+      <el-table-column label="门店" prop="channelName" min-width="95" >
         <template slot-scope="{ row }">
           <div v-if="row.channelName">{{ row.channelName }}</div>
           <div v-else>--</div>

src/views/system/role/index.vue

@@ -111,7 +111,7 @@
         <template slot-scope="scope">
             <span v-if="scope.row.roleType == '1'">系统角色</span>
             <span v-if="scope.row.roleType == '2'">渠道角色</span>
-            <span v-if="scope.row.roleType == '3'">经销商角色</span>
+            <span v-if="scope.row.roleType == '3'">门店角色</span>
         </template>
       </el-table-column>
       <el-table-column label="显示顺序" prop="roleSort" width="100" />
@@ -362,7 +362,7 @@ export default {
         },
         {
           value: "3",
-          label: "经销商角色"
+          label: "门店角色"
         }
       ],
       isDefaultOptions: [