Merge branch 'dev' of 113.31.163.91:quanshu/mp-ui-pc into dev

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

@@ -83,7 +83,7 @@
            {{detail.operData && detail.operData.orderCnt}}
          </el-form-item>
           <el-form-item label="营业额" style="width: 50%;margin-bottom:5px;" >
-             <span :class="loading?'el-icon-loading':''"></span>{{detail.operData &&detail.operData.saleAmt}}
+             <span :class="loading?'el-icon-loading':''"></span>{{detail.operData &&detail.operData.saleAmt/100}}
           </el-form-item>
      </flexbox>
      <flexbox
@@ -91,7 +91,7 @@
          align="flex-start"
          justify="flex-start">
          <el-form-item label="佣金" style="width: 50%;margin-bottom:5px;" >
-           <span :class="loading?'el-icon-loading':''">{{detail.operData && detail.operData.commAmt}} </span>
+           <span :class="loading?'el-icon-loading':''">{{detail.operData && detail.operData.commAmt/100}} </span>
          </el-form-item>
      </flexbox>
    </el-form>

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

@@ -115,10 +115,10 @@
          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.saleAmt}}
+             <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':''">{{detail.operData && detail.operData.commAmt}} </span>
+            <span :class="loading?'el-icon-loading':''">{{detail.operData && detail.operData.commAmt/100}} </span>
           </el-form-item>
      </flexbox>
    </el-form>
@@ -152,7 +152,7 @@ export default {
   computed: {
     ...mapGetters(['userInfo']),
     title() {
-      return '渠道详情'
+      return '经销商详情'
     }
   },
 

src/views/business/salesite/index.vue

@@ -85,15 +85,16 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
           size="mini"
+          disabled
           @click="handleAdd"
           v-hasPermi="['system:post:add']"
         >添加经销商</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -125,12 +126,13 @@
             @click="handleDetail(scope.row)"
             v-hasPermi="['admin:salesite:read']"
           >查看</el-button>
-          <el-button
+         <!-- <el-button
             size="mini"
             type="text"
+            disabled
             @click="handleUpdate(scope.row)"
             v-hasPermi="['admin:salesite:edit']"
-          >编辑</el-button>
+          >编辑</el-button> -->
           <el-button
             size="mini"
             type="text"