debug column edit

杨泽宇
1 parent e5331ced
Showing 2 changed files with 77 additions and 30 deletions
src/views/column/edit.vue
src/views/user/index.vue
@@ -45,23 +45,37 @@ const rules = reactive({
       trigger: "blur",
     },
   ],
+  // cmsPageId: [
+  //   {
+  //     required: false,
+  //     message: "请填写CMS页面ID",
+  //     trigger: "blur",
+  //   },
+  // ],
+  // cmsColumnId: [
+  //   {
+  //     required: false,
+  //     message: "请填写CMS栏目ID",
+  //     trigger: "blur",
+  //   },
+  // ],
   cmsPageId: [
     {
-      required: true,
+      required: form.data.cmsPageType === 4 && form.data.cmsColumnId? false: true,
       message: "请填写CMS页面ID",
-      trigger: "blur",
+      trigger: "change",
     },
   ],
   cmsColumnId: [
     {
-      required: true,
+      required: form.data.cmsPageType === 4 && form.data.cmsPageId? false: true,
       message: "请填写CMS栏目ID",
-      trigger: "blur",
+      trigger: "change",
     },
   ],
   cmsPageUrl: [
     {
-      required: false,
+      required: form.data.cmsPageType === 1? true: false,
       message: "请填写CMS页面链接",
       trigger: "blur",
     },
@@ -75,13 +89,41 @@ const rules = reactive({
   ],
   sort: [
     {
-      required: false,
+      required: form.data.parentColumnId ? false : true,
       message: "请填写数字排序值",
       trigger: "blur",
       type: "number",
       min: 0,
     },
   ],
+  columnImg: [
+    {
+      required: form.data.parentColumnId ? false : true,
+      message: "请上传栏目选中LOGO图片",
+      trigger: "blur",
+    },
+  ],
+  columnImgUncheck: [
+    {
+      required: form.data.parentColumnId ? false : true,
+      message: "请上传栏目未选中LOGO图片",
+      trigger: "blur",
+    },
+  ],
+  columnColour: [
+    {
+      required: form.data.parentColumnId ? false : true,
+      message: "请选择栏目选中字色",
+      trigger: "blur",
+    },
+  ],
+  columnColourUncheck: [
+    {
+      required: form.data.parentColumnId ? false : true,
+      message: "请选择栏目未选中字色",
+      trigger: "blur",
+    },
+  ],
 });
 /**
  * 表单重置
@@ -146,15 +188,24 @@ onMounted(() =&gt; {
       mlen.value = 6;
       break;
   }
-  // cms页面类型为【原生】时，cms栏目ID、cms页面ID必填一个，cms栏目名称选填
-  // cms页面类型为【h5】时，页面url必填
+  // cms页面类型为【原生 4】时，cms栏目ID、cms页面ID必填一个，cms栏目名称选填
+  // cms页面类型为【h5 1】时，页面url必填
+  if(~~form.data.cmsPageType === 4) {
+    rules.cmsPageUrl[0].required = false;
+    rules.cmsPageId[0].required = ~~form.data.cmsColumnId? false: true
+    rules.cmsColumnId[0].required = ~~form.data.cmsPageId? false: true
+  } else {
+    rules.cmsPageUrl[0].required = true
+    rules.cmsPageId[0].required = false
+    rules.cmsColumnId[0].required = false
+  }
   watch(
     () => form.data.cmsPageType,
     (data) => {
       if (~~data === 4) {
         rules.cmsPageUrl[0].required = false;
-        rules.cmsPageId[0].required = true;
-        rules.cmsColumnId[0].required = true;
+        rules.cmsColumnId[0].required = form.data.cmsPageId? false: true
+        rules.cmsPageId[0].required = form.data.cmsColumnId? false: true
       } else if (~~data === 1) {
         rules.cmsPageUrl[0].required = true;
         rules.cmsPageId[0].required = false;
@@ -182,6 +233,7 @@ onMounted(() =&gt; {
       }
     }
   );
+  form.data.sort = ~~useRoute().query.sort;
 });
 </script>
  
@@ -57,29 +57,19 @@ const getList = async () =&gt; {
  * 删除
  * @param {object} obj 要删除的数据对象
  */
-const handleDelete = (obj: any) => {
-  ElMessageBox.confirm("确认删除吗?", "警告", {
+const handleDelete = (obj: any, type: string) => {
+  ElMessageBox.confirm(`确认${type? '初始化密码': '删除'}吗?`, "警告", {
     confirmButtonText: "确认",
     cancelButtonText: "取消",
     type: "warning",
   })
     .then(async () => {
       try {
-        let res = await userStatus({
-          userId: obj.id,
-          status: 2,
-        });
-        if (res?.data) {
-          ElMessage({
-            type: "success",
-            message: "操作成功",
-          });
-          getList();
+        let res
+        if(type) {
+          handleUpdate(obj, type)
         } else {
-          ElMessage({
-            type: "error",
-            message: "操作失败",
-          });
+          handleUpdate(obj, 'delete')
         }
       } catch (e) {
         console.log(e);
@@ -92,7 +82,7 @@ const handleDelete = (obj: any) =&gt; {
 /**
  * 修改
  * @param {object} obj 一条数据对象
- * @param {string} type 修改操作的类型，pwd修改密码，status修改状态
+ * @param {string} type 修改操作的类型，pwd修改密码，status修改状态，delete删除
  */
 const handleUpdate = async (obj: any, type: string) => {
   try {
@@ -106,6 +96,11 @@ const handleUpdate = async (obj: any, type: string) =&gt; {
       res = await userPwd({
         userId: obj.id,
       });
+    } else if (type === 'delete') {
+      res = await userStatus({
+        userId: obj.id,
+        status: 2
+      })
     }
     if (res?.data) {
       ElMessage({
@@ -209,7 +204,7 @@ onMounted(() =&gt; {
             <el-button type="text" @click="handleUpdate(scope.row, 'status')">{{
               scope.row.status ? "禁用" : "启用"
             }}</el-button>
-            <el-button type="text" @click="handleUpdate(scope.row, 'pwd')"
+            <el-button type="text" @click="handleDelete(scope.row, 'pwd')"
               >初始密码</el-button
             >
             <el-button type="text"
@@ -234,7 +229,7 @@ onMounted(() =&gt; {
             <!-- 商务管理员 物业管理员 公益管理员 -->
             <template v-if="~~scope.row.id === ~~asyncData.userInfo">
               <!-- 当前登录的人是三种管理员只能初始自己的密码， -->
-              <el-button type="text" @click="handleUpdate(scope.row, 'pwd')"
+              <el-button type="text" @click="handleDelete(scope.row, 'pwd')"
                 >初始密码</el-button
               >
             </template>
@@ -249,7 +244,7 @@ onMounted(() =&gt; {
             <el-button type="text" @click="handleUpdate(scope.row, 'status')">{{
               scope.row.status ? "禁用" : "启用"
             }}</el-button>
-            <el-button type="text" @click="handleUpdate(scope.row, 'pwd')"
+            <el-button type="text" @click="handleDelete(scope.row, 'pwd')"
               >初始密码</el-button
             >
             <el-button type="text"