20241204测试版本 -zzx

src/router/index.js

@@ -66,7 +66,7 @@ export const asyncRouterMap = [
   {
     path: '/distribution',
     component: Layout,
-    redirect: '/distribution/distributionSet',
+    redirect: '/distribution/userList',
     name: 'distribution',
     meta: {title: '分销管理', icon: 'total-yesterday'},
     children: [{

src/views/distribution/peopleManage/firstSetPrice.vue

@@ -38,8 +38,9 @@
                 <el-table-column label="二级代理价(元)" align="center" prop="secondLevelPrice" v-if="isAdmin==3"></el-table-column>
                 <el-table-column label="二级代理价(元)" align="center" v-else>
                     <template slot-scope="scope">
-                        <span class="edit" v-if="scope.row.isEdit === false"
-                            @click="toggleEdit(scope.row)">{{ scope.row.secondLevelPrice }}</span>
+                        <el-tooltip class="item" v-if="scope.row.isEdit === false" effect="dark" content="单击编辑" placement="left">
+                            <span class="edit" @click="toggleEdit(scope.row)">{{ scope.row.secondLevelPrice }}</span>
+                        </el-tooltip>
                         <el-input v-else v-model="editInput" size="small" oninput="value=value.replace(/[^\d.]/g,'')" style="width: 200px;" @blur="saveEdit(scope.row)">
                             <i slot="suffix" size="small" class="el-icon-check" @click="confrimEdit(scope.row)"></i>
                             <i slot="suffix" size="small" class="el-icon-close" @click="cancelEdit(scope.row)"></i>
@@ -103,23 +104,21 @@ export default {
         },
         confrimEdit(row) {
             if (this.editInput >= row.platformPrice) {
-                return this.$message.error('分销价格必须小于平台价格');
+                return this.$message.error('价格必须小于平台价格');
             }
             if (this.editInput <= row.firstLevelPrice) {
-                return this.$message.error('二级代理价不能小于一级代理价');
+                return this.$message.error('不能小于一级代理价');
+            }
+            if(this.editInput<=0){
+                return this.$message.error('价格不能小于0');
             }
             row.secondLevelPrice = this.editInput
             row.isEdit = false
             this.currentEditingRow = null;
         },
         cancelEdit(row) {
-            if (row.firstLevelPrice >= row.platformPrice) {
-                return this.$message.error('分销价格必须小于平台价格');
-            }
-            if (row.secondLevelPrice <= row.firstLevelPrice) {
-                return this.$message.error('二级代理价不能小于一级代理价');
-            }
             row.isEdit = false
+            this.editInput =0;
             this.currentEditingRow = null;
         },
         saveEdit(row) {

src/views/distribution/peopleManage/setCommission.vue

@@ -48,9 +48,7 @@
                     </div>
                     <div style="margin-left:20px;">
                         <el-descriptions class="margin-top" :column="3" size="medium" border>
-                            <el-descriptions-item label="可设置电站总数"> {{ noSetCount - haveSetCount || '0' }}</el-descriptions-item>
-                            <el-descriptions-item label="已设置">{{ haveSetCount || '0' }}</el-descriptions-item>
-                            <el-descriptions-item label="未设置">{{ noSetCount || '0' }}</el-descriptions-item>
+                            <el-descriptions-item label="可设置电站总数"> {{ noSetCount + haveSetCount || '0' }}</el-descriptions-item>
                         </el-descriptions>
                     </div>
                 </div>
@@ -104,11 +102,11 @@
                     <template slot-scope="scope">
                         <el-button size="mini" v-if="isAdmin == 0" type="success" plain
                             @click="get_settingType(scope.row)">
-                            设置分销佣金
+                            修改分销佣金
                         </el-button>
                         <el-button v-if="isAdmin == 2" size="mini" type="success" plain
                             @click="settingsFirst(scope.row)">
-                            设置分销佣金
+                            修改分销佣金
                         </el-button>
                         <el-button v-if="isAdmin == 3" size="mini" type="success" plain
                             @click="settingsFirst(scope.row)">
@@ -213,6 +211,7 @@ export default {
 
         handleResetSearch() {
             this.listQuery.stationStatus= null
+            this.listQuery.stationId = null
             this.listQuery.stationName = null
         },
         handleSearchList() {

src/views/distribution/peopleManage/settingsPrice.vue

@@ -40,8 +40,10 @@
                 <el-table-column label="销售合计价(元)" align="center" prop="platformPrice"></el-table-column>
                 <el-table-column label="一级代理价(元)" align="center" prop="">
                     <template slot-scope="scope">
-                        <span class="edit" v-if="scope.row.isEdit === false" @click="toggleEdit(scope.row)">{{
+                        <el-tooltip class="item" v-if="scope.row.isEdit === false" effect="dark" content="单击编辑" placement="left">
+                            <span class="edit" @click="toggleEdit(scope.row)">{{
                             scope.row.firstLevelPrice }}</span>
+                        </el-tooltip>
                         <el-input v-else v-model="editInput" size="small" oninput="value=value.replace(/[^\d.]/g,'')" style="width: 200px;"
                             @blur="saveEdit(scope.row)">
                             <i slot="suffix" size="small" class="el-icon-check" @click="confrimEdit(scope.row)"></i>
@@ -105,7 +107,13 @@ export default {
         },
         confrimEdit(row) {
             if (this.editInput >= row.platformPrice) {
-                return this.$message.error('分销价格必须小于平台价格');
+                return this.$message.error('价格必须小于平台价格');
+            }
+            if(this.editInput<=new Big(row.platformPrice).minus(new Big(row.addServicePrice))){
+              return this.$message.error('一级代理价不合理，不在底价和销售价区间');
+            }
+            if (this.editInput <= 0) {
+                return this.$message.error('价格不能小于0');
             }
             row.firstLevelPrice = this.editInput;
             row.isEdit = false
@@ -113,9 +121,7 @@ export default {
             this.currentEditingRow = null;
         },
         cancelEdit(row) {
-            if (this.editInput >= row.platformPrice) {
-                return this.$message.error('分销价格必须小于平台价格');
-            }
+            this.editInput =0;
             row.isEdit = false
             //置空当前编辑行记录
             this.currentEditingRow = null;

src/views/distribution/records/index.vue

@@ -243,6 +243,7 @@ export default {
                     return acc
                 }, {}))
                 this.financeList = updateList.map(item => item.settleRecordId)
+                if(this.financeList.length <= 0) return this.$message.error('暂无待结算数据')
                 this.updateLoading = true
                 updateStatus(this.financeList).then((res) => {
                     this.updateLoading = false