团队管理接口对接和全民分销人员管理功能接口对接

.env.production

@@ -10,4 +10,4 @@ VUE_APP_SERVER_ID=1
 VUE_APP_BASE_API = '/scenicprod-api'
 
 # 生产环境文件上传
-VUE_APP_UPLOAD_FILE_API = 'http://admin.wdzzgs.com/serviceapi/thirdapi'
+VUE_APP_UPLOAD_FILE_API = 'https://admin.wdzzgs.com/serviceapi/thirdapi'

src/api/distribution/personnelMr.js

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 分页查询
+export const pageList = (query) => {
+  return request({
+    url: '/member/marketPersons/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增/修改
+export const saveAndEdit = (data) => {
+  return request({
+    url: '/member/marketPersons/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除模板
+export const deleteById = (id) => {
+  return request({
+    url: '/member/marketPersons/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}
+
+// 修改状态
+export const updateStatus = (data) => {
+  return request({
+    url: '/member/marketPersons/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getSelectById(id) {
+  return request({
+    url: '/member/marketPersons/selectById?id=' + id,
+    method: 'get'
+  })
+}
+
+// 提现配置
+export const configUpdate = (data) => {
+  return request({
+    url: '/member/marketPersonsWithdrawConfig/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getSetInfo(id) {
+  return request({
+    url: '/member/marketPersonsWithdrawConfig/info',
+    method: 'get'
+  })
+}

src/api/team/teamMr.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 分页查询
+export const pageList = (query) => {
+  return request({
+    url: '/member/marketTeam/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增/修改
+export const saveAndEdit = (data) => {
+  return request({
+    url: '/member/marketTeam/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除模板
+export const deleteById = (id) => {
+  return request({
+    url: '/member/marketTeam/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}
+
+// 修改状态
+export const updateStatus = (data) => {
+  return request({
+    url: '/member/marketTeam/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getSelectById(id) {
+  return request({
+    url: '/member/marketTeam/selectById?id=' + id,
+    method: 'get'
+  })
+}

src/components/formDesigner/formViewItem.vue

@@ -8,7 +8,7 @@ const layouts = {
     if(element.viewType === 'component'){
       return (
           <el-form-item label={element.showLabel ? element.label : ''}
-            label-width={labelWidth} 
+            label-width={labelWidth}
             prop={element.id}
             >
             <render key={element.id} conf={element} value={value} onInput={ event => {
@@ -19,7 +19,7 @@ const layouts = {
     }else if(element.viewType === 'html'){
       return (
         <el-form-item label={element.showLabel ? element.label : ''}
-          label-width={labelWidth} 
+          label-width={labelWidth}
           prop={element.id}
         >
           <fancy-html text={value}/>
@@ -31,14 +31,14 @@ const layouts = {
       }
       return (
         <el-form-item label={element.showLabel ? element.label : ''}
-          label-width={labelWidth} 
+          label-width={labelWidth}
           prop={element.id}
         >
           {value}
         </el-form-item>
       )
     }
-    
+
   }
 }
 
@@ -65,6 +65,6 @@ export default {
 .el-form-item{
   margin-left:10px;
   margin-right:10px;
-  margin-bottom: 5px;
+  //margin-bottom: 5px;
 }
-</style>
+</style>

src/components/formDesigner/previewItem.vue

@@ -44,6 +44,6 @@ export default {
 .el-form-item{
   margin-left:10px;
   margin-right:10px;
-  margin-bottom: 5px;
+  //margin-bottom: 5px;
 }
-</style>
+</style>

src/components/formDesigner/style/designer.scss

@@ -52,9 +52,9 @@ $lighterBlue: #409EFF;
       color: $lighterBlue;
     }
   }
-  
+
   .el-form-item{
-    margin-bottom: 5px;
+    //margin-bottom: 5px;
   }
 }
 .drawing-item{
@@ -74,7 +74,7 @@ $lighterBlue: #409EFF;
   cursor: move;
   .dynamic-table{
     padding: 12px 5px;
-    
+
   }
 }
 .drawing-row-item{
@@ -100,7 +100,7 @@ $lighterBlue: #409EFF;
   }
   &.active-from-item{
     border: 2px solid #e6a23c;
-    
+
   }
   .component-name{
     position: absolute;

src/utils/directives.js

@@ -31,6 +31,9 @@ Vue.directive('drag', (el, binding) => {
       let init_x = e.clientX - drawRect.x;
       let init_y = e.clientY - drawRect.y;
 
+      const drawRect_x = drawRect.x;
+      const drawRect_y = drawRect.y;
+
       const disX = e.clientX - (target.offsetLeft >= 0 ? target.offsetLeft : 0)
       const disY = e.clientY - (target.offsetTop >= 0 ? target.offsetTop : 0)
 
@@ -45,8 +48,8 @@ Vue.directive('drag', (el, binding) => {
         }
         // 通过事件委托，计算移动的距离
         // 因为浏览器里并不能直接取到并且使用clientX、clientY,所以使用事件委托在内部做完赋值
-        let l = (e.clientX - disX) - (drawRect.x > 77 ? parseInt(drawRect.x - 76) : 0);
-        let t = (e.clientY - disY) - (drawRect.y > 288 ? parseInt(drawRect.y - 287) : 0);
+        let l = (e.clientX - disX) - (drawRect.x > drawRect_x ? parseInt(drawRect.x - drawRect_x) : 0);
+        let t = (e.clientY - disY) - (drawRect.y > drawRect_y ? parseInt(drawRect.y - drawRect_y) : 0);
         const { marginTop: mt, marginLeft: ml } = window.getComputedStyle(target)
         // 计算移动当前元素的位置，并且给该元素样式中的left和top值赋值
         // target.style.left = l - parseInt(ml) + 'px'

src/views/distribution/personnelMr/dialog/addAndEdit.vue

@@ -0,0 +1,286 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: Sugar.
+ * @LastEditTime: 22023-11-24 13:55:00
+ * @FilePath: \cattle_webui\src\views\distribution\personnelMr\AddOrEditDialog.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="700px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="分销商名称" prop="name">
+          <el-input
+            v-model="form.name"
+            placeholder="分销商名称"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="分销商类型" prop="type">
+          <el-select
+            v-model="form.type"
+            placeholder="分销商类型"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in dict.type.distribution_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="负责人" prop="contact">
+          <el-input
+            v-model="form.contact"
+            placeholder="负责人"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="mobile">
+          <el-input
+            v-model="form.mobile"
+            placeholder="联系电话"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="密码">
+          <el-input
+            show-password
+            v-model="form.password"
+            placeholder="密码"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading.fullscreen.lock="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
+        <span v-if="loading">提交中...</span>
+        <span v-else>保存</span>
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+// import { updateNoticeMgr } from "@/api/system/noticeMgr";
+import { saveAndEdit, getSelectById } from "@/api/distribution/personnelMr";
+import Editor from "@/components/Editor";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "addAndEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      activeName: '01',
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+      },
+      rules: {
+        name: [{ required: true, message: "请输入分销商名称", trigger: "blur" }],
+        type: [{ required: true, message: "请选择分销商类型", trigger: "blur" }],
+        contact: [{ required: true, message: "请输入负责人", trigger: "blur" }],
+        mobile: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+      },
+      uploadObj: {
+        url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
+        Headers: { Authorization: "Bearer " + getToken() },
+      },
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.open = true;
+      this.reset();
+      if (obj){
+        this.title = "编辑分销人员";
+        this.getSelectByIdApi(obj);
+      }else{
+        this.title = "添加分销人员";
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /** 获取详情 */
+    getSelectByIdApi(row) {
+      const id = row.id
+      getSelectById(id).then(response => {
+        const obj = response.data;
+        this.$nextTick(() => {
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'name', obj.name);
+          this.$set(this.form, 'type', obj.type + '');
+          this.$set(this.form, 'contact', obj.contact);
+          this.$set(this.form, 'mobile', obj.mobile);
+        });
+      });
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+            const { code } = await saveAndEdit({ ...this.form });
+            if (code === 200) {
+              this.$message.success("操作成功!");
+              this.$emit("getList");
+              this.cancel();
+            }
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'name', '');
+      this.$set(this.form, 'type', '');
+      this.$set(this.form, 'contact', '');
+      this.$set(this.form, 'mobile', '');
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /**
+     * 上传成功
+     * @date 2023-11-22
+     * @param {any} res
+     * @returns {any}
+     */
+    handleAvatarSuccess(res) {
+      if (res.code === 200) {
+        // this.form.mainImg = res?.data?.url;
+        this.$set(this.form, 'mainImg', res?.data?.url)
+      }
+    },
+    /**
+     * 上传文件之前之前
+     * @date 2023-11-22
+     * @param {any} file
+     * @returns {any}
+     */
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg" || "image/png";
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是jpg或png格式!");
+      }
+      return isJPG;
+    },
+    /**
+     * 剧目海报上传成功
+     * @date 2023-11-22
+     * @param {any} res
+     * @returns {any}
+     */
+    handlePhotoListSuccess(res) {
+      if (res.code === 200) {
+        let photo = {
+          imageUrl: res?.data?.url,
+          url: res?.data?.url,
+          photoType: '2'
+        }
+        if(!this.form.photoList){
+          this.form.photoList = []
+        }
+        // this.form.photoList.push(photo);
+        this.$set(this.form.photoList, this.form.photoList.length, photo);
+      }
+    },
+    handleRemove(file, fileList) {
+      this.form.photoList.forEach((item, index) => {
+        if(item.uid == file.uid){
+          this.form.photoList.splice(index, 1)
+        }
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+.dialog {
+  padding: 0 30px;
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+</style>

src/views/distribution/personnelMr/index.vue

@@ -0,0 +1,413 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="分销商名称" label-width="90px">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入分销商名称"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分销商类型">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="分销商类型"
+          clearable
+          style="width: 140px"
+        >
+          <el-option
+            v-for="dict in dict.type.distribution_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['personnelMr:personnelMr:add']"
+            >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-setting"
+          size="mini"
+          @click="openSet"
+          v-hasPermi="['personnelMr:personnelMr:set']"
+        >提现设置</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="dataList" border>
+      <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
+      <el-table-column label="分销商名称" align="center" prop="name" />
+      <el-table-column label="分销商类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.distribution_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="负责人" align="center" prop="contact" />
+      <el-table-column label="手机号" align="center" prop="mobile" />
+      <el-table-column label="佣金总额" align="center" prop="brokerageTotal">
+        <template slot-scope="scope">
+          <span v-if="scope.row.brokerageTotal">￥{{ scope.row.brokerageTotal }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="待提现" align="center" prop="withdrawTotal">
+        <template slot-scope="scope">
+          <span v-if="scope.row.withdrawTotal">￥{{ scope.row.withdrawTotal }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <el-switch
+            @change="ionlineApi(scope.row)"
+            v-model="scope.row.switchValue"
+            :active-value="1"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="添加时间" align="center" prop="createTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['personnelMr:personnelMr:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="resettingApi(scope.row)"
+            v-hasPermi="['personnelMr:personnelMr:resetting']"
+          >重置密码</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['personnelMr:personnelMr:delete']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 新增/编辑弹框 -->
+    <add-and-edit
+      ref="addAndEdit"
+      :dict="dict"
+      @getList="getList"
+    />
+
+    <el-dialog
+      title="查看"
+      :visible.sync="visibleStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div v-if="visibleType == 'img'">
+        <el-image
+          style="width: 400px; height: 100%"
+          :src="newObj.mainImg"
+          fit="cover"
+        />
+      </div>
+      <div v-if="visibleType == 'html'">
+        <div v-html="newObj.centent"></div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visibleStatus = false">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      title="提现设置"
+      :visible.sync="setStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <el-form :model="setForm" ref="setForm" label-width="120px">
+        <el-form-item label="类型:">
+          <el-radio v-model="setForm.type" label="1">按实值</el-radio>
+          <el-radio v-model="setForm.type" label="2">按比例</el-radio>
+        </el-form-item>
+        <el-form-item label="提现手续费">
+          <el-input
+            type="number"
+            v-model="setForm.serviceCharge"
+            placeholder=""
+            clearable
+            @change="changePriceAmount('serviceCharge')"
+            style="width: 260px;"
+          >
+            <template slot="append">{{ setForm.type == 2 ? '%' : '元' }}</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="提现门槛">
+          <el-input
+            type="number"
+            v-model="setForm.withdrawMinMoney"
+            placeholder=""
+            clearable
+            @change="changePriceAmount('withdrawMinMoney')"
+            style="width: 260px;"
+          >
+          </el-input>
+          <span style="margin-left: 5px">元以上方可提现</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="setStatus = false">取消</el-button>
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-loading.fullscreen.lock="setLoading"
+          element-loading-text="提交中..."
+          element-loading-spinner="el-icon-loading"
+          element-loading-background="rgba(0, 0, 0, 0.8)"
+        >
+          <span v-if="loading">提交中...</span>
+          <span v-else>保存</span>
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById, updateStatus, configUpdate, getSetInfo } from '@/api/distribution/personnelMr'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['distribution_type'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      statusList: [
+        {id: 1, name: '未发布', value: 0},
+        {id: 2, name: '发布', value: 1},
+        {id: 3, name: '下架', value: 2},
+      ],
+      visibleStatus: false,
+      newObj: {},
+      visibleType: '',
+      setStatus: false,
+      setForm: {},
+      setRules: [],
+      setLoading: false,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.queryParams)
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.dataList.forEach(item =>{
+            item.switchValue = item.status;
+          })
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.$set(this.queryParams, 'name', '');
+      this.$set(this.queryParams, 'type', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /** 价格输入事件 */
+    changePriceAmount(key) {
+      if(this.setForm[key] * 1 < 0){
+        this.$message.error("输入需大于或等于0!");
+        this.$set(this.setForm, key, '');
+        return false
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", null);
+    },
+    /** 提现设置按钮操作 */
+    openSet() {
+      this.setStatus = true
+      this.getSetApi();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row);
+    },
+
+    /** 获取提现设置 */
+    getSetApi(row) {
+      getSetInfo().then(response => {
+        const obj = response.data;
+        this.$nextTick(() => {
+          this.$set(this.setForm, 'id', obj.id ? obj.id : '');
+          this.$set(this.setForm, 'withdrawMinMoney', obj.withdrawMinMoney);
+          this.$set(this.setForm, 'serviceCharge', obj.serviceCharge);
+          this.$set(this.setForm, 'type', obj.type ? (obj.type + '') : '1');
+        });
+      });
+    },
+
+    /**
+     * 分析提现
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["setForm"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.setLoading = true;
+            const { code } = await configUpdate({ ...this.setForm });
+            if (code === 200) {
+              this.setLoading = false;
+              this.$message.success("操作成功!");
+              this.getList();
+              this.setStatus = false;
+            }
+          } catch (error) {
+          } finally {
+            this.setLoading = false;
+          }
+        }
+      });
+    },
+
+    /** 禁用或者启用发布按钮操作 */
+    ionlineApi(row) {
+      this.$confirm("是否对分销商名称为" + row.name + "的数据进行" + (row.status == 1 ? '禁用？' : '启用？'), '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateStatus({ id: row.id, status: row.status == 1 ? 0 : 1 }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    },
+
+    /** 置顶或者取消置顶按钮操作 */
+    resettingApi(row) {
+      this.$confirm("是否对分销商名称为" + row.name + "的数据进行密码重置,重置后的密码为123456？", '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateStatus({ id: row.id, password: '123456' }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    },
+
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除数据分销商名称为"' + row.name + '"的数据项？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    seeCenter(obj, type) {
+      this.visibleStatus = true
+      this.visibleType = type;
+      this.newObj = obj;
+    }
+  }
+};
+</script>

src/views/distribution/ticketMr/dialog/addAndEdit.vue

@@ -0,0 +1,329 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: Sugar.
+ * @LastEditTime: 22023-11-24 13:55:00
+ * @FilePath: \cattle_webui\src\views\distribution\personnelMr\AddOrEditDialog.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="700px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="选择剧目" prop="type">
+          <el-select
+            v-model="form.goodsId"
+            placeholder="选择剧目"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in goodsList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="票务管理" prop="type">
+          <el-select
+            v-model="form.ticketId"
+            placeholder="票务管理"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in ticketList"
+              :key="dict.id"
+              :label="dict.goodsName"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="销售价" prop="contact">
+          <el-input
+            disabled
+            v-model="form.contact"
+            placeholder="销售价"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="分销价">
+          <el-input
+            type="number"
+            v-model="form.serviceCharge"
+            placeholder=""
+            clearable
+            @change="changePriceAmount('serviceCharge')"
+            style="width: 260px;"
+          >
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="佣金">
+          <el-input
+            type="number"
+            v-model="form.serviceCharge"
+            placeholder=""
+            clearable
+            @change="changePriceAmount('serviceCharge')"
+            style="width: 260px;"
+          >
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading.fullscreen.lock="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
+        <span v-if="loading">提交中...</span>
+        <span v-else>保存</span>
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+// import { updateNoticeMgr } from "@/api/system/noticeMgr";
+import { saveAndEdit, getSelectById } from "@/api/distribution/personnelMr";
+import Editor from "@/components/Editor";
+import { getToken } from "@/utils/auth";
+import { goodsPageList } from '@/api/programmeMr/programmeMr'
+import { ticketPageList } from '@/api/ticketMr/ticketMr'
+export default {
+  name: "addAndEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      activeName: '01',
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+      },
+      rules: {
+        name: [{ required: true, message: "请选择选择剧目", trigger: "blur" }],
+        type: [{ required: true, message: "请选择票务", trigger: "blur" }],
+        contact: [{ required: true, message: "请输入分销价", trigger: "blur" }],
+        mobile: [{ required: true, message: "请输入佣金", trigger: "blur" }],
+      },
+      uploadObj: {
+        url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
+        Headers: { Authorization: "Bearer " + getToken() },
+      },
+      goodsList: [],
+      ticketList: []
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.open = true;
+      this.goodsPageList();
+      this.ticketListApi();
+      this.reset();
+      if (obj){
+        this.title = "编辑分销人员";
+        this.getSelectByIdApi(obj);
+      }else{
+        this.title = "添加分销人员";
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /** 获取详情 */
+    getSelectByIdApi(row) {
+      const id = row.id
+      getSelectById(id).then(response => {
+        const obj = response.data;
+        this.$nextTick(() => {
+          this.$set(this.form, 'id', obj.id);
+          this.$set(this.form, 'name', obj.name);
+          this.$set(this.form, 'type', obj.type + '');
+          this.$set(this.form, 'contact', obj.contact);
+          this.$set(this.form, 'mobile', obj.mobile);
+        });
+      });
+    },
+    /** 剧目列表查询 */
+    goodsPageList() {
+      goodsPageList(this.addDateRange({pageNum: 1, pageSize: 100, status: 1}))
+        .then(response => {
+          this.goodsList = response.data.rows;
+        });
+    },
+    /** 票务列表查询 */
+    ticketListApi() {
+      ticketPageList(this.addDateRange({pageNum: 1, pageSize: 100,  goodsType: 2, classifyId: 1, status: 0}))
+        .then(response => {
+          this.ticketList = response.data.rows;
+        });
+    },
+    /** 价格输入事件 */
+    changePriceAmount(key) {
+      if(this.form[key] * 1 < 0){
+        this.$message.error("输入需大于或等于0!");
+        this.$set(this.form, key, '');
+        return false
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+            const { code } = await saveAndEdit({ ...this.form });
+            if (code === 200) {
+              this.$message.success("操作成功!");
+              this.$emit("getList");
+              this.cancel();
+            }
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'name', '');
+      this.$set(this.form, 'type', '');
+      this.$set(this.form, 'contact', '');
+      this.$set(this.form, 'mobile', '');
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /**
+     * 上传成功
+     * @date 2023-11-22
+     * @param {any} res
+     * @returns {any}
+     */
+    handleAvatarSuccess(res) {
+      if (res.code === 200) {
+        // this.form.mainImg = res?.data?.url;
+        this.$set(this.form, 'mainImg', res?.data?.url)
+      }
+    },
+    /**
+     * 上传文件之前之前
+     * @date 2023-11-22
+     * @param {any} file
+     * @returns {any}
+     */
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg" || "image/png";
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是jpg或png格式!");
+      }
+      return isJPG;
+    },
+    /**
+     * 剧目海报上传成功
+     * @date 2023-11-22
+     * @param {any} res
+     * @returns {any}
+     */
+    handlePhotoListSuccess(res) {
+      if (res.code === 200) {
+        let photo = {
+          imageUrl: res?.data?.url,
+          url: res?.data?.url,
+          photoType: '2'
+        }
+        if(!this.form.photoList){
+          this.form.photoList = []
+        }
+        // this.form.photoList.push(photo);
+        this.$set(this.form.photoList, this.form.photoList.length, photo);
+      }
+    },
+    handleRemove(file, fileList) {
+      this.form.photoList.forEach((item, index) => {
+        if(item.uid == file.uid){
+          this.form.photoList.splice(index, 1)
+        }
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+.dialog {
+  padding: 0 30px;
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+</style>

src/views/distribution/ticketMr/index.vue

@@ -0,0 +1,310 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="票务名称" label-width="70px">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入票务名称"
+          clearable
+          style="width: 240px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['distributionTicketMr:distributionTicketMr:add']"
+            >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="dataList" border>
+      <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
+      <el-table-column label="剧目名称" align="center" prop="name" />
+      <el-table-column label="票务名称" align="center" prop="name" />
+      <el-table-column label="销售价" align="center" prop="brokerageTotal">
+        <template slot-scope="scope">
+          <span v-if="scope.row.brokerageTotal">￥{{ scope.row.brokerageTotal }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分销价" align="center" prop="withdrawTotal">
+        <template slot-scope="scope">
+          <span v-if="scope.row.withdrawTotal">￥{{ scope.row.withdrawTotal }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="佣金" align="center" prop="withdrawTotal">
+        <template slot-scope="scope">
+          <span v-if="scope.row.withdrawTotal">￥{{ scope.row.withdrawTotal }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <span></span>
+        </template>
+      </el-table-column>
+      <el-table-column label="添加时间" align="center" prop="createTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['distributionTicketMr:distributionTicketMr:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="resettingApi(scope.row)"
+            v-hasPermi="['distributionTicketMr:distributionTicketMr:resetting']"
+          >{{ scope.row.status == 1 ? '上架' : '下架' }}</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['distributionTicketMr:distributionTicketMr:delete']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 新增/编辑弹框 -->
+    <add-and-edit
+      ref="addAndEdit"
+      :dict="dict"
+      @getList="getList"
+    />
+
+    <el-dialog
+      title="查看"
+      :visible.sync="visibleStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div v-if="visibleType == 'img'">
+        <el-image
+          style="width: 400px; height: 100%"
+          :src="newObj.mainImg"
+          fit="cover"
+        />
+      </div>
+      <div v-if="visibleType == 'html'">
+        <div v-html="newObj.centent"></div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visibleStatus = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById, updateStatus, configUpdate, getSetInfo } from '@/api/distribution/personnelMr'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['distribution_type'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      statusList: [
+        {id: 1, name: '未发布', value: 0},
+        {id: 2, name: '发布', value: 1},
+        {id: 3, name: '下架', value: 2},
+      ],
+      visibleStatus: false,
+      newObj: {},
+      visibleType: '',
+      setStatus: false,
+      setForm: {},
+      setRules: [],
+      setLoading: false,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.queryParams)
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.dataList.forEach(item =>{
+            item.switchValue = item.status;
+          })
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.$set(this.queryParams, 'name', '');
+      this.$set(this.queryParams, 'type', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /** 价格输入事件 */
+    changePriceAmount(key) {
+      if(this.setForm[key] * 1 < 0){
+        this.$message.error("输入需大于或等于0!");
+        this.$set(this.setForm, key, '');
+        return false
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", null);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row);
+    },
+
+    /**
+     * 分析提现
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["setForm"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.setLoading = true;
+            const { code } = await configUpdate({ ...this.setForm });
+            if (code === 200) {
+              this.setLoading = false;
+              this.$message.success("操作成功!");
+              this.getList();
+              this.setStatus = false;
+            }
+          } catch (error) {
+          } finally {
+            this.setLoading = false;
+          }
+        }
+      });
+    },
+
+    /** 禁用或者启用发布按钮操作 */
+    ionlineApi(row) {
+      this.$confirm("是否对分销商名称为" + row.name + "的数据进行" + (row.status == 1 ? '禁用？' : '启用？'), '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateStatus({ id: row.id, status: row.status == 1 ? 0 : 1 }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    },
+
+    /** 置顶或者取消置顶按钮操作 */
+    resettingApi(row) {
+      this.$confirm("是否对分销商名称为" + row.name + "的数据进行密码重置,重置后的密码为123456？", '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateStatus({ id: row.id, password: '123456' }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    },
+
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除数据分销商名称为"' + row.name + '"的数据项？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    seeCenter(obj, type) {
+      this.visibleStatus = true
+      this.visibleType = type;
+      this.newObj = obj;
+    }
+  }
+};
+</script>

src/views/information/informationMr/dialog/addAndEdit.vue

@@ -61,6 +61,18 @@
             <div class="el-upload__tip" slot="tip">只能上传.jpg或.png格式</div>
           </el-upload>
         </el-form-item>
+        <el-form-item label="内容简介" prop="infoSnapshot">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.infoSnapshot"
+            placeholder="内容简介"
+            clearable
+            show-word-limit
+            maxlength="34"
+            style="width: 100%;"
+          />
+        </el-form-item>
         <el-form-item label="文章内容：" prop="centent">
           <editor ref="editor" v-model="form.centent" :fileSize="20" :min-height="200" />
         </el-form-item>
@@ -114,6 +126,7 @@ export default {
       rules: {
         title: [{ required: true, message: "请输入标题", trigger: "blur" }],
         mainImg: [{ required: true, message: "请上传封面", trigger: "blur" }],
+        infoSnapshot: [{ required: true, message: "请输入内容简介", trigger: "blur" }],
         centent: [
           { required: true, message: "请输入内容详情", trigger: "blur" },
         ],
@@ -141,6 +154,7 @@ export default {
           this.$set(this.form, 'title', obj.title);
           this.$set(this.form, 'sort', obj.sort);
           this.$set(this.form, 'mainImg', obj.mainImg);
+          this.$set(this.form, 'infoSnapshot', obj.infoSnapshot);
           this.$set(this.form, 'centent', obj.centent);
         });
       }else{
@@ -191,6 +205,7 @@ export default {
       this.$set(this.form, 'sort', '');
       this.$set(this.form, 'mainImg', '');
       this.$set(this.form, 'centent', '');
+      this.$set(this.form, 'infoSnapshot', '');
     },
     /**
      * 关闭弹框

src/views/login.vue

@@ -117,6 +117,8 @@ export default {
       this.processClass = 'login-stage';
     } else if (process.env.NODE_ENV == 'production') { // 生产环境
       this.processClass = 'login-prod';
+      this.$set(this.loginForm, 'username', '');
+      this.$set(this.loginForm, 'password', '');
     }
   },
   methods: {

src/views/perform/performMr/dialog/addAndEdit.vue

@@ -18,10 +18,10 @@
   >
     <div class="dialog">
       <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        <el-form-item label="主办方名你" prop="name">
+        <el-form-item label="主办方名称" prop="name">
           <el-input
             v-model="form.name"
-            placeholder="主办方名你"
+            placeholder="主办方名称"
             clearable
             style="width: 100%;"
           />
@@ -103,9 +103,9 @@ export default {
         id: undefined,
       },
       rules: {
-        name: [{ required: true, message: "请输入主办方名你", trigger: "blur" }],
-        corporationName: [{ required: true, message: "请输入法人名你", trigger: "blur" }],
-        contactName: [{ required: true, message: "请输入负责人名你", trigger: "blur" }],
+        name: [{ required: true, message: "请输入主办方名称", trigger: "blur" }],
+        corporationName: [{ required: true, message: "请输入法人名称", trigger: "blur" }],
+        contactName: [{ required: true, message: "请输入负责人名称", trigger: "blur" }],
         contactMobile: [
           { required: true, message: "请输入负责人联系电话", trigger: "blur" },
           { validator: isPhone, trigger: 'blur' }

src/views/perform/programmeMr/dialog/addAndEdit.vue

@@ -521,22 +521,6 @@ export default {
       }
     },
     handleRemove(file, fileList) {
-      // this.form.photoList = []
-      // fileList.forEach(item => {
-      //   if(item.response && item.response.data){
-      //     let res = item.response.data;
-      //     let photo = {
-      //       imageUrl: res?.data?.url,
-      //       url: res?.data?.url,
-      //       photoType: '2'
-      //     }
-      //     if(!this.form.photoList){
-      //       this.form.photoList = []
-      //     }
-      //     // this.form.photoList.push(photo);
-      //     this.$set(this.form.photoList, this.form.photoList.length, photo);
-      //   }
-      // })
       this.form.photoList.forEach((item, index) => {
         if(item.uid == file.uid){
           this.form.photoList.splice(index, 1)

src/views/team/teamMr/dialog/addAndEdit.vue

@@ -0,0 +1,330 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: Sugar.
+ * @LastEditTime: 22023-11-24 13:55:00
+ * @FilePath: \cattle_webui\src\views\team\teamMr\AddOrEditDialog.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="700px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
+        <el-form-item label="团队名称" prop="name">
+          <el-input
+            v-model="form.name"
+            placeholder="团队名称"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="团队类型" prop="type">
+          <el-select
+            v-model="form.type"
+            placeholder="团队类型"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in dict.type.team_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="负责人" prop="contact">
+          <el-input
+            v-model="form.contact"
+            placeholder="负责人"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="mobile">
+          <el-input
+            v-model="form.mobile"
+            placeholder="联系电话"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="密码">
+          <el-input
+            show-password
+            v-model="form.password"
+            placeholder="密码"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="合约信息">
+          <el-upload
+            ref="upload"
+            :action="uploadObj.url"
+            :headers="uploadObj.headers"
+            accept=".jpg,.png"
+            :on-success="handlePhotoListSuccess"
+            :before-upload="beforeAvatarUpload"
+            list-type="picture-card"
+            :file-list="form.photoList"
+            :on-remove="handleRemove"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading.fullscreen.lock="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
+        <span v-if="loading">提交中...</span>
+        <span v-else>保存</span>
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+// import { updateNoticeMgr } from "@/api/system/noticeMgr";
+import { saveAndEdit, getSelectById } from "@/api/team/teamMr";
+import Editor from "@/components/Editor";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "addAndEdit",
+  props: {
+    dict: {
+      type: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      activeName: '01',
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+        type: "",
+      },
+      rules: {
+        name: [{ required: true, message: "请输入团队名称", trigger: "blur" }],
+        type: [{ required: true, message: "请选择团队类型", trigger: "blur" }],
+        contact: [{ required: true, message: "请输入负责人", trigger: "blur" }],
+        mobile: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+      },
+      uploadObj: {
+        url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
+        Headers: { Authorization: "Bearer " + getToken() },
+      },
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.open = true;
+      this.reset();
+      if (obj){
+        this.title = "编辑团队";
+        this.getSelectByIdApi(obj);
+      }else{
+        this.title = "添加团队";
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /** 获取详情 */
+    getSelectByIdApi(row) {
+      const id = row.id
+      getSelectById(id).then(response => {
+        const obj = response.data;
+        this.$nextTick(() => {
+          this.$nextTick(() => {
+            this.$set(this.form, 'id', obj.id);
+            this.$set(this.form, 'name', obj.name);
+            this.$set(this.form, 'type', obj.type + '');
+            this.$set(this.form, 'contact', obj.contact);
+            this.$set(this.form, 'password', "");
+            this.$set(this.form, 'mobile', obj.mobile);
+            if(obj.contractImg){
+              if(obj.contractImg.indexOf(',') > -1){
+                let img_list = obj.contractImg.split(',');
+                let img_list_new = [];
+                img_list.forEach(item => {
+                  img_list_new.push({
+                    url: item,
+                  })
+                });
+                this.$set(this.form, 'photoList', img_list_new);
+              } else {
+                this.$set(this.form, 'photoList', obj.contractImg);
+              }
+            } else {
+              this.$set(this.form, 'photoList', []);
+            }
+          });
+        });
+      });
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+            this.form.contractImg = '';
+            this.form.photoList.forEach((item, index) => {
+              if(index < this.form.photoList.length - 1) {
+                this.form.contractImg += item.url + ",";
+              } else {
+                this.form.contractImg += item.url;
+              }
+            })
+            const { code } = await saveAndEdit({ ...this.form });
+            if (code === 200) {
+              this.$message.success("操作成功!");
+              this.$emit("getList");
+              this.cancel();
+            }
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      this.$set(this.form, 'id', "");
+      this.$set(this.form, 'name', "");
+      this.$set(this.form, 'type', "");
+      this.$set(this.form, 'contact', "");
+      this.$set(this.form, 'password', "");
+      this.$set(this.form, 'mobile', "");
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /**
+     * 上传成功
+     * @date 2023-11-22
+     * @param {any} res
+     * @returns {any}
+     */
+    handleAvatarSuccess(res) {
+      if (res.code === 200) {
+        // this.form.mainImg = res?.data?.url;
+        this.$set(this.form, 'mainImg', res?.data?.url)
+      }
+    },
+    /**
+     * 上传文件之前之前
+     * @date 2023-11-22
+     * @param {any} file
+     * @returns {any}
+     */
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg" || "image/png";
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是jpg或png格式!");
+      }
+      return isJPG;
+    },
+    /**
+     * 剧目海报上传成功
+     * @date 2023-11-22
+     * @param {any} res
+     * @returns {any}
+     */
+    handlePhotoListSuccess(res) {
+      if (res.code === 200) {
+        let photo = {
+          imageUrl: res?.data?.url,
+          url: res?.data?.url,
+          photoType: '2'
+        }
+        if(!this.form.photoList){
+          this.form.photoList = []
+        }
+        // this.form.photoList.push(photo);
+        this.$set(this.form.photoList, this.form.photoList.length, photo);
+      }
+    },
+    handleRemove(file, fileList) {
+      this.form.photoList.forEach((item, index) => {
+        if(item.uid == file.uid){
+          this.form.photoList.splice(index, 1)
+        }
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+.dialog {
+  padding: 0 30px;
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+</style>

src/views/team/teamMr/index.vue

@@ -0,0 +1,292 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="团队名称" label-width="70px">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入团队名称"
+          clearable
+          style="width: 140px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="团队类型">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="团队类型"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in dict.type.team_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['teamMr:teamMr:add']"
+            >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="tables" v-loading="loading" :data="dataList" border>
+      <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
+      <el-table-column label="团队名称" align="center" prop="name" />
+      <el-table-column label="团队类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.team_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="负责人" align="center" prop="contact" />
+      <el-table-column label="联系电话" align="center" prop="mobile" />
+      <el-table-column label="合约信息" align="center" prop="type">
+        <template slot-scope="scope">
+          <el-button type="text" @click="seeCenter(scope.row, 'img')">查看</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-switch
+            @change="updateStatusApi(scope.row)"
+            v-model="scope.row.switchValue"
+            :active-value="1"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="添加时间" align="center" prop="createTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['teamMr:teamMr:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="resettingApi(scope.row)"
+            v-hasPermi="['teamMr:teamMr:resetting']"
+          >重置密码</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row,scope.index)"
+            v-hasPermi="['teamMr:teamMr:delete']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 新增/编辑弹框 -->
+    <add-and-edit
+      ref="addAndEdit"
+      :dict="dict"
+      @getList="getList"
+    />
+
+
+    <el-dialog
+      title="查看"
+      :visible.sync="visibleStatus"
+      width="600px"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <div v-if="visibleType == 'img'">
+        <el-image
+          style="width: 400px; height: 100%"
+          v-for="(item, index) in newObj.contractImgList"
+          :key="index"
+          :src="item"
+          fit="cover"
+        />
+      </div>
+      <div v-if="visibleType == 'html'">
+        <div v-html="newObj.centent"></div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visibleStatus = false">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { pageList, deleteById, updateStatus } from '@/api/team/teamMr'
+import addAndEdit from "./dialog/addAndEdit.vue";
+
+export default {
+  name: "agreement",
+  dicts: ['team_type'],
+  components: { addAndEdit },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      dataList: null,
+      // 弹出层标题
+      title: "",
+
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: undefined
+      },
+      statusList: [
+        {id: 1, name: '未发布', value: 0},
+        {id: 2, name: '发布', value: 1},
+        {id: 3, name: '下架', value: 2},
+      ],
+      visibleStatus: false,
+      newObj: {},
+      visibleType: ''
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      pageList(this.addDateRange(this.queryParams, this.dateRange))
+      .then(response => {
+          this.dataList = response.data.rows;
+          this.dataList.forEach(item =>{
+            item.switchValue = item.status;
+          })
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.$set(this.queryParams, 'name', '');
+      this.$set(this.queryParams, 'type', '');
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs["addAndEdit"].openDialog("新增数据", null);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$refs["addAndEdit"].openDialog("修改数据", row);
+    },
+    /** 启用或者禁用按钮操作 */
+    updateStatusApi(row) {
+      this.$confirm("是否对团队名称为" + row.name + "的数据进行" + (row.status == 1 ? '禁用？' : '启用？'), '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateStatus({ id: row.id, status: row.status == 1 ? 0 : 1 }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    },
+    /** 重置密码按钮操作 */
+    resettingApi(row) {
+      this.$confirm("是否对团队名称为" + row.name + "的数据进行密码重置,重置后的密码为123456？", '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateStatus({ id: row.id, password: '123456' }).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除数据团队名称为"' + row.name + '"的数据项？').then(function() {
+        return deleteById(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查看按钮操作 */
+    seeCenter(obj, type) {
+      this.visibleStatus = true
+      this.visibleType = type;
+      this.newObj = obj;
+      if(obj.contractImg){
+        this.newObj.contractImgList = obj.contractImg.split(',')
+      }
+    }
+  }
+};
+</script>

src/views/userMr/index.vue

@@ -55,7 +55,7 @@
       </el-table-column>
       <el-table-column label="注册渠道" align="center" prop="onlineTime" width="160">
         <template slot-scope="scope">
-          <span>小程序</span>
+          <span>{{ sourceList[scope.row.regSource] }}</span>
         </template>
       </el-table-column>
       <el-table-column label="注册时间" align="center" prop="createTime" width="160">
@@ -137,7 +137,11 @@ export default {
       },
       visibleStatus: false,
       newObj: {},
-      visibleType: ''
+      visibleType: '',
+      sourceList: {
+        1: '小程序',
+        2: '公众号',
+      },
     };
   },
   created() {

src/views/venue/performanceHallMr/dialog/seatTemplateEdit.vue

@@ -49,7 +49,7 @@
                >
             <!--  画框确定  -->
             <div class="draw-dialog-class" id="draw-dialog-type" v-show="drawDialogType">
-              <div class="box-class" style="border: none; height: 240px">
+              <div class="box-class" style="border: none; height: 240px" @wheel.stop="wheelDrawHandle">
                 <el-form :model="drawForm" ref="drawForm" :rules="drawRules" label-width="100px" label-position="top">
                   <el-form-item label="" prop="status">
                     <el-radio v-model="drawForm.status" label="1">可售</el-radio>
@@ -243,14 +243,12 @@ export default {
     },
     // 画框座位设置
     drawDialogOk() {
-      console.log(this.colSeatMap)
       this.$refs["drawForm"].validate(async (valid) => {
         if (valid) {
           let drawDialog = document.getElementById("drawDiv");
           // 获取div元素的坐标点
           let rect = drawDialog.getBoundingClientRect();
           let P_div = document.getElementById("drawBox");
-          let test_div = document.getElementById("1_12");
 
           let P_div_list = P_div.children; // 获取行子集
           let select_div = [];
@@ -280,8 +278,8 @@ export default {
       let map = this.colSeatMap[row + '_' +col];
       map.status = this.drawForm.status;
       map.color = this.drawForm.seat.color;
-      map.seatTypeId = this.drawForm.seat.seatTypeId;
-      map.seatLabel = this.drawForm.seat.seatLabel;
+      map.seatTypeId = this.drawForm.seat.id;
+      map.seatLabel = this.drawForm.seat.name;
       map.name = "";
       map.priority = this.drawForm.priority;
 
@@ -309,6 +307,14 @@ export default {
       // this.seatWidth = (this.seatWidth + this.zoom);
       this.$forceUpdate();
     },
+    wheelDrawHandle(e) {
+      if(e.preventDefault){
+        e.preventDefault()
+      } else {
+        e.returnValue = false
+      }
+      return false
+    },
     contextmenuEven(e) {
       return false;
     },