Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into dev

src/components/BaseDialog.vue

@@ -80,7 +80,7 @@ export default {
   },
   methods: {
     confirmBtn() {
-      this.$emit("submit", "123");
+      this.$emit("submit");
     },
     close() {
       this.$emit("close");

src/components/tableList.vue

@@ -754,6 +754,13 @@
                   ).toFixed(2) + "%"
             }}
           </span>
+          <span v-else-if="item.scope === 'toFixedYuan'">
+            {{
+              scope.row[item.prop] || scope.row[item.prop] == 0
+                ? scope.row[item.prop].toFixed(2)
+                : scope.row[item.prop]
+            }}
+          </span>
           <span v-else-if="item.scope === 'cType'">
             <el-tag
               type="success"

src/fxApi/temp.js

@@ -113,8 +113,16 @@ export default {
     //机构Id
     systemtenantbankId(data) {
         return request({
-            url: '/system/tenant/bank/'+data,
+            url: '/system/tenant/bank/' + data,
             method: 'get',
         })
     },
+    //批量删除机构
+    systemtenantdeletetop(data) {
+        return request({
+            url: '/system/tenant/delete/top',
+            method: 'post',
+            data
+        })
+    },
 }

src/store/getters.js

@@ -29,6 +29,14 @@ const getters = {
     }
     return state.dict.indexnum
   },
+  categorytreeList(state) {
+    if (!state.dict.categorytreeList) {
+      api.mallgoodscategorytree({ status: 1 }).then(res => {
+        state.dict.categorytreeList = res.data
+      })
+    }
+    return state.dict.categorytreeList
+  },
   storeList(state) {
     if (!state.dict.storeList) {
       api.mallstorelist({ status: 1 }).then(res => {

src/store/modules/dict.js

@@ -33,9 +33,22 @@ const state = {
   indexnum: null,//模拟
   systemtenantlist: null,//机构列表
   merList: null,//店铺管理列表
-  storeList:null,//商户管理列表
+  storeList: null,//商户管理列表
+  categorytreeList: null,//商户分类列表
 }
 const mutations = {
+  //商户分类列表
+  CATEGORYTREELIST(state) {
+    api.mallgoodscategorytree({ status: 1 }).then(res => {
+      state.categorytreeList = res.data
+    })
+  },
+  //机构列表
+  TENANTLIST(state) {
+    api.systemtenantlist({ status: 1 }).then(res => {
+      state.systemtenantlist = res.rows
+    })
+  },
   //商户管理列表
   STORELIST(state) {
     api.mallstorelist({ status: 1 }).then(res => {

src/views/financed/components/dislogOrderDetails.vue

@@ -59,7 +59,12 @@
               </el-image>
               <div v-if="desc.type === 'pretax'">
                 <span style="margin-right: 20px"
-                  >税前佣金：{{ detailInfo["pretaxBrokerage"] }}</span
+                  >税前佣金：{{
+                    detailInfo["pretaxBrokerage"] ||
+                    detailInfo["pretaxBrokerage"] == 0
+                      ? detailInfo["pretaxBrokerage"].toFixed(2)
+                      : detailInfo["pretaxBrokerage"]
+                  }}</span
                 ><span>税占比：{{ detailInfo["pretaxStr"] }}</span>
               </div>
               <div v-if="desc.type === 'time'">
@@ -72,19 +77,32 @@
                   </span>
                 </template>
               </div>
+              <div v-if="desc.type === 'money'">
+                {{
+                  detailInfo[desc.key] || detailInfo[desc.key] === 0
+                    ? detailInfo[desc.key].toFixed(2)
+                    : detailInfo[desc.key]
+                }}
+                <span
+                  v-if="desc.key === 'orderProfit'"
+                  :style="{
+                    color: detailInfo[desc.key] > 0 ? '#409eff' : '#f56c6c',
+                  }"
+                  >【{{ detailInfo[desc.key] > 0 ? "盈" : "亏" }}】</span
+                >
+                <span
+                  v-if="desc.key === 'orderUncollected'"
+                  :style="{
+                    color: detailInfo[desc.key] > 0 ? '#f56c6c' : '#409eff',
+                  }"
+                  >（{{
+                    detailInfo[desc.key] > 0 ? "未结清" : "已结清"
+                  }}）</span
+                >
+              </div>
             </div>
             <div v-else>
               {{ detailInfo[desc.key] }}
-              <span
-                v-if="desc.key === '888'"
-                :style="{ color: true ? '#409eff' : '#f56c6c' }"
-                >【{{ true ? "盈" : "亏" }}】</span
-              >
-              <span
-                v-if="desc.key === '999'"
-                :style="{ color: false ? '#409eff' : '#f56c6c' }"
-                >（{{ true ? "已结清" : "未结清" }}）</span
-              >
             </div>
           </el-descriptions-item>
         </el-descriptions>
@@ -129,14 +147,14 @@ export default {
         { label: "业务分类", key: "schemeName" },
         { label: "订单来源", key: "orderOrg" },
         { label: "申请时间", key: "buyTime", type: "time" },
-        { label: "盈亏(元)", key: "orderProfit" },
-        { label: "成本(元)", key: "orderCost" },
-        { label: "合同金额(元)", key: "orderPrice" },
-        { label: "已收账款(元)", key: "orderReceived" },
-        { label: "申请退款", key: "orderRefund" },
-        { label: "已退账款(元)", key: "orderRefunded" },
-        { label: "未收账款(元)", key: "orderUncollected" },
-        { label: "实际账款(元)", key: "orderPractical" },
+        { label: "盈亏(元)", key: "orderProfit", type: "money" },
+        { label: "成本(元)", key: "orderCost", type: "money" },
+        { label: "合同金额(元)", key: "orderPrice", type: "money" },
+        { label: "已收账款(元)", key: "orderReceived", type: "money" },
+        { label: "申请退款", key: "orderRefund", type: "money" },
+        { label: "已退账款(元)", key: "orderRefunded", type: "money" },
+        { label: "未收账款(元)", key: "orderUncollected", type: "money" },
+        { label: "实际账款(元)", key: "orderPractical", type: "money" },
         { label: "下单企业", key: "tenantName" },
         { label: "转账开户名", key: "openingName" },
         { label: "转账凭证", key: "attachmentList", type: "image" },

src/views/financed/components/studentDetails.vue

@@ -193,11 +193,13 @@ export default {
         {
           label: "原价(元)",
           prop: "goodsPrice",
+          scope:"toFixedYuan",
           hidden: true,
         },
         {
           label: "单价(元)",
           prop: "goodsRealPrice",
+          scope:"toFixedYuan",
           hidden: true,
         },
         {

src/views/financed/orderManageList/index.vue

@@ -70,21 +70,21 @@
         <div>订单号：{{ props.scope.row["orderSn"] }}</div>
       </template>
       <template slot="orderPrice" slot-scope="props">
-        <div>合同金额：{{ props.scope.row["orderPrice"] }}</div>
-        <div>已收账款：{{ props.scope.row["orderReceived"] }}</div>
-        <div>申请退款：{{ props.scope.row["orderRefund"] }}</div>
-        <div>已退账款：{{ props.scope.row["orderRefunded"] }}</div>
-        <div>未收账款：{{ props.scope.row["orderUncollected"] }}</div>
+        <div>合同金额：{{ props.scope.row["orderPrice"].toFixed(2) }}</div>
+        <div>已收账款：{{ props.scope.row["orderReceived"].toFixed(2) }}</div>
+        <div>申请退款：{{ props.scope.row["orderRefund"].toFixed(2) }}</div>
+        <div>已退账款：{{ props.scope.row["orderRefunded"].toFixed(2) }}</div>
+        <div>未收账款：{{ props.scope.row["orderUncollected"].toFixed(2) }}</div>
         <div style="color: red">
           (预计收款时间){{
             $methodsTools.onlyForma(props.scope.row["predictReceiveTime"])
           }}
         </div>
-        <div>实际账款：{{ props.scope.row["orderPractical"] }}</div>
+        <div>实际账款：{{ props.scope.row["orderPractical"].toFixed(2) }}</div>
       </template>
       <template slot="inon" slot-scope="props">
-        <div>成本（元）：{{ props.scope.row["orderCost"] }}</div>
-        <div>盈亏（元）：{{ props.scope.row["orderProfit"] }}</div>
+        <div>成本（元）：{{ props.scope.row["orderCost"].toFixed(2) }}</div>
+        <div>盈亏（元）：{{ props.scope.row["orderProfit"].toFixed(2) }}</div>
         <div v-if="props.scope.row['orderProfit']">
           <span
             :style="
@@ -375,6 +375,15 @@ export default {
             { label: "未开票", value: 0 },
           ],
         },
+        {
+          prop: "finishStatus",
+          placeholder: "完单状态",
+          scope: "select",
+          options: [
+            { label: "已完单", value: 1 },
+            { label: "未完单", value: 0 },
+          ],
+        },
         {
           placeholder: "时间",
           prop1: "startTime",
@@ -421,6 +430,16 @@ export default {
           scope: "solt",
           soltName: "inon",
         },
+        {
+          label: "完单状态",
+          prop: "finishStatus",
+          scope: "isOptions",
+          hidden: true,
+          options: [
+            { label: "已完单", value: 1 },
+            { label: "未完单", value: 0 },
+          ],
+        },
         {
           label: "审核状态",
           prop: "checkStatus",

src/views/integralManagement/giftGoods/dislog.vue

@@ -46,7 +46,7 @@
             placeholder="请选择商户店铺"
           >
             <el-option
-              v-for="(item, index) in computerStore"
+              v-for="(item, index) in computerStore(storeList)"
               :key="index"
               :label="item.storeName"
               :value="item.storeId"
@@ -58,19 +58,19 @@
           prop="categoryIds"
           v-if="formData.storeId"
         >
-          <el-select
+          <el-cascader
             clearable
-            v-model="formData.categoryIds"
             placeholder="请选择商品分类"
-          >
-            <el-option
-              v-for="(item, index) in categoryIdsList"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select> </el-form-item
+            v-model="formData.categoryIds"
+            :options="computerTree(categorytreeList)"
+            :show-all-levels="false"
+            :props="{
+              label: 'categoryName',
+              value: 'categoryId',
+              checkStrictly: true,
+              emitPath: false,
+            }"
+          ></el-cascader> </el-form-item
         ><el-form-item label="商品名称：" prop="goodsName">
           <el-input
             clearable
@@ -131,8 +131,13 @@
             v-model="formData.e"
             placeholder="输入可抵扣积分"
             :min="0"
-            :precision="0"
-        /></el-form-item>
+            :precision="0" /></el-form-item
+        ><el-form-item label="状态：" prop="status">
+          <el-radio-group v-model="formData.status">
+            <el-radio :label="1">启用</el-radio
+            ><el-radio :label="0">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="商品详情：">
           <div style="margin-bottom: 14px">
             <el-button
@@ -197,33 +202,40 @@ export default {
           value: 2,
         },
       ],
-      computerStore: [],
       formData: {
+        useType: [],
+        merId: "",
+        storeId: "",
+        categoryIds: "",
         accountList: [{}],
         invoiceBo: {},
         storeId: null,
+        status: 1,
       },
       mobileDetailStatus: 1,
       rules: {
-        tenantName: [
-          { required: true, message: "请输入机构名称", trigger: "blur" },
+        useType: [
+          { required: true, message: "请选择关联使用", trigger: "change" },
         ],
-        billType: [
-          { required: true, message: "请选择账期类型", trigger: "change" },
+        merId: [
+          { required: true, message: "请选择合作商户", trigger: "change" },
         ],
+        storeId: [
+          { required: true, message: "请选择商户店铺", trigger: "change" },
+        ],
+        categoryIds: [
+          { required: true, message: "请选择商品分类", trigger: "change" },
+        ],
+        status: [{ required: true, message: "请选择状态", trigger: "change" }],
       },
     };
   },
   methods: {
     changeMerId(e) {
-      if (e) {
-        this.computerStore = this.storeList.filter((i) => i.merId === e) || [];
-      } else {
-        this.computerStore = [];
-      }
       this.$set(this.formData, "storeId", null);
     },
     changeStoreId(e) {
+      this.$set(this.formData, "categoryIds", null);
     },
     uploadImg(e) {
       var self = this;
@@ -247,7 +259,16 @@ export default {
         });
     },
     init() {
-      this.formData = JSON.parse(JSON.stringify(this.activeData));
+      this.formData = {
+        useType:[],
+        merId: "",
+        storeId: "",
+        categoryIds: "",
+        accountList: [{}],
+        invoiceBo: {},
+        storeId: null,
+        status: 1,
+      };
     },
     close() {
       this.$refs["formData"].resetFields();
@@ -265,7 +286,25 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(["merList", "storeList"]),
+    ...mapGetters(["merList", "storeList", "categorytreeList"]),
+    computerStore: function () {
+      return function (rows) {
+        var array = [];
+        if (rows?.length > 0) {
+          array = rows.filter((i) => i.merId == this.formData.merId) || [];
+        }
+        return array;
+      };
+    },
+    computerTree: function () {
+      return function (rows) {
+        var array = [];
+        if (rows?.length > 0) {
+          array = rows.filter((i) => i.storeId === this.formData.storeId);
+        }
+        return array;
+      };
+    },
     isShow: {
       get() {
         if (this.dialogVisible) {

src/views/integralManagement/goodsClassification/dislog.vue

@@ -16,6 +16,7 @@
       >
         <el-form-item label="合作商户：" prop="merId">
           <el-select
+            :disabled="doneEdit"
             @change="changeMerId"
             clearable
             v-model="formData.merId"
@@ -30,13 +31,14 @@
             </el-option></el-select></el-form-item
         ><el-form-item label="商户店铺：" prop="storeId" v-if="formData.merId">
           <el-select
+            :disabled="doneEdit"
             @change="changeStoreId"
             clearable
             v-model="formData.storeId"
             placeholder="请选择商户店铺"
           >
             <el-option
-              v-for="(item, index) in computerStore"
+              v-for="(item, index) in computerStore(storeList)"
               :key="index"
               :label="item.storeName"
               :value="item.storeId"
@@ -49,27 +51,31 @@
           v-if="formData.storeId"
         >
           <el-cascader
+            :disabled="doneEdit"
             clearable
             placeholder="请选择上级分类"
             v-model="formData.parentId"
-            :options="computerTree"
+            :options="computerTree(categorytreeList)"
             :show-all-levels="false"
             :props="{
               label: 'categoryName',
               value: 'categoryId',
               checkStrictly: true,
+              emitPath: false,
             }"
           ></el-cascader> </el-form-item
         ><el-form-item label="商品分类：" prop="categoryName">
           <el-input
             placeholder="请输入商品分类"
             v-model="formData.categoryName"
-          />
+          /> </el-form-item
+        ><el-form-item label="状态：" prop="status">
+          <el-radio-group v-model="formData.status">
+            <el-radio :label="1">启用</el-radio
+            ><el-radio :label="0">禁用</el-radio>
+          </el-radio-group>
         </el-form-item>
       </el-form>
-      <template slot="slotBtn">
-        <el-button type="success" @click="submitForm(true)">启用</el-button>
-      </template>
     </BaseDialog>
   </div>
 </template>
@@ -92,11 +98,13 @@ export default {
   },
   data() {
     return {
+      doneEdit: false,
       formData: {
         merId: "",
         storeId: "",
         parentId: "",
         categoryName: "",
+        status: 1,
       },
       rules: {
         merId: [
@@ -111,55 +119,38 @@ export default {
         categoryName: [
           { required: true, message: "请输入商品分类", trigger: "blur" },
         ],
+        status: [{ required: true, message: "请选择状态", trigger: "change" }],
       },
-      computerStore: [],
-      computerTree: [],
     };
   },
-
   methods: {
     changeMerId(e) {
-      if (e) {
-        this.computerStore = this.storeList.filter((i) => i.merId === e) || [];
-      } else {
-        this.computerStore = [];
-      }
       this.$set(this.formData, "storeId", null);
     },
     changeStoreId(e) {
-      this.computerTree = [
-        {
-          categoryId: 0,
-          categoryName: "---无---",
-        },
-      ];
-      if (e) {
-        this.$api.mallgoodscategorytree({ storeId: e }).then((res) => {
-          if (res.data?.length > 0) {
-            this.computerTree.push(...res.data);
-          }
-        });
-      }
       this.$set(this.formData, "parentId", null);
     },
     init() {
       this.formData = JSON.parse(JSON.stringify(this.treeData));
+      if (this.formData.createTime) {
+        this.doneEdit = true;
+      } else {
+        this.doneEdit = false;
+      }
     },
     close() {
       this.$refs["formData"].resetFields();
     },
-    submitForm(status) {
+    submitForm() {
       this.$refs["formData"].validate((valid) => {
         if (valid) {
           this.$api[
             this.formData.categoryId
               ? "editmallgoodscategorysave"
               : "addmallgoodscategorysave"
-          ]({
-            status: status ? 1 : 0,
-            ...this.formData,
-          }).then((res) => {
+          ](this.formData).then((res) => {
             this.$message.success("成功");
+            this.$store.commit("CATEGORYTREELIST");
             this.isShow = false;
             this.$emit("search");
           });
@@ -170,7 +161,32 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(["merList", "storeList"]),
+    ...mapGetters(["merList", "storeList", "categorytreeList"]),
+    computerStore: function () {
+      return function (rows) {
+        var array = [];
+        if (rows?.length > 0) {
+          array = rows.filter((i) => i.merId == this.formData.merId) || [];
+        }
+        return array;
+      };
+    },
+    computerTree: function () {
+      return function (rows) {
+        var array = [
+          {
+            categoryId: 0,
+            categoryName: "---无---",
+          },
+        ];
+        if (rows?.length > 0) {
+          array.push(
+            ...rows.filter((i) => i.storeId === this.formData.storeId)
+          );
+        }
+        return array;
+      };
+    },
     isShow: {
       get() {
         if (this.dialogVisible) {

src/views/integralManagement/goodsClassification/index.vue

@@ -31,9 +31,9 @@
         </el-switch>
       </template>
       <template slot="btn" slot-scope="props">
-        <el-button type="text" @click="addClick(props.scope.row)"
+        <el-button type="text" @click="addClick(props.scope.row, 1)"
           >编辑</el-button
-        ><el-button type="text" @click="addClick(props.scope.row)"
+        ><el-button type="text" @click="addClick(props.scope.row, 2)"
           >添加</el-button
         ><el-button type="text" @click="del(props.scope.row)">删除</el-button>
       </template>
@@ -47,7 +47,7 @@
     <dislog
       :dialogVisible.sync="dialogVisible"
       @search="search"
-      :categoryId="categoryId"
+      :treeData="treeData"
     ></dislog>
   </div>
 </template>
@@ -124,7 +124,7 @@ export default {
       tableData: [],
       total: 0,
       dialogVisible: false,
-      categoryId: 0,
+      treeData: {},
     };
   },
   created() {
@@ -143,19 +143,36 @@ export default {
       })
         .then(() => {
           this.$api
-            .mallgoodscategorybatchdel({
-              categoryIds: this.$refs.tableList.allCheckData.map((i) => i.categoryId),
-              status: -1,
-            })
+            .mallgoodscategorybatchdel(
+              this.$refs.tableList.allCheckData.map((i) => i.categoryId)
+            )
             .then(() => {
               this.$message.success("批量删除成功");
+              this.$store.commit("CATEGORYTREELIST");
               this.search(3);
             });
         })
         .catch(() => {});
     },
-    addClick(data) {
-      this.categoryId = data?.categoryId || 0;
+    addClick(data, status) {
+      if (data) {
+        var datas = JSON.parse(JSON.stringify(data));
+        if (status === 2) {
+          datas.parentId = datas.categoryId;
+          datas.categoryId = null;
+          datas.categoryName = null;
+          datas.status = 1;
+        }
+        this.treeData = datas;
+      } else {
+        this.treeData = {
+          merId: "",
+          storeId: "",
+          parentId: "",
+          categoryName: "",
+          status: 1,
+        };
+      }
       this.dialogVisible = true;
     },
     search(v) {
@@ -191,6 +208,7 @@ export default {
         .editmallgoodscategorysave({ categoryId: row.categoryId, status: e })
         .then((res) => {
           this.$message.success("操作成功");
+          this.$store.commit("CATEGORYTREELIST");
           row.status = e;
         })
         .catch(() => {
@@ -207,12 +225,11 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.$api
-            .editmallgoodscategorysave({ categoryId: row.categoryId, status: -1 })
-            .then((res) => {
-              this.$message.success("删除成功");
-              this.search();
-            });
+          this.$api.mallgoodscategorybatchdel([v.categoryId]).then((res) => {
+            this.$message.success("删除成功");
+            this.$store.commit("CATEGORYTREELIST");
+            this.search(3);
+          });
         })
         .catch(() => {});
     },

src/views/integralManagement/merchantManageMent/dislog.vue

@@ -49,12 +49,14 @@
             clearable
             v-model="formData.initPwd"
             placeholder="请输入密码"
-          ></el-input>
+          ></el-input> </el-form-item
+        ><el-form-item label="状态：" prop="status">
+          <el-radio-group v-model="formData.status">
+            <el-radio :label="1">启用</el-radio
+            ><el-radio :label="0">禁用</el-radio>
+          </el-radio-group>
         </el-form-item>
       </el-form>
-      <template slot="slotBtn">
-        <el-button type="success" @click="submitForm(true)">启用</el-button>
-      </template>
     </BaseDialog>
   </div>
 </template>
@@ -97,6 +99,7 @@ export default {
         telphone: "",
         merAccount: "",
         initPwd: "",
+        status: 1,
       },
       rules: {
         merName: [
@@ -110,6 +113,7 @@ export default {
         ],
         initPwd: [{ required: false, message: "请输入密码", trigger: "blur" }],
         telphone: [{ required: true, validator: checkTel, trigger: "blur" }],
+        status: [{ required: true, message: "请选择状态", trigger: "change" }],
       },
     };
   },
@@ -128,19 +132,19 @@ export default {
           telphone: "",
           merAccount: "manager",
           initPwd: "",
+          status: 1,
         };
       }
     },
     close() {
       this.$refs["formData"].resetFields();
     },
-    submitForm(status) {
+    submitForm() {
       this.$refs["formData"].validate((valid) => {
         if (valid) {
-          this.$api[this.merId ? "editmallmerchant" : "addmallmerchant"]({
-            status: status ? 1 : 0,
-            ...this.formData,
-          }).then((res) => {
+          this.$api[this.merId ? "editmallmerchant" : "addmallmerchant"](
+            this.formData
+          ).then((res) => {
             this.$message.success("成功");
             this.isShow = false;
             this.$store.commit("MERLIST");

src/views/integralManagement/storeManageMent/dislog.vue

@@ -41,12 +41,14 @@
             clearable
             v-model="formData.address"
             placeholder="请输入店铺地址"
-          ></el-input>
+          ></el-input> </el-form-item
+        ><el-form-item label="状态：" prop="status">
+          <el-radio-group v-model="formData.status">
+            <el-radio :label="1">启用</el-radio
+            ><el-radio :label="0">禁用</el-radio>
+          </el-radio-group>
         </el-form-item>
       </el-form>
-      <template slot="slotBtn">
-        <el-button type="success" @click="submitForm(true)">启用</el-button>
-      </template>
     </BaseDialog>
   </div>
 </template>
@@ -71,6 +73,7 @@ export default {
         merId: "",
         storeName: "",
         address: "",
+        status: 1,
       },
       rules: {
         merId: [
@@ -82,6 +85,7 @@ export default {
         address: [
           { required: false, message: "请输入店铺地址", trigger: "blur" },
         ],
+        status: [{ required: true, message: "请选择状态", trigger: "change" }],
       },
     };
   },
@@ -97,19 +101,19 @@ export default {
           merId: "",
           storeName: "",
           address: "",
+          status: 1,
         };
       }
     },
     close() {
       this.$refs["formData"].resetFields();
     },
-    submitForm(status) {
+    submitForm() {
       this.$refs["formData"].validate((valid) => {
         if (valid) {
-          this.$api[this.storeId ? "editmallstore" : "addmallstore"]({
-            status: status ? 1 : 0,
-            ...this.formData,
-          }).then((res) => {
+          this.$api[this.storeId ? "editmallstore" : "addmallstore"](
+            this.formData
+          ).then((res) => {
             this.$message.success("成功");
             this.$store.commit("STORELIST");
             this.isShow = false;

src/views/systemManagement/mechanism/dislog.vue

@@ -231,6 +231,7 @@ export default {
             this.activeData.tenantId ? "systemtenantedittop" : "systemtenantadd"
           ](this.formData).then((res) => {
             this.$message.success("成功");
+            this.$store.commit("TENANTLIST");
             this.isShow = false;
             this.$emit("search");
           });

src/views/systemManagement/mechanism/index.vue

@@ -8,7 +8,7 @@
       @init="init"
     />
     <table-list
-      rowKey="id"
+      rowKey="tenantId"
       ref="tableList"
       :tableSets="tableSet"
       :tableData="tableData"
@@ -16,6 +16,9 @@
       :loading="loading"
       @addClick="addClick"
     >
+      <template slot="customize">
+        <el-button type="warning" @click="remove"> 批量删除 </el-button>
+      </template>
       <template slot="status" slot-scope="props">
         <el-popover placement="right" width="650" trigger="click">
           <el-table border :data="props.scope.row.accountList">
@@ -94,7 +97,7 @@
       <template slot="btn" slot-scope="props">
         <el-button type="text" @click="addClick(props.scope.row)"
           >修改</el-button
-        >
+        ><el-button type="text" @click="del(props.scope.row)">删除</el-button>
       </template>
     </table-list>
     <pagination
@@ -127,9 +130,10 @@ export default {
         index: 0,
         ch: "条",
         num: true,
-        choice: false,
+        choice: true,
         addHide: false,
         custom: false,
+        openCheckMore: true,
       },
       formList: [
         {
@@ -159,22 +163,6 @@ export default {
           scope: "solt",
           soltName: "accountPeriodSetting",
         },
-        {
-          label: "分成模式",
-          prop: "divideModel",
-          hidden: true,
-          scope: "isOptions",
-          options: [
-            {
-              label: "机构分成",
-              value: 1,
-            },
-            {
-              label: "业务员分成",
-              value: 2,
-            },
-          ],
-        },
         {
           label: "是否有商户号",
           prop: "commercialTenant",
@@ -248,6 +236,14 @@ export default {
           pageSize: 10,
           pageNum: 1,
         };
+        this.$nextTick(() => {
+          this.$refs.tableList.clearMoreActive();
+        });
+      }
+      if (v === 3) {
+        this.$nextTick(() => {
+          this.$refs.tableList.clearMoreActive();
+        });
       }
       this.$api
         .systemtenantlist(this.formData)
@@ -264,20 +260,46 @@ export default {
       this.search(2);
     },
     del(v) {
-      this.$alert(
-        "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",
-        "提示",
-        {
-          dangerouslyUseHTMLString: true,
-        }
-      )
-        .then(() => {})
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
+      this.$confirm("确定删除此内容？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api
+            .systemtenantdeletetop({ tenantIds: [v.tenantId] })
+            .then((res) => {
+              this.$message.success("删除成功");
+              this.$store.commit("TENANTLIST");
+              this.search(3);
+            });
+        })
+        .catch(() => {});
+    },
+    remove() {
+      if (this.$refs.tableList.allCheckData.length === 0) {
+        this.$message.error("请勾选数据");
+        return;
+      }
+      this.$confirm("确定批量删除选中的数据吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api
+            .systemtenantdeletetop({
+              tenantIds: this.$refs.tableList.allCheckData.map(
+                (i) => i.tenantId
+              ),
+            })
+            .then(() => {
+              this.$message.success("批量删除成功");
+              this.$store.commit("TENANTLIST");
+              this.search(3);
+            });
+        })
+        .catch(() => {});
     },
   },
 };