1

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -224,6 +224,7 @@
               <el-select
                 v-model="form.peopleName"
                 placeholder="请输入单位"
+                filterable
                 clearable
                 @change="btn"
               >
@@ -251,8 +252,8 @@
             <el-form-item label="天气" prop="weather">
               <el-input v-model="form.weather" placeholder="请输入天气" />
             </el-form-item>
-            <el-form-item label="值班首长" prop="lead">
-              <el-select v-model="form.lead" placeholder="请选择首长" clearable>
+            <el-form-item label="值班首长"  prop="lead">
+              <el-select v-model="form.lead" filterable placeholder="请选择首长" clearable>
                 <el-option
                   :label="item.nickName"
                   v-for="(item, i) in shouZhang"
@@ -657,7 +658,7 @@
                         selectableRange: '00:00:00 - 23:59:59'
                       }"
                       placeholder="选择日期时间"
-                      value-format="hh:mm:ss"
+                      value-format="HH:mm:ss"
                     >
                     </el-time-picker>
                   </el-form-item>
@@ -730,7 +731,7 @@
                         selectableRange: '00:00:00 - 23:59:59'
                       }"
                       placeholder="来队时间"
-                      value-format="hh:mm:ss"
+                      value-format="HH:mm:ss"
                     >
                     </el-time-picker>
                   </el-form-item>
@@ -750,7 +751,7 @@
                         selectableRange: '00:00:00 - 23:59:59'
                       }"
                       placeholder="离队时间"
-                      value-format="hh:mm:ss"
+                      value-format="HH:mm:ss"
                     >
                     </el-time-picker>
                   </el-form-item>

src/views/workingArrangements/workTask/index.vue

@@ -52,12 +52,12 @@
         </el-select>
       </el-form-item> -->
       <el-form-item prop="type" class="plantypes" label-width="80px">
-        <el-select v-model="queryParams.types" placeholder="请选择任务类型">
+        <el-select v-model="queryParams.type" placeholder="请选择任务类型">
           <el-option
-            v-for="(item, i) in ziDian"
+            v-for="(item, i) in workTaskList"
             :key="i"
-            :label="item.dictLabel"
-            :value="item.dictLabel"
+            :label="item.type"
+            :value="item.type"
             @click.native="zidainType(item)"
           >
           </el-option>
@@ -162,7 +162,6 @@
         label="任务类型"
         align="center"
         prop="type"
-        :formatter="unit4Format"
       />
       <el-table-column
         label="执行人"
@@ -308,7 +307,7 @@
           />
         </el-form-item>
         <el-form-item label="任务类型" prop="type">
-          <el-select
+          <!-- <el-select
             v-model="form.type"
             style="width: 200px"
             clearable
@@ -322,7 +321,13 @@
               :value="parseInt(item.dictSort)"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
+          <el-input
+            placeholder="请输入任务类型"
+            v-model="form.type"
+            style="width: 200px"
+          >
+          </el-input>
         </el-form-item>
         <el-form-item label="发布人" prop="username">
           <el-input
@@ -1171,7 +1176,7 @@ export default {
       this.resetForm("form");
     },
     zidainType(item) {
-      this.queryParams.type = item.dictValue;
+     // this.queryParams.type = item.dictValue;
       this.getList();
       // console.log(item)
     },
@@ -1179,7 +1184,6 @@ export default {
     selectPeo3(val) {
       getDept2().then((res) => {
         this.users = res.data;
-        console.log(this.users);
       });
       this.queryParams.adminId = val.id;
       this.getZhuChi(this.queryParams.adminId);
@@ -1298,7 +1302,6 @@ export default {
       ) {
         this.rylist.map((item) => {
           row.peopleName.split(",").forEach((items, index) => {
-            console.log(items);
             if (item.userId == items) {
               // console.log(item.nickName)
               deptName += item.nickName + "  ";