dedsudiyu 2 éve
szülő
commit
eb06d6ee12

+ 1 - 0
src/views/safetyCheck/components/addPage/addPage.vue

@@ -54,6 +54,7 @@
                 style="width: 450px"
                 v-model="addForm.rectifyDeadline"
                 type="date"
+                value-format="yyyy-MM-dd"
                 :picker-options="pickerOptions"
                 :clearable="false"
                 placeholder="选择整改期限">

+ 4 - 1
src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -134,7 +134,7 @@
               <p class="inquire-button-one" @click="deptResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @selection-change="deptChange" :row-key="getDeptRowKeys">
+          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @select="deptChange" :row-key="getDeptRowKeys">
             <el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip/>
           </el-table>
@@ -731,13 +731,16 @@
                   //新增-编辑时
                   self.$set(self,'deptTableListLeft',response.data);
                   self.$set(self,'deptTotalLeft',response.data.length);
+                  let list = [];
                   for(let i=0;i<self.dialogForm.collegeIds.length;i++){
                     for(let o=0;o<self.deptTableListLeft.length;o++){
                       if(self.dialogForm.collegeIds[i] == self.deptTableListLeft[o].deptId){
+                        list.push(self.deptTableListLeft[o])
                         self.$refs.leftDeptTable.toggleRowSelection(self.deptTableListLeft[o]);
                       }
                     }
                   }
+                  self.deptChange(list);
                 }
               })
             })

+ 4 - 1
src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -170,7 +170,7 @@
               <p class="inquire-button-one" @click="deptResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @selection-change="deptChange" :row-key="getDeptRowKeys">
+          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @select="deptChange" :row-key="getDeptRowKeys">
             <el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip/>
           </el-table>
@@ -971,13 +971,16 @@
                   //新增-编辑时
                   self.$set(self,'deptTableListLeft',response.data);
                   self.$set(self,'deptTotalLeft',response.data.length);
+                  let list = [];
                   for(let i=0;i<self.dialogForm.collegeIds.length;i++){
                     for(let o=0;o<self.deptTableListLeft.length;o++){
                       if(self.dialogForm.collegeIds[i] == self.deptTableListLeft[o].deptId){
+                        list.push(self.deptTableListLeft[o])
                         self.$refs.leftDeptTable.toggleRowSelection(self.deptTableListLeft[o]);
                       }
                     }
                   }
+                  self.deptChange(list);
                 }
               })
             })