Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!61

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

@@ -40,7 +40,8 @@
          justify="flex-start">
          <el-form-item label="上级渠道" style="width: 50%;margin-bottom:5px;" >
            <span :class="loading?'el-icon-loading':''"></span>
-           {{detail.parentName}}
+           <span v-if="detail.parentName"> {{detail.parentName}}</span>
+           <span v-else>无</span>
          </el-form-item>
           <el-form-item label="佣金比例" style="width: 50%;margin-bottom:5px;" >
              <span :class="loading?'el-icon-loading':''"></span>

src/views/business/channel/index.vue

@@ -153,15 +153,6 @@
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['admin:channel:edit']"
               >编辑</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                @click="handleStatusChange(scope.row)"
-                v-hasPermi="['admin:channel:edit']"
-              >
-              <span v-if="getValue(scope.row.status) == 1"> 停用</span>
-              <span v-if="getValue(scope.row.status) == 2"> 启用</span>
-              </el-button>
              <!-- <el-button
                 size="mini"
                 type="text"

src/views/business/goods/components/spec.vue

@@ -39,7 +39,7 @@
           <th rowspan="2" class="required"><span>＊</span>名称</th>
           <th rowspan="2" class="required"><span>＊</span>价格</th>
           <th rowspan="2" class="required"><span>＊</span>兑换价格</th>
-          <th rowspan="2">成本</th>
+          <th rowspan="2">采购价格</th>
           <th rowspan="2" class="required"><span>＊</span>库存</th>
           <th rowspan="2">启用</th>
         </tr>
@@ -117,7 +117,7 @@ export default {
       specValTmp: '',
       specifications: [],
       valueYRules: [{ required: true, message: '请输入价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"]}],
-      costYRules: [{ required: false, message: '请输入成本', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2}\d[0])?|0|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
+      costYRules: [{ required: false, message: '请输入采购价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2}\d[0])?|0|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
       exchangeRules: [{ required: true, message: '请输入兑换价格', trigger: 'blur' },{ pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"]}]
     }
   },
@@ -322,4 +322,4 @@ export default {
   }
   
 }
-</style>
+</style>

src/views/business/salesite/index.vue

@@ -99,20 +99,24 @@
     </el-row>
 
     <el-table v-loading="loading" :data="siteList" @selection-change="handleSelectionChange">
-     <!-- <el-table-column type="selection" width="55" align="center" /> -->
+     <!-- <el-table-column type="selection" width="55"  /> -->
       <el-table-column label="经销商编号" prop="channelId" width="100px"/>
-      <el-table-column label="经销商名称" show-overflow-tooltip align="center" prop="name" max-width="100px" />
-      <el-table-column label="手机号码" align="center" prop="mobile" />
-      <el-table-column label="佣金比例" align="center" prop="commRate" />
-      <el-table-column label="上级渠道" align="center" prop="parentName" />
-      <el-table-column label="用户数" align="center" prop="userCnt" />
-      <el-table-column label="认证状态" align="center" prop="certifyStatus" >
+      <el-table-column label="经销商名称" show-overflow-tooltip  prop="name" max-width="100px" />
+      <el-table-column label="手机号码"  prop="mobile" />
+      <el-table-column label="佣金比例" prop="commRate">
+        <template slot-scope="{ row, column }">
+           <span>{{row.commRate}}%</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="上级渠道" prop="parentName" />
+      <el-table-column label="用户数" prop="userCnt" />
+      <el-table-column label="认证状态" prop="certifyStatus" >
         <template slot-scope="{ row, column }">
              <span v-if="getValue(row.certifyStatus) == 'y'" style="color: blue;"> {{getDesc(row.certifyStatus)}}</span>
              <span v-if="getValue(row.certifyStatus) == 'n'" style="color: red;"> {{getDesc(row.certifyStatus)}}</span>
          </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" key="statusV">
+      <el-table-column label="状态" key="statusV">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.statusV"
@@ -122,12 +126,6 @@
           ></el-switch>
         </template>
       </el-table-column>
- <!--     <el-table-column label="状态" align="center" prop="status"  >
-         <template slot-scope="{ row, column }">
-             <span v-if="getValue(row.status) == 1" style="color: blue;"> {{getDesc(row.status)}}</span>
-             <span v-if="getValue(row.status) == 2" style="color: red;"> {{getDesc(row.status)}}</span>
-         </template>
-      </el-table-column> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button