虚拟展厅增加数据验证，文创产品按钮布局修改

src/views/literature/components/InfoEditDialog.vue

@@ -164,7 +164,9 @@ export default {
     // 取消编辑
     cancelForm() {
       this.$emit("handleClose");
-      this.reset();
+      // this.reset();
+      this.resetChildData();
+      this.reloadParent();
     },
 
     resetChildData() {

src/views/product/components/InfoEditDialog.vue

@@ -367,7 +367,7 @@ export default {
 }
 .dialog-footer {
     display: flex;
-    align-items: flex-end;
+   justify-content: flex-end;
     margin: 20px;
   }
 .upload-box {

src/views/user/config.js

@@ -26,6 +26,7 @@ export const title = [{
   showOverFlowToolTip: true
 
 },
+
 {
   prop: "phone",
   label: "手机号",

src/views/user/index.vue

@@ -170,9 +170,9 @@ export default {
       const res = await getDeptTree();
       console.log(111, res);
       if (res.code == 0) {
-        this.treeData = res.data;
+        this.treeData = res.data[0].children; //去除默认顶级部门
         this.currentDeptNo = this.treeData[0].deptNo;
-        this.loadListData();
+        this.loadListData();                   
       }
     },
     //   加载表格数据

src/views/virtual/components/InfoEditDialog.vue

@@ -12,8 +12,8 @@
       <div class="label">{{ title }}</div>
     </div>
     <div class="dialog-content">
-      <el-form :model="dialogForm" class="basic-info">
-        <el-form-item label="名称" :label-width="formLabelWidth">
+      <el-form :model="dialogForm" class="basic-info" ref="form" :rules="rules">
+        <el-form-item label="名称" :label-width="formLabelWidth" prop="name">
           <el-input
             v-model="dialogForm.name"
             autocomplete="off"
@@ -58,7 +58,7 @@
           <el-switch v-model="status"> </el-switch>
         </el-form-item>
 
-        <el-form-item label="链接" :label-width="formLabelWidth">
+        <el-form-item label="链接" :label-width="formLabelWidth" prop="url">
           <!-- <el-switch v-model="dialogForm.url"> </el-switch> -->
           <el-input
             v-model="dialogForm.url"
@@ -207,6 +207,10 @@ export default {
       pidModalKey: 0,
       regionCodeModalKey: 0,
       faceImage: [],
+      rules: {
+        name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+        url: [{ required: true, message: "请输入链接", trigger: "blur" }],
+      },
     };
   },
   methods: {
@@ -240,73 +244,77 @@ export default {
         }
       });
     },
-    async handleSubmit() {
-      let params = { ...this.dialogForm };
-      // // 回填图片
-      // if (this.faceImage.length > 0) {
-      //   params.faceImage = this.faceImage[0].fileId;
-      // }
-      // return;
-      let deleteFileArr = [];
-      let file = this.$refs.faceImage.getFiles();
-      if (file.length > 0) {
-        let formData = new FormData();
-        switch (file[0].status) {
-          case "ready":
-            formData.append("faceImage", file[0].raw);
-            let upLoadRes = await uploadV1(formData);
-            if (upLoadRes.code == 0) {
-              params.faceImage = upLoadRes.data[0].fileId;
-            } else {
-              this.$message.error("上传失败！:" + upLoadRes.data.msg);
+    handleSubmit() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          let params = { ...this.dialogForm };
+          // // 回填图片
+          // if (this.faceImage.length > 0) {
+          //   params.faceImage = this.faceImage[0].fileId;
+          // }
+          // return;
+          let deleteFileArr = [];
+          let file = this.$refs.faceImage.getFiles();
+          if (file.length > 0) {
+            let formData = new FormData();
+            switch (file[0].status) {
+              case "ready":
+                formData.append("faceImage", file[0].raw);
+                let upLoadRes = await uploadV1(formData);
+                if (upLoadRes.code == 0) {
+                  params.faceImage = upLoadRes.data[0].fileId;
+                } else {
+                  this.$message.error("上传失败！:" + upLoadRes.data.msg);
+                }
+                deleteFileArr.push(this.dialogForm.faceImage);
+                break;
+              case "success":
+                params.faceImage = file[0].fileId;
+                break;
             }
-            deleteFileArr.push(this.dialogForm.faceImage);
-            break;
-          case "success":
-            params.faceImage = file[0].fileId;
-            break;
-        }
-      } else {
-        params.faceImage = "";
-      }
+          } else {
+            params.faceImage = "";
+          }
 
-      // 处理行政区划
-      if (params.regionCode instanceof Array) {
-        params.regionCode = params.regionCode[params.regionCode.length - 1];
-      }
+          // 处理行政区划
+          if (params.regionCode instanceof Array) {
+            params.regionCode = params.regionCode[params.regionCode.length - 1];
+          }
 
-      // 处理所属部门
-      if (params.deptId instanceof Array) {
-        params.deptId = params.deptId[params.deptId.length - 1];
-      }
+          // 处理所属部门
+          if (params.deptId instanceof Array) {
+            params.deptId = params.deptId[params.deptId.length - 1];
+          }
 
-      // 处理状态
-      params.status = this.status ? 1 : 0;
-      if (this.dialogForm.bvId) {
-        let res = await editVirtual(params);
-        if (res.code == 0) {
-          this.$message.success("修改成功！");
-          this.reload();
-        }
-      } else {
-        // let params = { ...this.dialogForm };
-        // // // 回填图片
-        // // if (this.faceImage.length > 0) {
-        // //   params.faceImage = this.faceImage[0].fileId;
-        // // }
-        // // 处理行政区划
-        // params.regionCode = params.regionCode[params.regionCode.length - 1];
-        // // 处理所属部门
-        // params.deptId = params.deptId[params.deptId.length - 1];
-        // // 处理状态
-        // params.status = this.status ? 1 : 0;
-        // return
-        let res = await addVirtual(params);
-        if (res.code == 0) {
-          this.$message.success("添加成功！");
-          this.reload();
+          // 处理状态
+          params.status = this.status ? 1 : 0;
+          if (this.dialogForm.bvId) {
+            let res = await editVirtual(params);
+            if (res.code == 0) {
+              this.$message.success("修改成功！");
+              this.reload();
+            }
+          } else {
+            // let params = { ...this.dialogForm };
+            // // // 回填图片
+            // // if (this.faceImage.length > 0) {
+            // //   params.faceImage = this.faceImage[0].fileId;
+            // // }
+            // // 处理行政区划
+            // params.regionCode = params.regionCode[params.regionCode.length - 1];
+            // // 处理所属部门
+            // params.deptId = params.deptId[params.deptId.length - 1];
+            // // 处理状态
+            // params.status = this.status ? 1 : 0;
+            // return
+            let res = await addVirtual(params);
+            if (res.code == 0) {
+              this.$message.success("添加成功！");
+              this.reload();
+            }
+          }
         }
-      }
+      });
     },
     reload() {
       this.$emit("refresh", true); //需要重新获取orgTree