Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

src/api/userAuth/addUser.js

@@ -17,3 +17,8 @@ export const getUserXxByxxzjbh = params =>
 export const updateUserXx = params =>
     postform(`${base.alyIP}/sysuser/updateUserXx`, params);
 
+//用户是否启用
+export const openUserXx = params =>
+    post(`${base.alyIP}/sysuser/openUserXx`, params);
+
+

src/components/form.vue

@@ -983,6 +983,7 @@
                             </span>
                           </div>
                         </div>
+                      </div>
                       <div class="addChildBtn">
                         <el-button type="primary" @click="handelFrom(item2)">
                           <i class="el-icon-plus"></i><span>添加</span>
@@ -990,7 +991,6 @@
                       </div>
                     </div>
                   </div>
-                  </div>
                 </el-form-item>
               </div>
             </div>
@@ -1081,7 +1081,6 @@ export default {
       this.$emit("ajtq", item);
     },
     ajFocus(item) {
-      debugger;
       this.$emit("ajFocus", item);
     },
     initFields() {
@@ -1410,9 +1409,7 @@ export default {
               }
               //2.有childrenAsAdd表单数据处理
               if (item.childrenAsAdd) {
-                debugger;
                 item.childrenAsAdd.forEach((subItem) => {
-                  debugger;
                   //如果遍历到的编号和所选择的编号一致
                   self.formLabelAlign[subItem.id].forEach((val5, index) => {
                     //遍历每一个数组的值
@@ -1443,15 +1440,6 @@ export default {
                               val5[ite]
                             );
                           }
-                          console.log(
-                            "5)政治人员身份" +
-                              subItem.id +
-                              "[" +
-                              index +
-                              "]." +
-                              ite,
-                            val5[ite]
-                          );
                         } else if (
                           currentc &&
                           currentc.type == "lazyCodeTree"
@@ -1494,7 +1482,6 @@ export default {
             });
           });
           for (var fileItem in self.fileLists) {
-            debugger;
             for (var i = 0; i < self.fileLists[fileItem].length; i++) {
               if (self.fileLists[fileItem][i].raw) {
                 params.append(fileItem, self.fileLists[fileItem][i].raw);
@@ -1551,8 +1538,8 @@ export default {
     handelFrom(obj) {
       let self = this,
         addObj;
-      if (obj.flag2) {
-        obj.flag2 = false;
+      if (!obj.flag) {
+        self.$set(obj,'flag',true)
       } else {
         self.propFormField.forEach((groupItem) => {
           groupItem.data.forEach((val) => {

src/components/ptCxForm_components.vue

@@ -556,7 +556,7 @@
               {{ scope.row[columnTitle.prop] }}
             </div>
             <div v-else-if="columnTitle.prop == 'openFlag'">
-              {{ scope.row[columnTitle.prop] == "1" ? "已开启" : "未开启" }}
+              <el-switch v-model="scope.row[columnTitle.prop]" active-value='1' inactive-value='0' @change='handleSwitch($event,scope.row)'></el-switch>
             </div>
             <div v-else v-html="scope.row[columnTitle.prop]">
               {{ columnTitle.prop }}
@@ -983,6 +983,9 @@ export default {
         self.$message.error("请选择");
       }
     },
+    handleSwitch(value,item){
+      this.$emit("handleSwitch",{value,id:item.id});
+    },
     audit(scope) {
       this.$emit("audit", scope.row);
     },

src/views/rlqbxsxx/adjustRlqbxs.vue

@@ -48,12 +48,12 @@ export default {
             {
               name: "线索提供者:",
               col: "1",
-              noshowMoreBtn: false, //是否显示添加按钮
+
               childrenAsAdd: [
                 {
                   name: "提供人:",
                   id: "tgz",
-                  flag: true,
+                  flag: false,
                   list: [
                     {
                       name: xstgz,
@@ -74,12 +74,12 @@ export default {
             {
               name: "可疑人员:",
               col: "1",
-              noshowMoreBtn: false, //是否显示添加按钮
+
               childrenAsAdd: [
                 {
                   name: "可疑人员:",
                   id: "ry",
-                  flag: true,
+                  flag: false,
                   list: [
                     {
                       name: ryxsgl,
@@ -100,12 +100,12 @@ export default {
             {
               name: "机动车线索管理:",
               col: "1",
-              noshowMoreBtn: false, //是否显示添加按钮
+
               childrenAsAdd: [
                 {
                   name: "可疑机动车:",
                   id: "jdc",
-                  flag: true,
+                  flag: false,
                   list: [
                     {
                       name: jdcxsgl,
@@ -126,12 +126,12 @@ export default {
             {
               name: "非机动车线索管理:",
               col: "1",
-              noshowMoreBtn: false, //是否显示添加按钮
+
               childrenAsAdd: [
                 {
                   name: "可疑非机动车:",
                   id: "fjdc",
-                  flag: true,
+                  flag: false,
                   list: [
                     {
                       name: fjdcxsgl,

src/views/userAuth/user/queryUser.vue

@@ -14,6 +14,7 @@
       @edit="edit"
       @editRole="editRole"
       @selectionChange="selectionChange"
+      @handleSwitch="handleSwitch"
     ></right-content>
     <el-dialog
       title="角色管理"
@@ -41,7 +42,7 @@
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
-import { deleteUserNew } from "@/api/userAuth/addUser.js";
+import { deleteUserNew, openUserXx } from "@/api/userAuth/addUser.js";
 import { tree, insertUserRoles } from "@/api/userAuth/role.js";
 export default {
   name: "queryUser",
@@ -80,7 +81,7 @@ export default {
         {
           label: "登录名",
           prop: "username",
-          toInfor: true
+          toInfor: true,
         },
         {
           label: "用户姓名",
@@ -154,6 +155,27 @@ export default {
     this.getTree();
   },
   methods: {
+    handleSwitch(obj) {
+      this.$confirm("是否修改用户状态", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          openUserXx({
+            id: obj.id,
+            openFlag: obj.value,
+          }).then((res) => {
+            this.$message.success("修改成功");
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
     submitRole() {
       if (this.selectedTree.length > 0) {
         insertUserRoles({
@@ -194,7 +216,7 @@ export default {
       }
     },
     handleClose() {
-      this.dialogVisible =false;
+      this.dialogVisible = false;
     },
     add() {
       this.$router.pushToTab("addUser");