合并

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -820,16 +820,6 @@ export default {
       list: [],
       // 下拉选项显示隐藏
       xiaLa: false,
-      // 查铺查岗数组
-      // checkShop: [
-      //   {
-      //     peopleName: null,
-      //     foremanName: null,
-      //     sentryName: null,
-      //     examineDate: null,
-      //     dialogue: null,
-      //   },
-      // ],
       //添加对话框查铺表格为空
       checkShop: [
         {
@@ -1005,7 +995,6 @@ export default {
     blogDate() {
       // 判断是否全部选择
       if (this.form.unitId !== null && this.form.blogDate !== null) {
-        console.log(333);
         this.XunLian(this.form.unitId, this.form.blogDate);
       }
     },
@@ -1030,9 +1019,7 @@ export default {
       this.getRenYuan(this.form.unitId);
       this.getShou(this.form.unitId);
       // 判断是否全部选择
-      console.log(1111);
       if (this.form.unitId !== null && this.form.blogDate) {
-        console.log(222);
         this.XunLian(this.form.unitId, this.form.blogDate);
       }
     },

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -190,7 +190,7 @@
       <div class="jiben">基本信息</div>
 
       <el-form
-        ref="form"
+        ref="refform"
         :model="form"
         :rules="rules"
         label-width="80px"
@@ -503,8 +503,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        deptId: [
-          // { required: true, message: "单位名称不能为空", trigger: "blur" },
+        peopleId: [
+          { required: true, message: "单位名称不能为空", trigger: "blur" },
         ],
       },
       //下拉s
@@ -600,7 +600,7 @@ export default {
         deteline: null,
         startTime: null,
         endTime: null,
-        unitId1: null,
+        unitId1: this.form.unitName,
         peopleIds: null,
         address: null,
         contents: null,
@@ -655,9 +655,9 @@ export default {
     },
     // 选中单位触发
     department(data) {
-      console.log(data);
       this.ChongZhi();
       this.form.unitId = data.id;
+      this.form.unitName=data.label
       this.ZhuChiRen(this.form.unitId);
       this.tomList.forEach((item, i) => {
         console.log(item);
@@ -727,7 +727,7 @@ export default {
           contents: null,
         },
       ]),
-        this.resetForm("form");
+        this.resetForm("refform");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -759,6 +759,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      
       this.reset();
       this.getTreeselect();
       this.form.unitId = row.unitId;
@@ -787,7 +788,7 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'][0].validate((valid) => {
         if (valid) {
           this.form.bdglWeekworkRegisterList = this.tomList;
           if (this.form.id != null) {