Merge tag 'Hotfix-mo-157' into develop

Finish Hotfix-mo-157

src/views/sales_policy/components/AddPolicy.vue

@@ -53,6 +53,14 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :xs="24" :ms="12" :lg="12">
+                <el-form-item label="" prop="type">
+                  <div style="height: 30px">
+                    <el-checkbox v-model="searchForm.isFullRebate">返利使用金额需满额使用</el-checkbox>
+                  </div>
+                </el-form-item>
+              </el-col>
+
               <!-- <el-col :xs="24" :ms="12" :lg="12">
                 <el-form-item label="产品类别" prop="mainId">
                   <el-select
@@ -558,6 +566,7 @@ export default {
         mainId: "",
         mainName: "",
         type: "",
+        isFullRebate: false,
       },
       dataList: [],
       addList: [],

src/views/sales_policy/components/TabelTransfer.vue

@@ -4,8 +4,8 @@
       <el-row class="radio">
         <el-radio-group v-model="region" >
           <el-radio label="0">指定经销商</el-radio>
-          <el-radio label="1">广州经销商</el-radio>
-          <el-radio label="2">佛山经销商</el-radio>
+          <el-radio label="1" v-if="!adminWebsit || !adminWebsit.websitNumber || (adminWebsit && adminWebsit.websitNumber === 'GZ')">广州经销商</el-radio>
+          <el-radio label="2" v-if="!adminWebsit || !adminWebsit.websitNumber || (adminWebsit && adminWebsit.websitNumber === 'FS')">佛山经销商</el-radio>
         </el-radio-group>
         <el-upload
           class="import-btn"
@@ -376,6 +376,11 @@ export default {
       clistLoading: false,
     };
   },
+  computed: {
+    adminWebsit() {
+      return JSON.parse(localStorage.getItem("supply_user")).adminWebsit
+    },
+  },
   watch: {
     dataL: (val, oval) => {
       console.log(val, oval);
@@ -405,6 +410,7 @@ export default {
         pageSize: this.pageSizes,
         keyword: this.keyword,
         region: '',
+        websitNumber: (this.region == '0' && this.adminWebsit) ? this.adminWebsit.websitNumber : ''
       };
       // 获取经销商列表
       getCrList(customerParams).then((res) => {