瀏覽代碼

1. 调整

MONSTER-ygh 1 年之前
父節點
當前提交
d9d0fd7a05
共有 56 個文件被更改,包括 497 次插入241 次删除
  1. 2 2
      src/views/agreement/dialog/addAndEdit.vue
  2. 4 4
      src/views/appletMr/dialog/addAndEdit.vue
  3. 6 5
      src/views/device/IDcard/dialog/dataBox.vue
  4. 3 3
      src/views/device/IDcard/index.vue
  5. 3 3
      src/views/device/pda/dialog/dataBox.vue
  6. 6 5
      src/views/device/printer/dialog/dataBox.vue
  7. 3 3
      src/views/device/printer/index.vue
  8. 13 8
      src/views/device/robot/dialog/dataBox.vue
  9. 3 3
      src/views/device/robot/index.vue
  10. 6 5
      src/views/device/scanCodeBox/dialog/dataBox.vue
  11. 3 3
      src/views/device/scanCodeBox/index.vue
  12. 69 11
      src/views/distribution/personnelMr/dialog/addAndEdit.vue
  13. 1 1
      src/views/distribution/personnelMr/dialog/promotionCode.vue
  14. 6 1
      src/views/distribution/personnelMr/index.vue
  15. 6 6
      src/views/distribution/ticketMr/dialog/addAndEdit.vue
  16. 4 4
      src/views/information/informationMr/dialog/addAndEdit.vue
  17. 2 2
      src/views/login.vue
  18. 3 3
      src/views/monitor/job/index.vue
  19. 7 7
      src/views/otaMr/dialog/dataEdit.vue
  20. 3 3
      src/views/otaMr/index.vue
  21. 4 4
      src/views/perform/performMr/dialog/addAndEdit.vue
  22. 5 5
      src/views/perform/programmeMr/dialog/addAndEdit.vue
  23. 3 3
      src/views/perform/programmeMr/dialog/programmeAddAndEdit.vue
  24. 4 4
      src/views/register.vue
  25. 4 4
      src/views/schedulingMr/dialog/addAndEdit.vue
  26. 3 3
      src/views/system/config/index.vue
  27. 4 4
      src/views/system/dept/index.vue
  28. 3 3
      src/views/system/dict/data.vue
  29. 2 2
      src/views/system/dict/index.vue
  30. 3 3
      src/views/system/menu/index.vue
  31. 1 1
      src/views/system/notice/index.vue
  32. 2 2
      src/views/system/noticeMgr/Dialog/AddOrEditDialog.vue
  33. 3 3
      src/views/system/post/index.vue
  34. 3 3
      src/views/system/role/index.vue
  35. 4 4
      src/views/system/selfServeAdvertis/dialog/dataBox.vue
  36. 4 4
      src/views/system/user/index.vue
  37. 5 5
      src/views/system/user/profile/resetPwd.vue
  38. 4 4
      src/views/system/user/profile/userInfo.vue
  39. 10 10
      src/views/team/applicationMr/dialog/addAndEdit.vue
  40. 1 1
      src/views/team/applicationMr/dialog/applicationDetails.vue
  41. 4 4
      src/views/team/teamMr/dialog/addAndEdit.vue
  42. 6 6
      src/views/team/ticketMr/dialog/addAndEdit.vue
  43. 7 7
      src/views/ticket/priceMr/dialog/addAndEdit.vue
  44. 9 9
      src/views/ticket/ticketMr/dialog/addAndEdit.vue
  45. 3 3
      src/views/tool/customerform/fdform/list.vue
  46. 3 3
      src/views/tool/customerform/fdform/tempalteList.vue
  47. 4 4
      src/views/tool/gen/basicInfoForm.vue
  48. 5 5
      src/views/tool/gen/genInfoForm.vue
  49. 163 0
      src/views/userMr/dialog/dataBox.vue
  50. 47 25
      src/views/userMr/index.vue
  51. 3 3
      src/views/venue/performanceHallMr/dialog/addAndEdit.vue
  52. 3 3
      src/views/venue/performanceHallMr/dialog/programmeAddAndEdit.vue
  53. 2 2
      src/views/venue/performanceHallMr/dialog/seatTemplateEdit.vue
  54. 5 5
      src/views/venue/schedulingMr/dialog/addAndEdit.vue
  55. 2 2
      src/views/venue/seatTypeMr/dialog/addAndEdit.vue
  56. 6 6
      src/views/venue/venueMr/dialog/addAndEdit.vue

+ 2 - 2
src/views/agreement/dialog/addAndEdit.vue

@@ -85,9 +85,9 @@ export default {
         content: "",
       },
       rules: {
-        type: [{ required: true, message: "协议类型", trigger: "blur" }],
+        type: [{ required: true, message: "协议类型", trigger: ["change","blur"] }],
         content: [
-          { required: true, message: "请输入内容详情", trigger: "blur" },
+          { required: true, message: "请输入内容详情", trigger: ["change","blur"] },
         ],
       },
     };

+ 4 - 4
src/views/appletMr/dialog/addAndEdit.vue

@@ -113,11 +113,11 @@ export default {
         content: "",
       },
       rules: {
-        name: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        type: [{ required: true, message: "请选择类型", trigger: "blur" }],
-        sliderImg: [{ required: true, message: "请上传banner图", trigger: "blur" }],
+        name: [{ required: true, message: "请输入标题", trigger: ["change","blur"] }],
+        type: [{ required: true, message: "请选择类型", trigger: ["change","blur"] }],
+        sliderImg: [{ required: true, message: "请上传banner图", trigger: ["change","blur"] }],
         detail: [
-          { required: true, message: "请输入内容", trigger: "blur" },
+          { required: true, message: "请输入内容", trigger: ["change","blur"] },
         ],
       },
       uploadObj: {

+ 6 - 5
src/views/device/IDcard/dialog/dataBox.vue

@@ -32,7 +32,8 @@
           <span v-else>{{ form.deviceNo }}</span>
         </el-form-item>
         <el-form-item label="所在位置:" prop="deviceAddress">
-          <el-input v-model="form.deviceAddress" placeholder="请输入所在位置" />
+          <el-input v-if="type!=3" v-model="form.deviceAddress" placeholder="请输入所在位置" />
+          <span v-else>{{ form.deviceAddress }}</span>
         </el-form-item>
         <el-form-item label="设备类型:" prop="deviceType">
           <dict-tag :options="dict.type.device_sys_type" :value="form.deviceType"/>
@@ -70,15 +71,15 @@ export default {
       loading: false,
       form: {},
       rules: {
-        deviceName: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
+        deviceName: [{ required: true, message: "请输入设备名称", trigger: ["change","blur"] }],
         deviceNo: [
-          { required: true, message: "请输入设备编号", trigger: "blur" },
+          { required: true, message: "请输入设备编号", trigger: ["change","blur"] },
         ],
         deviceType: [
-          { required: true, message: "请输入设备类型", trigger: "blur" },
+          { required: true, message: "请输入设备类型", trigger: ["change","blur"] },
         ],
         deviceAddress: [
-          { required: true, message: "请输入所在位置", trigger: "blur" },
+          { required: true, message: "请输入所在位置", trigger: ["change","blur"] },
         ],
       },
     };

+ 3 - 3
src/views/device/IDcard/index.vue

@@ -142,15 +142,15 @@ export default {
     },
     /** 详情按钮操作 */
     openDetails(row, type) {
-      this.$refs["addAndEdit"].openDialog("详情", row);
+      this.$refs["addAndEdit"].openDialog("详情", row,3);
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$refs["addAndEdit"].openDialog("新增数据", null);
+      this.$refs["addAndEdit"].openDialog("新增数据", null,1);
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$refs["addAndEdit"].openDialog("修改数据", row);
+      this.$refs["addAndEdit"].openDialog("修改数据", row,2);
     },
     /** 删除按钮操作 */
     handleDelete(row) {

+ 3 - 3
src/views/device/pda/dialog/dataBox.vue

@@ -67,12 +67,12 @@ export default {
       loading: false,
       form: {},
       rules: {
-        deviceName: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
+        deviceName: [{ required: true, message: "请输入设备名称", trigger: ["change","blur"] }],
         deviceNo: [
-          { required: true, message: "请输入设备编号", trigger: "blur" },
+          { required: true, message: "请输入设备编号", trigger: ["change","blur"] },
         ],
         deviceType: [
-          { required: true, message: "请输入设备类型", trigger: "blur" },
+          { required: true, message: "请输入设备类型", trigger: ["change","blur"] },
         ],
       },
     };

+ 6 - 5
src/views/device/printer/dialog/dataBox.vue

@@ -32,7 +32,8 @@
           <span v-else>{{ form.deviceNo }}</span>
         </el-form-item>
         <el-form-item label="所在位置:" prop="deviceAddress">
-          <el-input v-model="form.deviceAddress" placeholder="请输入所在位置" />
+          <el-input v-if="type!=3" v-model="form.deviceAddress" placeholder="请输入所在位置" />
+          <span v-else>{{ form.deviceAddress }}</span>
         </el-form-item>
         <el-form-item label="设备类型:" prop="deviceType">
           <dict-tag :options="dict.type.device_sys_type" :value="form.deviceType"/>
@@ -70,15 +71,15 @@ export default {
       loading: false,
       form: {},
       rules: {
-        deviceName: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
+        deviceName: [{ required: true, message: "请输入设备名称", trigger: ["change","blur"] }],
         deviceNo: [
-          { required: true, message: "请输入设备编号", trigger: "blur" },
+          { required: true, message: "请输入设备编号", trigger: ["change","blur"] },
         ],
         deviceType: [
-          { required: true, message: "请输入设备类型", trigger: "blur" },
+          { required: true, message: "请输入设备类型", trigger: ["change","blur"] },
         ],
         deviceAddress: [
-          { required: true, message: "请输入所在位置", trigger: "blur" },
+          { required: true, message: "请输入所在位置", trigger: ["change","blur"] },
         ],
       },
     };

+ 3 - 3
src/views/device/printer/index.vue

@@ -142,15 +142,15 @@ export default {
     },
     /** 详情按钮操作 */
     openDetails(row, type) {
-      this.$refs["addAndEdit"].openDialog("详情", row);
+      this.$refs["addAndEdit"].openDialog("详情", row,3);
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$refs["addAndEdit"].openDialog("新增数据", null);
+      this.$refs["addAndEdit"].openDialog("新增数据", null,1);
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$refs["addAndEdit"].openDialog("修改数据", row);
+      this.$refs["addAndEdit"].openDialog("修改数据", row,2);
     },
     /** 删除按钮操作 */
     handleDelete(row) {

+ 13 - 8
src/views/device/robot/dialog/dataBox.vue

@@ -24,13 +24,16 @@
       :rules="rules" 
       label-width="120px">
         <el-form-item label="设备名称:" prop="deviceName">
-          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+          <el-input v-if="type!=3" v-model="form.deviceName" placeholder="请输入设备名称" />
+          <span v-else>{{ form.deviceName }}</span>
         </el-form-item>
         <el-form-item label="设备编号:" prop="deviceNo">
-          <el-input v-model="form.deviceNo" placeholder="请输入设备编号" />
+          <el-input v-if="type!=3" v-model="form.deviceNo" placeholder="请输入设备编号" />
+          <span v-else>{{ form.deviceNo }}</span>
         </el-form-item>
         <el-form-item label="设备IP:" prop="deviceAddress">
-          <el-input v-model="form.deviceAddress" placeholder="请输入设备IP" />
+          <el-input v-if="type!=3" v-model="form.deviceAddress" placeholder="请输入设备IP" />
+          <span v-else>{{ form.deviceAddress }}</span>
         </el-form-item>
         <el-form-item label="设备类型:" prop="deviceType">
           <dict-tag :options="dict.type.device_sys_type" :value="form.deviceType"/>
@@ -61,6 +64,7 @@ export default {
   data() {
     return {
       title: "编辑",
+      type: 0,
       model: "EDIT",
       open: false,
       loading: false,
@@ -70,15 +74,15 @@ export default {
         content: "",
       },
       rules: {
-        deviceName: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
+        deviceName: [{ required: true, message: "请输入设备名称", trigger: ["change","blur"] }],
         deviceNo: [
-          { required: true, message: "请输入设备编号", trigger: "blur" },
+          { required: true, message: "请输入设备编号", trigger: ["change","blur"] },
         ],
         deviceType: [
-          { required: true, message: "请输入设备类型", trigger: "blur" },
+          { required: true, message: "请输入设备类型", trigger: ["change","blur"] },
         ],
         deviceAddress: [
-          { required: true, message: "请输入所在位置", trigger: "blur" },
+          { required: true, message: "请输入设备IP", trigger: ["change","blur"] },
         ],
       },
     };
@@ -90,8 +94,9 @@ export default {
      * @param {any} obj
      * @returns {any}
      */
-    openDialog(title, obj) {
+    openDialog(title, obj,type) {
       this.title = title;
+      this.type = type
       this.open = true;
       if (obj){
         this.$nextTick(() => {

+ 3 - 3
src/views/device/robot/index.vue

@@ -142,15 +142,15 @@ export default {
     },
     /** 详情按钮操作 */
     openDetails(row, type) {
-      this.$refs["addAndEdit"].openDialog("详情", row);
+      this.$refs["addAndEdit"].openDialog("详情", row,3);
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$refs["addAndEdit"].openDialog("新增数据", null);
+      this.$refs["addAndEdit"].openDialog("新增数据", null,1);
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$refs["addAndEdit"].openDialog("修改数据", row);
+      this.$refs["addAndEdit"].openDialog("修改数据", row,2);
     },
     /** 删除按钮操作 */
     handleDelete(row) {

+ 6 - 5
src/views/device/scanCodeBox/dialog/dataBox.vue

@@ -32,7 +32,8 @@
           <span v-else>{{ form.deviceNo }}</span>
         </el-form-item>
         <el-form-item label="所在位置:" prop="deviceAddress">
-          <el-input v-model="form.deviceAddress" placeholder="请输入所在位置" />
+          <el-input v-if="type!=3" v-model="form.deviceAddress" placeholder="请输入所在位置" />
+          <span v-else>{{ form.deviceAddress }}</span>
         </el-form-item>
         <el-form-item label="设备类型:" prop="deviceType">
           <dict-tag :options="dict.type.device_sys_type" :value="form.deviceType"/>
@@ -70,15 +71,15 @@ export default {
       loading: false,
       form: {},
       rules: {
-        deviceName: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
+        deviceName: [{ required: true, message: "请输入设备名称", trigger: ["change","blur"] }],
         deviceNo: [
-          { required: true, message: "请输入设备编号", trigger: "blur" },
+          { required: true, message: "请输入设备编号", trigger: ["change","blur"] },
         ],
         deviceType: [
-          { required: true, message: "请输入设备类型", trigger: "blur" },
+          { required: true, message: "请输入设备类型", trigger: ["change","blur"] },
         ],
         deviceAddress: [
-          { required: true, message: "请输入所在位置", trigger: "blur" },
+          { required: true, message: "请输入所在位置", trigger: ["change","blur"] },
         ],
       },
     };

+ 3 - 3
src/views/device/scanCodeBox/index.vue

@@ -142,15 +142,15 @@ export default {
     },
     /** 详情按钮操作 */
     openDetails(row, type) {
-      this.$refs["addAndEdit"].openDialog("详情", row);
+      this.$refs["addAndEdit"].openDialog("详情", row,3);
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$refs["addAndEdit"].openDialog("新增数据", null);
+      this.$refs["addAndEdit"].openDialog("新增数据", null,1);
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$refs["addAndEdit"].openDialog("修改数据", row);
+      this.$refs["addAndEdit"].openDialog("修改数据", row,2);
     },
     /** 删除按钮操作 */
     handleDelete(row) {

+ 69 - 11
src/views/distribution/personnelMr/dialog/addAndEdit.vue

@@ -48,6 +48,42 @@
             clearable
             style="width: 100%;"
           />
+          <span style="font-size: 12px;color: #777;">注:负责人姓名必须与微信实名信息一致</span>
+        </el-form-item>
+        <el-form-item label="销售人员:" prop="salePerson">
+          <el-input
+            v-model="form.salePerson"
+            placeholder="销售人员"
+            clearable
+            style="width: 100%;"
+          />
+        </el-form-item>
+        <el-form-item label="上级分销人员:" prop="parentId">
+          <el-select
+            v-model="form.parentId"
+            filterable
+            remote
+            clearable
+            reserve-keyword
+            placeholder="请选择上级分销人员"
+            :remote-method="remoteMethod"
+            @change=""
+            :loading="parentNameLoading">
+            <el-option
+              v-for="item in parentNameList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否可提现:" prop="allowWithdraw">
+          <el-radio-group v-model="form.allowWithdraw">
+            <el-radio v-for="dict in dict.type.user_allow_withdraw"
+            :key="dict.value"
+            :label="Number(dict.value)"
+            >{{ dict.label }}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="账号/联系电话:" prop="mobile">
           <el-input
@@ -88,17 +124,12 @@
 
 <script>
 // import { updateNoticeMgr } from "@/api/system/noticeMgr";
-import { saveAndEdit, getSelectById } from "@/api/distribution/personnelMr";
+import { saveAndEdit, getSelectById,pageList } from "@/api/distribution/personnelMr";
 import Editor from "@/components/Editor";
 import { getToken } from "@/utils/auth";
 export default {
   name: "addAndEdit",
-  props: {
-    dict: {
-      type: Object,
-      default: () => [],
-    },
-  },
+  dicts:['user_allow_withdraw','distribution_type'],
   components: {
     Editor,
   },
@@ -113,15 +144,21 @@ export default {
         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" }],
+        name: [{ required: true, message: "请输入分销商名称", trigger: ["change","blur"] }],
+        type: [{ required: true, message: "请选择分销商类型", trigger: ["change","blur"] }],
+        contact: [{ required: true, message: "请输入负责人", trigger: ["change","blur"] }],
+        mobile: [{ required: true, message: "请输入账号/联系电话", trigger: ["change","blur"] }],
+        allowWithdraw: [{ required: true, message: "请选择是否可提现", trigger: ["change","blur"] }],
+        parentId: [{ required: true, message: "请选择上级分销人员", trigger: ["change","blur"] }],
+        salePerson: [{ required: true, message: "请输入销售人员名称", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
         Headers: { Authorization: "Bearer " + getToken() },
       },
+
+      parentNameLoading: false,
+      parentNameList: []
     };
   },
   methods: {
@@ -155,6 +192,8 @@ export default {
           this.$set(this.form, 'type', obj.type + '');
           this.$set(this.form, 'contact', obj.contact);
           this.$set(this.form, 'mobile', obj.mobile);
+          this.$set(this.form, 'allowWithdraw', obj.allowWithdraw);
+          this.$set(this.form, 'parentName', obj.parentName);
         });
       });
     },
@@ -255,6 +294,25 @@ export default {
         }
       })
     },
+    remoteMethod(query) {
+        if (query !== '') {
+          this.parentNameLoading = true;
+          pageList({
+            name: query
+          })
+          .then(response => {
+              this.parentNameLoading = false;
+              this.parentNameList = response.data.rows;
+              this.parentNameLoading = false;
+            }
+          ).catch ((error)=>{
+            console.error('error===',error)
+            this.parentNameLoading = false;
+          })
+        } else {
+          this.parentNameList = [];
+        }
+      }
   },
 };
 </script>

+ 1 - 1
src/views/distribution/personnelMr/dialog/promotionCode.vue

@@ -82,7 +82,7 @@ export default {
         id: undefined,
       },
       rules: {
-        posterImg: [{ required: true, message: "请上传海报", trigger: "blur" }],
+        posterImg: [{ required: true, message: "请上传海报", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 6 - 1
src/views/distribution/personnelMr/index.vue

@@ -86,6 +86,11 @@
           <span v-if="scope.row.withdrawTotal">¥{{ scope.row.withdrawTotal }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否可提现" align="center" prop="allowWithdraw">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.user_allow_withdraw" :value="scope.row.allowWithdraw"/>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <el-switch
@@ -243,7 +248,7 @@ export default {
       return url
     }
   },
-  dicts: ['distribution_type'],
+  dicts: ['distribution_type','user_allow_withdraw'],
   components: { addAndEdit, promotionCode },
   data() {
     let validateNumber = (rule, value, callback) => {

+ 6 - 6
src/views/distribution/ticketMr/dialog/addAndEdit.vue

@@ -148,12 +148,12 @@ export default {
         id: undefined,
       },
       rules: {
-        performId: [{ required: true, message: "请选择剧目", trigger: "blur" }],
-        goodsId: [{ required: true, message: "请选择票务", trigger: "blur" }],
-        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: "blur" }],
-        originalSalePrice: [{ required: true, message: "请输入销售价", trigger: "blur" }],
-        salePrice: [{ required: true, message: "请输入分销价", trigger: "blur" }],
-        brokeragePrice: [{ required: true, message: "请输入佣金", trigger: "blur" }],
+        performId: [{ required: true, message: "请选择剧目", trigger: ["change","blur"] }],
+        goodsId: [{ required: true, message: "请选择票务", trigger: ["change","blur"] }],
+        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: ["change","blur"] }],
+        originalSalePrice: [{ required: true, message: "请输入销售价", trigger: ["change","blur"] }],
+        salePrice: [{ required: true, message: "请输入分销价", trigger: ["change","blur"] }],
+        brokeragePrice: [{ required: true, message: "请输入佣金", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 4 - 4
src/views/information/informationMr/dialog/addAndEdit.vue

@@ -124,11 +124,11 @@ export default {
         content: "",
       },
       rules: {
-        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        mainImg: [{ required: true, message: "请上传封面", trigger: "blur" }],
-        infoSnapshot: [{ required: true, message: "请输入内容简介", trigger: "blur" }],
+        title: [{ required: true, message: "请输入标题", trigger: ["change","blur"] }],
+        mainImg: [{ required: true, message: "请上传封面", trigger: ["change","blur"] }],
+        infoSnapshot: [{ required: true, message: "请输入内容简介", trigger: ["change","blur"] }],
         centent: [
-          { required: true, message: "请输入内容详情", trigger: "blur" },
+          { required: true, message: "请输入内容详情", trigger: ["change","blur"] },
         ],
       },
       uploadObj: {

+ 2 - 2
src/views/login.vue

@@ -81,10 +81,10 @@ export default {
       },
       loginRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
+          { required: true, trigger: ["change","blur"], message: "请输入您的账号" }
         ],
         password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
+          { required: true, trigger: ["change","blur"], message: "请输入您的密码" }
         ],
         code: [{ required: true, trigger: "change", message: "请输入验证码" }]
       },

+ 3 - 3
src/views/monitor/job/index.vue

@@ -337,13 +337,13 @@ export default {
       // 表单校验
       rules: {
         jobName: [
-          { required: true, message: "任务名称不能为空", trigger: "blur" }
+          { required: true, message: "任务名称不能为空", trigger: ["change","blur"] }
         ],
         invokeTarget: [
-          { required: true, message: "调用目标字符串不能为空", trigger: "blur" }
+          { required: true, message: "调用目标字符串不能为空", trigger: ["change","blur"] }
         ],
         cronExpression: [
-          { required: true, message: "cron执行表达式不能为空", trigger: "blur" }
+          { required: true, message: "cron执行表达式不能为空", trigger: ["change","blur"] }
         ]
       }
     };

+ 7 - 7
src/views/otaMr/dialog/dataEdit.vue

@@ -123,13 +123,13 @@ export default {
         priceType: '2'
       },
       rules: {
-        venueId: [{ required: true, message: "请选择场馆", trigger: "blur" }],
-        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: "blur" }],
-        performId: [{ required: true, message: "请选择剧目", trigger: "blur" }],
-        goodsId: [{ required: true, message: "请选择票务", trigger: "blur" }],
-        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: "blur" }],
-        priceType: [{ required: true, message: "请选择结算方式", trigger: "blur" }],
-        priceAmount: [{ required: true, message: "请输入价格", trigger: "blur" }],
+        venueId: [{ required: true, message: "请选择场馆", trigger: ["change","blur"] }],
+        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: ["change","blur"] }],
+        performId: [{ required: true, message: "请选择剧目", trigger: ["change","blur"] }],
+        goodsId: [{ required: true, message: "请选择票务", trigger: ["change","blur"] }],
+        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: ["change","blur"] }],
+        priceType: [{ required: true, message: "请选择结算方式", trigger: ["change","blur"] }],
+        priceAmount: [{ required: true, message: "请输入价格", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 3 - 3
src/views/otaMr/index.vue

@@ -193,9 +193,9 @@ export default {
       visibleType: '',
       otaForm: {},
       otaRules: {
-        name: [{ required: true, message: "请输入供应商id", trigger: "blur" }],
-        otaKey: [{ required: true, message: "请输入client id", trigger: "blur" }],
-        otaValue: [{ required: true, message: "请输入client secret", trigger: "blur" }]
+        name: [{ required: true, message: "请输入供应商id", trigger: ["change","blur"] }],
+        otaKey: [{ required: true, message: "请输入client id", trigger: ["change","blur"] }],
+        otaValue: [{ required: true, message: "请输入client secret", trigger: ["change","blur"] }]
       },
     };
   },

+ 4 - 4
src/views/perform/performMr/dialog/addAndEdit.vue

@@ -103,11 +103,11 @@ 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: ["change","blur"] }],
+        corporationName: [{ required: true, message: "请输入法人名称", trigger: ["change","blur"] }],
+        contactName: [{ required: true, message: "请输入负责人名称", trigger: ["change","blur"] }],
         contactMobile: [
-          { required: true, message: "请输入负责人联系电话", trigger: "blur" },
+          { required: true, message: "请输入负责人联系电话", trigger: ["change","blur"] },
           { validator: isPhone, trigger: 'blur' }
         ],
       },

+ 5 - 5
src/views/perform/programmeMr/dialog/addAndEdit.vue

@@ -340,11 +340,11 @@ export default {
         content: "",
       },
       rules: {
-        name: [{ required: true, message: "请输入剧目名称", trigger: "blur" }],
-        sponsorId: [{ required: true, message: "请选择主办方", trigger: "blur" }],
-        goodsIdList: [{ required: true, message: "请选择票务信息", trigger: "blur" }],
-        showImg: [{ required: true, message: "请上传剧目封面", trigger: "blur" }],
-        status: [{ required: true, message: "请选择是否启用状态", trigger: "blur" }]
+        name: [{ required: true, message: "请输入剧目名称", trigger: ["change","blur"] }],
+        sponsorId: [{ required: true, message: "请选择主办方", trigger: ["change","blur"] }],
+        goodsIdList: [{ required: true, message: "请选择票务信息", trigger: ["change","blur"] }],
+        showImg: [{ required: true, message: "请上传剧目封面", trigger: ["change","blur"] }],
+        status: [{ required: true, message: "请选择是否启用状态", trigger: ["change","blur"] }]
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 3 - 3
src/views/perform/programmeMr/dialog/programmeAddAndEdit.vue

@@ -120,10 +120,10 @@ export default {
       },
       tableList: [],
       rules: {
-        name: [{ required: true, message: "请输入所属场馆", trigger: "blur" }],
-        seatImg: [{ required: true, message: "请上传票区图", trigger: "blur" }],
+        name: [{ required: true, message: "请输入所属场馆", trigger: ["change","blur"] }],
+        seatImg: [{ required: true, message: "请上传票区图", trigger: ["change","blur"] }],
         theatreId: [
-          { required: true, message: "请选择所属场馆", trigger: "blur" },
+          { required: true, message: "请选择所属场馆", trigger: ["change","blur"] },
         ],
       },
       seatList: [],

+ 4 - 4
src/views/register.vue

@@ -90,16 +90,16 @@ export default {
       },
       registerRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" },
+          { required: true, trigger: ["change","blur"], message: "请输入您的账号" },
           { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
         password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" },
+          { required: true, trigger: ["change","blur"], message: "请输入您的密码" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
         confirmPassword: [
-          { required: true, trigger: "blur", message: "请再次输入您的密码" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
+          { required: true, trigger: ["change","blur"], message: "请再次输入您的密码" },
+          { required: true, validator: equalToPassword, trigger: ["change","blur"] }
         ],
         code: [{ required: true, trigger: "change", message: "请输入验证码" }]
       },

+ 4 - 4
src/views/schedulingMr/dialog/addAndEdit.vue

@@ -94,10 +94,10 @@ export default {
         id: undefined,
       },
       rules: {
-        name: [{ required: true, message: "请输入主办方名你", trigger: "blur" }],
-        corporationName: [{ required: true, message: "请输入法人名你", trigger: "blur" }],
-        contactName: [{ required: true, message: "请输入负责人名你", trigger: "blur" }],
-        contactMobile: [{ required: true, message: "请输入负责人联系电话", trigger: "blur" }],
+        name: [{ required: true, message: "请输入主办方名你", trigger: ["change","blur"] }],
+        corporationName: [{ required: true, message: "请输入法人名你", trigger: ["change","blur"] }],
+        contactName: [{ required: true, message: "请输入负责人名你", trigger: ["change","blur"] }],
+        contactMobile: [{ required: true, message: "请输入负责人联系电话", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 3 - 3
src/views/system/config/index.vue

@@ -221,13 +221,13 @@ export default {
       // 表单校验
       rules: {
         configName: [
-          { required: true, message: "参数名称不能为空", trigger: "blur" }
+          { required: true, message: "参数名称不能为空", trigger: ["change","blur"] }
         ],
         configKey: [
-          { required: true, message: "参数键名不能为空", trigger: "blur" }
+          { required: true, message: "参数键名不能为空", trigger: ["change","blur"] }
         ],
         configValue: [
-          { required: true, message: "参数键值不能为空", trigger: "blur" }
+          { required: true, message: "参数键值不能为空", trigger: ["change","blur"] }
         ]
       }
     };

+ 4 - 4
src/views/system/dept/index.vue

@@ -194,13 +194,13 @@ export default {
       // 表单校验
       rules: {
         parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
+          { required: true, message: "上级部门不能为空", trigger: ["change","blur"] }
         ],
         deptName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" }
+          { required: true, message: "部门名称不能为空", trigger: ["change","blur"] }
         ],
         orderNum: [
-          { required: true, message: "显示排序不能为空", trigger: "blur" }
+          { required: true, message: "显示排序不能为空", trigger: ["change","blur"] }
         ],
         email: [
           {
@@ -213,7 +213,7 @@ export default {
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
+            trigger: ["change","blur"]
           }
         ]
       }

+ 3 - 3
src/views/system/dict/data.vue

@@ -260,13 +260,13 @@ export default {
       // 表单校验
       rules: {
         dictLabel: [
-          { required: true, message: "数据标签不能为空", trigger: "blur" }
+          { required: true, message: "数据标签不能为空", trigger: ["change","blur"] }
         ],
         dictValue: [
-          { required: true, message: "数据键值不能为空", trigger: "blur" }
+          { required: true, message: "数据键值不能为空", trigger: ["change","blur"] }
         ],
         dictSort: [
-          { required: true, message: "数据顺序不能为空", trigger: "blur" }
+          { required: true, message: "数据顺序不能为空", trigger: ["change","blur"] }
         ]
       }
     };

+ 2 - 2
src/views/system/dict/index.vue

@@ -228,10 +228,10 @@ export default {
       // 表单校验
       rules: {
         dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
+          { required: true, message: "字典名称不能为空", trigger: ["change","blur"] }
         ],
         dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
+          { required: true, message: "字典类型不能为空", trigger: ["change","blur"] }
         ]
       }
     };

+ 3 - 3
src/views/system/menu/index.vue

@@ -311,13 +311,13 @@ export default {
       // 表单校验
       rules: {
         menuName: [
-          { required: true, message: "菜单名称不能为空", trigger: "blur" }
+          { required: true, message: "菜单名称不能为空", trigger: ["change","blur"] }
         ],
         orderNum: [
-          { required: true, message: "菜单顺序不能为空", trigger: "blur" }
+          { required: true, message: "菜单顺序不能为空", trigger: ["change","blur"] }
         ],
         path: [
-          { required: true, message: "路由地址不能为空", trigger: "blur" }
+          { required: true, message: "路由地址不能为空", trigger: ["change","blur"] }
         ]
       }
     };

+ 1 - 1
src/views/system/notice/index.vue

@@ -208,7 +208,7 @@ export default {
       // 表单校验
       rules: {
         noticeTitle: [
-          { required: true, message: "公告标题不能为空", trigger: "blur" }
+          { required: true, message: "公告标题不能为空", trigger: ["change","blur"] }
         ],
         noticeType: [
           { required: true, message: "公告类型不能为空", trigger: "change" }

+ 2 - 2
src/views/system/noticeMgr/Dialog/AddOrEditDialog.vue

@@ -85,9 +85,9 @@ export default {
         content: "",
       },
       rules: {
-        name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+        name: [{ required: true, message: "请输入名称", trigger: ["change","blur"] }],
         content: [
-          { required: true, message: "请输入内容详情", trigger: "blur" },
+          { required: true, message: "请输入内容详情", trigger: ["change","blur"] },
         ],
       },
     };

+ 3 - 3
src/views/system/post/index.vue

@@ -195,13 +195,13 @@ export default {
       // 表单校验
       rules: {
         postName: [
-          { required: true, message: "岗位名称不能为空", trigger: "blur" }
+          { required: true, message: "岗位名称不能为空", trigger: ["change","blur"] }
         ],
         postCode: [
-          { required: true, message: "岗位编码不能为空", trigger: "blur" }
+          { required: true, message: "岗位编码不能为空", trigger: ["change","blur"] }
         ],
         postSort: [
-          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
+          { required: true, message: "岗位顺序不能为空", trigger: ["change","blur"] }
         ]
       }
     };

+ 3 - 3
src/views/system/role/index.vue

@@ -330,13 +330,13 @@ export default {
       // 表单校验
       rules: {
         roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
+          { required: true, message: "角色名称不能为空", trigger: ["change","blur"] }
         ],
         roleKey: [
-          { required: true, message: "权限字符不能为空", trigger: "blur" }
+          { required: true, message: "权限字符不能为空", trigger: ["change","blur"] }
         ],
         roleSort: [
-          { required: true, message: "角色顺序不能为空", trigger: "blur" }
+          { required: true, message: "角色顺序不能为空", trigger: ["change","blur"] }
         ]
       }
     };

+ 4 - 4
src/views/system/selfServeAdvertis/dialog/dataBox.vue

@@ -73,11 +73,11 @@ export default {
         detail: null,
       },
       rules: {
-        name: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        type: [{ required: true, message: "请选择类型", trigger: "blur" }],
-        sliderImg: [{ required: true, message: "请上传banner图", trigger: "blur" }],
+        name: [{ required: true, message: "请输入标题", trigger: ["change","blur"] }],
+        type: [{ required: true, message: "请选择类型", trigger: ["change","blur"] }],
+        sliderImg: [{ required: true, message: "请上传banner图", trigger: ["change","blur"] }],
         detail: [
-          { required: true, message: "请输入内容", trigger: "blur" },
+          { required: true, message: "请输入内容", trigger: ["change","blur"] },
         ],
       },
       uploadObj: {

+ 4 - 4
src/views/system/user/index.vue

@@ -425,14 +425,14 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          { required: true, message: "用户名称不能为空", trigger: ["change","blur"] },
           { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: "用户昵称不能为空", trigger: ["change","blur"] }
         ],
         password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { required: true, message: "用户密码不能为空", trigger: ["change","blur"] },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
         email: [
@@ -446,7 +446,7 @@ export default {
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
+            trigger: ["change","blur"]
           }
         ]
       }

+ 5 - 5
src/views/system/user/profile/resetPwd.vue

@@ -38,15 +38,15 @@ export default {
       // 表单校验
       rules: {
         oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
+          { required: true, message: "旧密码不能为空", trigger: ["change","blur"] }
         ],
         newPassword: [
-          { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+          { required: true, message: "新密码不能为空", trigger: ["change","blur"] },
+          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: ["change","blur"] }
         ],
         confirmPassword: [
-          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
+          { required: true, message: "确认密码不能为空", trigger: ["change","blur"] },
+          { required: true, validator: equalToPassword, trigger: ["change","blur"] }
         ]
       }
     };

+ 4 - 4
src/views/system/user/profile/userInfo.vue

@@ -36,10 +36,10 @@ export default {
       // 表单校验
       rules: {
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: "用户昵称不能为空", trigger: ["change","blur"] }
         ],
         email: [
-          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+          { required: true, message: "邮箱地址不能为空", trigger: ["change","blur"] },
           {
             type: "email",
             message: "请输入正确的邮箱地址",
@@ -47,11 +47,11 @@ export default {
           }
         ],
         phonenumber: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          { required: true, message: "手机号码不能为空", trigger: ["change","blur"] },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
+            trigger: ["change","blur"]
           }
         ]
       }

+ 10 - 10
src/views/team/applicationMr/dialog/addAndEdit.vue

@@ -225,16 +225,16 @@ export default {
         id: undefined,
       },
       rules: {
-        teamId: [{ required: true, message: "请选择团队", trigger: "blur" }],
-        theatreId: [{ required: true, message: "请选择场馆", trigger: "blur" }],
-        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: "blur" }],
-        performId: [{ required: true, message: "请选择选择剧目", trigger: "blur" }],
-        goodsId: [{ required: true, message: "请选择票务", trigger: "blur" }],
-        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: "blur" }],
-        price: [{ required: true, message: "请输入团购单价", trigger: "blur" }],
-        teamPersonNum: [{ required: true, message: "请输入人数", trigger: "blur" }],
-        performTimeId: [{ required: true, message: "请选择预约场次", trigger: "blur" }],
-        viewerList: [{ required: true, message: "请上传观影人员excel", trigger: "blur" }],
+        teamId: [{ required: true, message: "请选择团队", trigger: ["change","blur"] }],
+        theatreId: [{ required: true, message: "请选择场馆", trigger: ["change","blur"] }],
+        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: ["change","blur"] }],
+        performId: [{ required: true, message: "请选择选择剧目", trigger: ["change","blur"] }],
+        goodsId: [{ required: true, message: "请选择票务", trigger: ["change","blur"] }],
+        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: ["change","blur"] }],
+        price: [{ required: true, message: "请输入团购单价", trigger: ["change","blur"] }],
+        teamPersonNum: [{ required: true, message: "请输入人数", trigger: ["change","blur"] }],
+        performTimeId: [{ required: true, message: "请选择预约场次", trigger: ["change","blur"] }],
+        viewerList: [{ required: true, message: "请上传观影人员excel", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 1 - 1
src/views/team/applicationMr/dialog/applicationDetails.vue

@@ -186,7 +186,7 @@ export default {
       performerList: [],
       refund: false,
       rejectRules: {
-        errReason: [{ required: true, message: "请输入驳回原因", trigger: "blur" }],
+        errReason: [{ required: true, message: "请输入驳回原因", trigger: ["change","blur"] }],
       },
       dataList: [],
       rejectForm: {

+ 4 - 4
src/views/team/teamMr/dialog/addAndEdit.vue

@@ -129,10 +129,10 @@ export default {
         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" }],
+        name: [{ required: true, message: "请输入团队名称", trigger: ["change","blur"] }],
+        type: [{ required: true, message: "请选择团队类型", trigger: ["change","blur"] }],
+        contact: [{ required: true, message: "请输入负责人", trigger: ["change","blur"] }],
+        mobile: [{ required: true, message: "请输入账号/联系电话", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 6 - 6
src/views/team/ticketMr/dialog/addAndEdit.vue

@@ -147,12 +147,12 @@ export default {
         id: undefined,
       },
       rules: {
-        performId: [{ required: true, message: "请选择选择剧目", trigger: "blur" }],
-        goodsId: [{ required: true, message: "请选择票务", trigger: "blur" }],
-        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: "blur" }],
-        salePrice: [{ required: true, message: "请输入团购单价", trigger: "blur" }],
-        originalSalePrice: [{ required: true, message: "请输入销售价", trigger: "blur" }],
-        teamPersonNum: [{ required: true, message: "请输入人数", trigger: "blur" }],
+        performId: [{ required: true, message: "请选择选择剧目", trigger: ["change","blur"] }],
+        goodsId: [{ required: true, message: "请选择票务", trigger: ["change","blur"] }],
+        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: ["change","blur"] }],
+        salePrice: [{ required: true, message: "请输入团购单价", trigger: ["change","blur"] }],
+        originalSalePrice: [{ required: true, message: "请输入销售价", trigger: ["change","blur"] }],
+        teamPersonNum: [{ required: true, message: "请输入人数", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 7 - 7
src/views/ticket/priceMr/dialog/addAndEdit.vue

@@ -206,13 +206,13 @@ export default {
         priceType: '2'
       },
       rules: {
-        venueId: [{ required: true, message: "请选择场馆", trigger: "blur" }],
-        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: "blur" }],
-        performId: [{ required: true, message: "请选择剧目", trigger: "blur" }],
-        goodsId: [{ required: true, message: "请选择票务", trigger: "blur" }],
-        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: "blur" }],
-        priceType: [{ required: true, message: "请选择结算方式", trigger: "blur" }],
-        priceAmount: [{ required: true, message: "请输入价格", trigger: "blur" }],
+        venueId: [{ required: true, message: "请选择场馆", trigger: ["change","blur"] }],
+        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: ["change","blur"] }],
+        performId: [{ required: true, message: "请选择剧目", trigger: ["change","blur"] }],
+        goodsId: [{ required: true, message: "请选择票务", trigger: ["change","blur"] }],
+        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: ["change","blur"] }],
+        priceType: [{ required: true, message: "请选择结算方式", trigger: ["change","blur"] }],
+        priceAmount: [{ required: true, message: "请输入价格", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 9 - 9
src/views/ticket/ticketMr/dialog/addAndEdit.vue

@@ -183,17 +183,17 @@ export default {
         goodsPerform: {}
       },
       rules: {
-        goodsName: [{ required: true, message: "请输入票务名称", trigger: "blur" }],
-        beforeTime: [{ required: true, message: "请输入核销时间", trigger: "blur" }],
-        verificationSpeaker: [{ required: true, message: "请输入核销播报次数", trigger: "blur" }],
-        detail: [{ required: true, message: "请输入票务说明", trigger: "blur" }],
-        salePrice: [{ required: true, message: "请输入销售价", trigger: "blur" }],
+        goodsName: [{ required: true, message: "请输入票务名称", trigger: ["change","blur"] }],
+        beforeTime: [{ required: true, message: "请输入核销时间", trigger: ["change","blur"] }],
+        verificationSpeaker: [{ required: true, message: "请输入核销播报次数", trigger: ["change","blur"] }],
+        detail: [{ required: true, message: "请输入票务说明", trigger: ["change","blur"] }],
+        salePrice: [{ required: true, message: "请输入销售价", trigger: ["change","blur"] }],
 
-        buyAstrictType: [{ required: true, message: "请选择是否限购", trigger: "blur" }],
-        buyAstrict: [{ required: true, message: "请输入每个账号在每个场次限购张数", trigger: "blur" }],
+        buyAstrictType: [{ required: true, message: "请选择是否限购", trigger: ["change","blur"] }],
+        buyAstrict: [{ required: true, message: "请输入每个账号在每个场次限购张数", trigger: ["change","blur"] }],
 
-        backStatus: [{ required: true, message: "请选择是否支持退票", trigger: "blur" }],
-        days: [{ required: true, message: "请输入日期", trigger: "blur" }],
+        backStatus: [{ required: true, message: "请选择是否支持退票", trigger: ["change","blur"] }],
+        days: [{ required: true, message: "请输入日期", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 3 - 3
src/views/tool/customerform/fdform/list.vue

@@ -221,13 +221,13 @@
         // 表单校验
         rules: {
           roleName: [
-            { required: true, message: "角色名称不能为空", trigger: "blur" }
+            { required: true, message: "角色名称不能为空", trigger: ["change","blur"] }
           ],
           roleKey: [
-            { required: true, message: "权限字符不能为空", trigger: "blur" }
+            { required: true, message: "权限字符不能为空", trigger: ["change","blur"] }
           ],
           roleSort: [
-            { required: true, message: "角色顺序不能为空", trigger: "blur" }
+            { required: true, message: "角色顺序不能为空", trigger: ["change","blur"] }
           ]
         },
         // 本页新增开始

+ 3 - 3
src/views/tool/customerform/fdform/tempalteList.vue

@@ -289,13 +289,13 @@ export default {
       // 表单校验
       rules: {
         roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
+          { required: true, message: "角色名称不能为空", trigger: ["change","blur"] }
         ],
         roleKey: [
-          { required: true, message: "权限字符不能为空", trigger: "blur" }
+          { required: true, message: "权限字符不能为空", trigger: ["change","blur"] }
         ],
         roleSort: [
-          { required: true, message: "角色顺序不能为空", trigger: "blur" }
+          { required: true, message: "角色顺序不能为空", trigger: ["change","blur"] }
         ]
       }
     };

+ 4 - 4
src/views/tool/gen/basicInfoForm.vue

@@ -42,16 +42,16 @@ export default {
     return {
       rules: {
         tableName: [
-          { required: true, message: "请输入表名称", trigger: "blur" }
+          { required: true, message: "请输入表名称", trigger: ["change","blur"] }
         ],
         tableComment: [
-          { required: true, message: "请输入表描述", trigger: "blur" }
+          { required: true, message: "请输入表描述", trigger: ["change","blur"] }
         ],
         className: [
-          { required: true, message: "请输入实体类名称", trigger: "blur" }
+          { required: true, message: "请输入实体类名称", trigger: ["change","blur"] }
         ],
         functionAuthor: [
-          { required: true, message: "请输入作者", trigger: "blur" }
+          { required: true, message: "请输入作者", trigger: ["change","blur"] }
         ]
       }
     };

+ 5 - 5
src/views/tool/gen/genInfoForm.vue

@@ -238,19 +238,19 @@ export default {
       subColumns: [],
       rules: {
         tplCategory: [
-          { required: true, message: "请选择生成模板", trigger: "blur" }
+          { required: true, message: "请选择生成模板", trigger: ["change","blur"] }
         ],
         packageName: [
-          { required: true, message: "请输入生成包路径", trigger: "blur" }
+          { required: true, message: "请输入生成包路径", trigger: ["change","blur"] }
         ],
         moduleName: [
-          { required: true, message: "请输入生成模块名", trigger: "blur" }
+          { required: true, message: "请输入生成模块名", trigger: ["change","blur"] }
         ],
         businessName: [
-          { required: true, message: "请输入生成业务名", trigger: "blur" }
+          { required: true, message: "请输入生成业务名", trigger: ["change","blur"] }
         ],
         functionName: [
-          { required: true, message: "请输入生成功能名", trigger: "blur" }
+          { required: true, message: "请输入生成功能名", trigger: ["change","blur"] }
         ],
       }
     };

+ 163 - 0
src/views/userMr/dialog/dataBox.vue

@@ -0,0 +1,163 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: 空白格
+ * @Date: 2023-07-04 13:55:00
+ * @LastEditors: 空白格
+ * @LastEditTime: 2023-07-06 09:08:39
+ * @FilePath: \cattle_webui\src\views\system\noticeMgr\Dialog\AddOrEditDialog.vue
+ * @Copyright: Copyright (c) 2016~2023 by 空白格, All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    :visible.sync="open"
+    width="800px"
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog"
+    v-loading="loading"
+    >
+      <el-descriptions title="用户信息">
+          <el-descriptions-item label="用户名">{{ form.name }}</el-descriptions-item>
+          <el-descriptions-item label="手机号">{{ form.mobile }}</el-descriptions-item>
+          <el-descriptions-item label="真实姓名">{{ form.realName }}</el-descriptions-item>
+          <el-descriptions-item label="身份证号码">{{ form.cardId }}</el-descriptions-item>
+          <el-descriptions-item label="累计消费">{{ form.consumeTotal }}</el-descriptions-item>
+          <el-descriptions-item label="是否实名">
+            <dict-tag :options="dict.type.user_certification" :value="form.isAuth"/>
+          </el-descriptions-item>
+          <el-descriptions-item label="是否加入黑名单">
+            <dict-tag :options="dict.type.user_is_black_list" :value="form.isBlackList"/>
+          </el-descriptions-item>
+          <el-descriptions-item label="注册渠道">
+            <dict-tag :options="dict.type.user_source_type" :value="form.regSource"/>
+          </el-descriptions-item>
+          <el-descriptions-item label="注册时间">{{ form.createTime }}</el-descriptions-item>
+      </el-descriptions>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">关闭</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        :loading="loading"
+        element-loading-text="提交中..."
+        v-if="type!=3"
+      >
+      保存
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getSelectById } from '@/api/userMr/userMr'
+export default {
+  name: "addAndEdit",
+  dicts:['user_source_type','user_is_black_list','user_certification'],
+  data() {
+    return {
+      title: "编辑",
+      type: 0,
+      model: "EDIT",
+      open: false,
+      loading: false,
+      form: {},
+      rules: {
+        deviceName: [{ required: true, message: "请输入设备名称", trigger: ["change","blur"] }],
+        deviceNo: [
+          { required: true, message: "请输入设备编号", trigger: ["change","blur"] },
+        ],
+        deviceType: [
+          { required: true, message: "请输入设备类型", trigger: ["change","blur"] },
+        ],
+        deviceAddress: [
+          { required: true, message: "请输入所在位置", trigger: ["change","blur"] },
+        ],
+      },
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2022-09-20
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj,type) {
+      this.title = title;
+      this.type = type
+      this.open = true;
+      if (obj){
+        //this.getSelectByIdFun(obj)
+        this.$nextTick(() => {
+          this.form = Object.assign({},this.form,obj)
+        });
+      }else{
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+          this.$set(this.form,'deviceType',5)
+        });
+      }
+    },
+    /**  获取详情  */
+    async getSelectByIdFun(data) {
+      try {
+        this.loading = true
+        let res = await getSelectById(data.id)
+        if(res.code == 0){
+          this.form = Object.assign({},this.form,res.data)
+        }else {
+          throw new Error(res)
+        }
+      } catch (error) {
+        console.error("error==",error)
+        this.loading = false
+        this.open = false
+      }
+    },
+    /**
+     * 保存
+     * @date 2022-09-20
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true;
+            
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2022-09-20
+     * @returns {any}
+     */
+    reset() {
+      
+    },
+    /**
+     * 关闭弹框
+     * @date 2022-09-20
+     * @returns {any}
+     */
+    cancel() {
+      this.open = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+</style>

+ 47 - 25
src/views/userMr/index.vue

@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="姓名">
+      <el-form-item label-width="40px" label="姓名">
         <el-input
           v-model="queryParams.realName"
           placeholder="请输入姓名"
@@ -28,6 +28,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label-width="120px" label="是否加入黑名单">
+        <el-select
+          v-model="queryParams.isBlackList"
+          placeholder="是否加入黑名单"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in dict.type.user_is_black_list"
+            :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>
@@ -49,13 +64,17 @@
       <el-table-column label="累计消费" align="center" prop="consumeTotal" />
       <el-table-column label="是否实名" align="center">
         <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.isAuth == 1">是</el-tag>
-          <el-tag type="info" v-else>否</el-tag>
+          <dict-tag :options="dict.type.user_certification" :value="scope.row.isAuth"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否加入黑名单" align="center">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.user_is_black_list" :value="scope.row.isBlackList"/>
         </template>
       </el-table-column>
       <el-table-column label="注册渠道" align="center" prop="onlineTime" width="160">
         <template slot-scope="scope">
-          <span>{{ sourceList[scope.row.regSource] }}</span>
+          <dict-tag :options="dict.type.user_source_type" :value="scope.row.regSource"/>
         </template>
       </el-table-column>
       <el-table-column label="注册时间" align="center" prop="createTime" width="160">
@@ -65,12 +84,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            @click="detailsEven(scope.row)"-->
-<!--            v-hasPermi="['userMr:userMr:details']"-->
-<!--          >详情</el-button>-->
+         <el-button
+            size="mini"
+            type="text"
+            @click="openDetails(scope.row)"
+            v-hasPermi="['userMr:userMr:details']"
+          >详情</el-button>
           <el-button
             size="mini"
             type="text"
@@ -78,13 +97,13 @@
             v-if="scope.row.isAuth == 1"
             @click="updateAuthStatusEven(scope.row)"
           >取消实名认证</el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            v-hasPermi="['userMr:userMr:blacklist']"-->
-<!--            v-if="scope.row.isBlackList == 0"-->
-<!--            @click="addBlackListEven(scope.row)"-->
-<!--          >加入黑名单</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            v-hasPermi="['userMr:userMr:blacklist']"
+            v-if="scope.row.isBlackList == 0"
+            @click="addBlackListEven(scope.row)"
+          >加入黑名单</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -96,16 +115,23 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    <!-- 详情 -->
+    <!-- 新增/编辑弹框 -->
+    <data-box
+      ref="addAndEdit"
+      @getList="getList"
+    />
   </div>
 </template>
 
 <script>
 
 import { pageList, updateAuthStatus, addBlackList } from '@/api/userMr/userMr'
-
+import dataBox from "./dialog/dataBox";
 export default {
   name: "agreement",
-  dicts: ['agreement_type'],
+  components: { dataBox },
+  dicts:['user_source_type','user_is_black_list','user_certification'],
   data() {
     return {
       // 遮罩层
@@ -138,10 +164,6 @@ export default {
       visibleStatus: false,
       newObj: {},
       visibleType: '',
-      sourceList: {
-        1: '小程序',
-        2: '公众号',
-      },
     };
   },
   created() {
@@ -178,8 +200,8 @@ export default {
       this.handleQuery();
     },
     /** 详情按钮操作 */
-    detailsEven() {
-      // this.$refs["addAndEdit"].openDialog("新增数据", null);
+    openDetails(row, type) {
+      this.$refs["addAndEdit"].openDialog("详情", row,3);
     },
 
     /** 取消实名认证按钮操作 */

+ 3 - 3
src/views/venue/performanceHallMr/dialog/addAndEdit.vue

@@ -107,10 +107,10 @@ export default {
         content: "",
       },
       rules: {
-        name: [{ required: true, message: "请输入演出厅名称", trigger: "blur" }],
-        seatImg: [{ required: true, message: "请上传票区图", trigger: "blur" }],
+        name: [{ required: true, message: "请输入演出厅名称", trigger: ["change","blur"] }],
+        seatImg: [{ required: true, message: "请上传票区图", trigger: ["change","blur"] }],
         theatreId: [
-          { required: true, message: "请选择所属场馆", trigger: "blur" },
+          { required: true, message: "请选择所属场馆", trigger: ["change","blur"] },
         ],
       },
       uploadObj: {

+ 3 - 3
src/views/venue/performanceHallMr/dialog/programmeAddAndEdit.vue

@@ -160,10 +160,10 @@ export default {
       },
       tableList: [],
       rules: {
-        name: [{ required: true, message: "请输入所属场馆", trigger: "blur" }],
-        seatImg: [{ required: true, message: "请上传票区图", trigger: "blur" }],
+        name: [{ required: true, message: "请输入所属场馆", trigger: ["change","blur"] }],
+        seatImg: [{ required: true, message: "请上传票区图", trigger: ["change","blur"] }],
         theatreId: [
-          { required: true, message: "请选择所属场馆", trigger: "blur" },
+          { required: true, message: "请选择所属场馆", trigger: ["change","blur"] },
         ],
       },
       seatList: [],

+ 2 - 2
src/views/venue/performanceHallMr/dialog/seatTemplateEdit.vue

@@ -229,8 +229,8 @@ export default {
       },
       drawDialogType: false,
       drawRules: {
-        status: [{ required: true, message: "请选择状态", trigger: "blur" }],
-        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: "blur" }]
+        status: [{ required: true, message: "请选择状态", trigger: ["change","blur"] }],
+        seatTypeId: [{ required: true, message: "请选择座位类型", trigger: ["change","blur"] }]
       },
     };
   },

+ 5 - 5
src/views/venue/schedulingMr/dialog/addAndEdit.vue

@@ -184,11 +184,11 @@ export default {
         insertType: '1'
       },
       rules: {
-        venueId: [{ required: true, message: "请选择场馆", trigger: "blur" }],
-        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: "blur" }],
-        performId: [{ required: true, message: "请选择剧目", trigger: "blur" }],
-        performDate: [{ required: true, message: "请选择日期", trigger: "blur" }],
-        timeList: [{ required: true, message: "请添加场次", trigger: "blur" }],
+        venueId: [{ required: true, message: "请选择场馆", trigger: ["change","blur"] }],
+        auditoriumId: [{ required: true, message: "请选择演出厅", trigger: ["change","blur"] }],
+        performId: [{ required: true, message: "请选择剧目", trigger: ["change","blur"] }],
+        performDate: [{ required: true, message: "请选择日期", trigger: ["change","blur"] }],
+        timeList: [{ required: true, message: "请添加场次", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 2 - 2
src/views/venue/seatTypeMr/dialog/addAndEdit.vue

@@ -73,8 +73,8 @@ export default {
         content: "",
       },
       rules: {
-        title: [{ required: true, message: "请输入类型名称", trigger: "blur" }],
-        color: [{ required: true, message: "请选择颜色", trigger: "blur" }],
+        title: [{ required: true, message: "请输入类型名称", trigger: ["change","blur"] }],
+        color: [{ required: true, message: "请选择颜色", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 6 - 6
src/views/venue/venueMr/dialog/addAndEdit.vue

@@ -163,18 +163,18 @@ export default {
         content: "",
       },
       rules: {
-        name: [{ required: true, message: "请输入场馆名称", trigger: "blur" }],
-        showImg: [{ required: true, message: "请上传场馆图片", trigger: "blur" }],
-        contactName: [{ required: true, message: "请输入负责人名称", trigger: "blur" }],
+        name: [{ required: true, message: "请输入场馆名称", trigger: ["change","blur"] }],
+        showImg: [{ required: true, message: "请上传场馆图片", trigger: ["change","blur"] }],
+        contactName: [{ required: true, message: "请输入负责人名称", trigger: ["change","blur"] }],
         contactMobile: [
-          { required: true, message: "请输入负责人联系电话", trigger: "blur" },
+          { required: true, message: "请输入负责人联系电话", trigger: ["change","blur"] },
           { validator: isPhoneContact, trigger: 'blur' }
         ],
         customerServiceMobile: [
-          { required: true, message: "请输入客服电话", trigger: "blur" },
+          { required: true, message: "请输入客服电话", trigger: ["change","blur"] },
           { validator: isPhoneService, trigger: 'blur' }
         ],
-        address: [{ required: true, message: "请选择场馆位置", trigger: "blur" }],
+        address: [{ required: true, message: "请选择场馆位置", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",