工作安排

src/views/barracksManagement/flats/index.vue

@@ -31,14 +31,13 @@
           size="small"
           @keyup.enter.native="handleQuery"
         /> -->
-        <el-select v-model="queryParams.name" id="execute" ref="peoplenames">
+        <el-select v-model="queryParams.name"  ref="peoplenames"   placeholder="请选择人员">
           <el-option
             v-for="item in executor"
             :key="item.id"
             :label="item.name"
             :value="item.name"
             @click.native="peopleIds1(item.id, item.name)"
-            id="execute"
           />
         </el-select>
       </el-form-item>
@@ -60,11 +59,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="申请住房类别" prop="type">
+      <el-form-item label="申请住房类别" prop="type" >
         <!-- <el-select v-model="queryParams.type" placeholder="请选择申请住房类别" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select> -->
-        <el-select v-model="queryParams.type">
+        <el-select v-model="queryParams.type" placeholder="请选择申请住房类别">
           <!-- <el-option label="请选择字典生成" value="" /> -->
           <el-option
             v-for="(item, i) in ziDian"
@@ -186,6 +185,7 @@
         align="center"
         prop="birthDate"
         width="180"
+
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.birthDate, "{y}-{m}-{d}") }}</span>
@@ -376,25 +376,8 @@
           />
         </el-form-item>
         <el-form-item label="人员" prop="peopleId" class="jiedai">
-          <!-- <el-input v-model="form.peopleId" placeholder="请输入接待人" /> -->
-          <!-- <el-select v-model="form.peopleName" ref="peoplenames">
-            <el-option
-              v-for="item in executor"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
-            />
-          </el-select> -->
-          <!-- <el-select v-model="form.peopleName" placeholder="">
-            <el-option
-              v-for="dict in executor"
-              :key="dict.id"
-              :label="dict.name"
-              :value="dict.name"
-            ></el-option>
-          </el-select> -->
            <el-select
-                v-model="form.name"
+                v-model="form.peopleId"
                 placeholder="请选择人员"
                 id="execute"
                 ref="peoplenames"
@@ -403,13 +386,13 @@
                   v-for="item in executor"
                   :key="item.id"
                   :label="item.name"
-                  :value="item.name"
-                  @click.native="peopleIds(item.id,item.name)"
+                  :value="item.id"
+                  @click.native="peopleIds(item.name,item)"
                   id="execute"
                 />
               </el-select>
         </el-form-item>
-        <el-form-item label="出生时间" prop="birthDate">
+        <el-form-item label="出生时间" prop="birthDate" placeholder="请选择出生时间">
           <el-date-picker
             clearable
             size="small"
@@ -421,18 +404,19 @@
         </el-form-item>
 
         <el-form-item label="军衔" prop="rankId">
+           <!-- <el-input  v-model="form.rankId" class="zhufnag" :disabled="true" /> -->
           <!-- <el-input v-model="form.rankId" placeholder="请输入军衔" /> -->
-          <el-select v-model="form.rankName">
+          <el-select v-model="form.rankId" :disabled="true" placeholder="请选择军衔"  >
             <!-- <el-option label="请选择字典生成" value="" /> -->
             <el-option
               v-for="(item, i) in ziDian1"
               :key="i"
               :label="item.dictLabel"
-              :value="item.dictLabel"
-           @click.native="junxian(item.dictSort,item.dictLabel)"
+              :value="item.dictSort"
             >
             </el-option>
           </el-select>
+         
         </el-form-item>
         <el-form-item label="军衔时间" prop="rankDate">
           <el-date-picker
@@ -500,7 +484,7 @@
           <el-input v-model="form.pUnit" />
         </el-form-item>
         <el-form-item label="申请住房类别" prop="type">
-          <el-select v-model="form.type">
+          <el-select v-model="form.type" placeholder="请选择申请住房类别">
             <!-- <el-option label="请选择字典生成" value="" /> -->
             <el-option
               v-for="(item, i) in ziDian"
@@ -527,7 +511,8 @@
         <el-form-item
           label="配偶入伍或随军时间"
           prop="pTimeOne"
-          class="zhufnag"
+          class="peiou"
+          label-width="180px"
         >
           <el-date-picker
             clearable
@@ -539,7 +524,7 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="地方普通高等学校入学时间" prop="entranceDate">
+        <el-form-item label="地方普通高等学校入学时间" prop="entranceDate" style="margin-left:120px"  class="peiou" label-width="180px">
           <el-date-picker
             clearable
             size="small"
@@ -549,10 +534,18 @@
           >
           </el-date-picker>
         </el-form-item>
+        
+        <el-form-item label="是否符合申请条件" prop="whether" class="shifou" label-width="180px">
+          <el-input v-model="form.whether" />
+        </el-form-item>
+        <el-form-item label="配偶是否军队人员(含职工)" class="shifou1"  label-width="180px" prop="whethers">
+          <el-input v-model="form.whethers"  />
+        </el-form-item>
         <el-form-item
           label="享受相应住房待遇职级时间"
           prop="jobDate"
-          class="zhufnag"
+          label-width="200px"
+          class="xiangshou"
         >
           <el-date-picker
             clearable
@@ -563,12 +556,6 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="是否符合申请条件" prop="whether" class="zhufnag">
-          <el-input v-model="form.whether" />
-        </el-form-item>
-        <el-form-item label="配偶是否军队人员（含职工）" prop="whethers">
-          <el-input v-model="form.whethers" />
-        </el-form-item>
         <div class="jiben">备注</div>
         <el-form-item prop="remark">
           <el-input
@@ -690,7 +677,7 @@ export default {
     this.getdict1();
     allUser().then((res) => {
       this.rylist = res.rows;
-      console.log(this.rylist);
+      // console.log(this.rylist);
     });
 
     getDeptList().then((res) => {
@@ -723,7 +710,7 @@ export default {
       getDicts(this.dictType.dictType).then((res) => {
         // console.log(res);
         this.ziDian = res.data;
-        console.log(this.ziDian);
+        // console.log(this.ziDian);
       });
     },
     // 查询计划类型
@@ -731,7 +718,7 @@ export default {
       getDicts(this.dictType.dictType1).then((res) => {
         // console.log(res);
         this.ziDian1 = res.data;
-        console.log(this.ziDian1);
+        // console.log(this.ziDian1);
       });
     },
     // 军衔
@@ -755,15 +742,23 @@ export default {
     //   // });
     //   // });
     // },
-    peopleIds(id,name){
-      this.form.id=id
+    peopleIds(name,item){
+      console.log(item.rankId)
+      this.form.rankName=""
       this.form.peopleName=name
-      console.log(id)
+      this.form.rankId=item.rankId
+      console.log(this.form.rankId)
+      this.ziDian1.forEach(item=>{
+      if(this.form.rankId==item.dictSort)
+        this.form.rankName=item.dictLabel
+        // console.log(this.form.rankName)
+      })
+      // console.log(this.form.rankId)
     },
     peopleIds1(id, name) {
       this.queryParams.id = id;
       this.queryParams.peopleName = name;
-      console.log(id);
+      // console.log(id);
     },
     // 到访单位选中触发
     selectPeo1(val) {
@@ -771,12 +766,12 @@ export default {
       getDept2().then((res) => {
         // console.log(res,2)
         this.users = res.data;
-        console.log(this.users);
+        // console.log(this.users);
       });
       this.queryParams.unitId = val.id;
       this.queryParams.peopleName = "";
       this.queryParams.unitName = val.label;
-      console.log(this.queryParams);
+      // console.log(this.queryParams);
       this.getZhuChi(this.queryParams.unitId);
     },
     // 获取执行人
@@ -794,6 +789,9 @@ export default {
       this.form.unitId = val.id;
       // console.log(val)
       this.form.peopleName = "";
+      this.form.name=""
+      this.form.rankName=""
+      this.form.peopleId=""
       // this.form.name=""
       this.form.unitName = val.label;
       // console.log(this.form.unitId)
@@ -891,6 +889,16 @@ export default {
       const id = row.id || this.ids;
       getFlats(id).then((response) => {
         this.form = response.data;
+        // this.form.name=this.form.peopleName
+        // console.log(this.form)
+        this.form.peopleId=this.form.peopleName
+        // this.executor.forEach
+        this.ziDian1.forEach(item=>{
+          if(item.dictSort==this.form.rankId){
+            this.form.rankName=item.dictLabel
+            // console.log(this.form.rankName)
+          }
+        })
         this.open = true;
         this.title = "修改公寓住房申请人员资格审查登记";
       });
@@ -970,7 +978,7 @@ export default {
 }
 /* 文本域 */
 ::v-deep .el-textarea__inner {
-  width: 1050px;
+  width: 1040px;
   height: 80px;
 }
 ::v-deep .el-form-item__label {
@@ -1025,4 +1033,33 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep .peiou .el-date-editor .el-input__inner{
+  width: 330px;
+}
+::v-deep .shifou .el-input--medium .el-input__inner{
+  width: 330px;
+}
+::v-deep .shifou1 .el-input--medium .el-input__inner{
+  width: 330px;
+}
+::v-deep .shifou1 .el-form-item__label{
+  margin-left: -10px;
+}
+::v-deep .xiangshou .el-input__inner{
+  width: 860px;
+  margin-left: -20px;
+}
+::v-deep .xiangshou .el-date-editor .el-input__prefix{
+  left: -15px;
+}
 </style>

src/views/combatduty/Quantitative/index.vue

@@ -526,7 +526,7 @@ body {
   bottom: 0;
   width: 100%;
   height: 10px;
-  background-color: pink;
+  /* background-color: pink; */
 }
 /* .wrap {
   min-height: calc(100vh - 85px);
@@ -552,7 +552,7 @@ body {
 .zhuangbeizhiban {
   /* flex: 1; */
   width: 98%;
-  height: 92%;
+  height: 92.5%;
   background-image: url("../../../images/Quantitative/底 拷贝 8.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
@@ -601,7 +601,7 @@ body {
 .wrap-top-right {
   /* flex: 1; */
   width: 98%;
-  height: 92%;
+  height: 92.5%;
   /* max-width: 98%;
   max-height: 96%; */
   background-image: url("../../../images/Quantitative/底 拷贝 8.png");
@@ -714,21 +714,22 @@ body {
   font-family: Source Han Sans CN;
   font-weight: 400;
   color: #eff7ff;
+  /* padding-left: 10px; */
   background-image: url("../../../images/组 21.png");
   background-repeat: no-repeat;
-  background-size: 60% 100%;
-  margin-top: 5px;
-  margin-left: 10px;
+  /* background-size: 60% 100%; */
+  margin-top: 17px;
+  margin-left: 21px;
 }
 .junche .wrap-top-left-top-head{
    background-image: url("../../../images/组 21.png");
   background-repeat: no-repeat;
-  background-size: 79% 100%;
+  /* background-size: 79% 100%; */
 }
 .zhuangbei .wrap-top-left-top-head {
   background-image: url("../../../images/组 21.png");
   background-repeat: no-repeat;
-  background-size: 95% 100%;
+  /* background-size: 95% 100%; */
 }
 .renyuan{
    width: 100%;
@@ -737,31 +738,41 @@ body {
   font-family: Source Han Sans CN;
   font-weight: 400;
   color: #eff7ff;
-  margin-top: 5px;
-  margin-left: 10px;
-  padding-left: 70px;
+  margin-top: 17px;
+  margin-left: 21px;
+  padding-left: 40px;
   background-image: url("../../../images/组 21.png");
   background-repeat: no-repeat;
-  background-size: 50% 100%;
+  /* background-size: 50% 100%; */
 }
 .wrap-footer-center .wrap-top-left-top-head {
   background-image: url("../../../images/组 21.png");
   background-repeat: no-repeat;
-  background-size: 85% 100%;
+  /* background-size: 85% 100%; */
 }
 .wrap-top-left-top-head b {
   font-size: 18px;
   color: #fff;
-  margin-left: 60px;
+  font-weight: 400;
+  font-size: 18px;
+  font-family: Source Han Sans CN;
+  /* font-weight: 400; */
+  color: #EFF7FF;
+  margin-left: 40px;
   line-height: 30px;
 }
-
+.renyuan b{
+  line-height: 30px;
+  font-weight: 400;
+  font-size: 18px;
+  font-family: Source Han Sans CN;
+}
 .wrap-top-center .wrap-top-left-top-head {
   margin-top: 10px;
 }
 
 .wrap-top-right .wrap-top-left-top-head {
-  margin-top: 10px;
+  margin-top: 17px;
 }
 /*九宫格*/
 .wrap-top-center-item {
@@ -831,7 +842,10 @@ table tr td {
   /* height: calc(100vh-159.84px); */
   /* height: 90%; */
   height: 65vh;
+  /* height:calc(100% - 100px); */
   /* height: calc(77vh-94px); */
+  /* overflow:scroll; */
+  /* background-color:#F0E6A2; */
   /* background-color: pink; */
   /* height: 100vh; */
   /* background-color: palegoldenrod; */

src/views/combatduty/RateOfTen/index.vue

@@ -1581,6 +1581,10 @@ body {
   margin: 0;
   padding:0;
 } */
+/* #wrap{
+  display: flex;
+  flex-wrap: wrap;
+} */
 .content {
   background-color: #103360;
 }

src/views/doormanManage/bdglVisit/index.vue

@@ -144,7 +144,7 @@
           <!-- <el-input v-model="form.peopleId" placeholder="请输入接待人" /> -->
           <el-select
                 v-model="form.peopleName"
-                
+                placeholder="请选择接待人"
                 
                 ref="peoplenames"
               >
@@ -165,6 +165,7 @@
           <el-date-picker clearable size="small"
             v-model="form.arriveTime"
             type="datetime"
+            placeholder="请选择到访时间"
             >
           </el-date-picker>
         </el-form-item>
@@ -172,6 +173,7 @@
           <el-date-picker clearable size="small"
             v-model="form.endTime"
             type="datetime"
+             placeholder="请选择离队时间"
             >
           </el-date-picker>
         </el-form-item>
@@ -628,6 +630,16 @@ v-deep .el-table thead tr{
 ::v-deep .el-picker-panel__link-btn span{
   display: none !important;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 ::v-deep .el-select--medium{
   border-radius: 5px;
 }

src/views/regulations/fileinfo/index.vue

@@ -1009,6 +1009,9 @@ export default {
 </script>
 
 <style scoped>
+::v-deep .vue-treeselect__placeholder{
+  color: #bdbdbd4f !important;
+}
 ::v-deep .el-table__row .el-table__cell{
   text-align: center !important;
 }
@@ -1204,7 +1207,7 @@ table {
   text-align: center;
 }
 .margins {
-  margin-left: 370px;
+  margin-left: 420px;
 }
 /* 返回目录按钮 */
 .turnback {
@@ -1216,7 +1219,7 @@ table {
   line-height: 33px;
   margin-left: 30px;
   text-align: center;
-  margin-left: 450px;
+  margin-left: 480px;
   color: #ccc;
   background: #00365f;
 }
@@ -1327,7 +1330,7 @@ table {
 .undeline {
   /* text-decoration: underline; */
   /* text-align: start; */
-  color: #1d96ff;
+  color: #00F0FF;
   cursor: pointer;
 }
 /* 序号居中 */
@@ -1423,4 +1426,14 @@ body,
 .pagination-container.hidden {
   display: none;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/workingArrangements/planTask/index.vue

@@ -243,7 +243,7 @@
         <el-form-item label="计划类型" prop="type" class="change_plan_type">
           <el-select
             v-model="form.type"
-            
+            placeholder="请选择计划类型"
             ref="dict"
             clearable
             size="small"
@@ -257,8 +257,9 @@
           </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="发布单位" prop="adminId">
+        <el-form-item label="发布单位" prop="adminId" >
           <treeselect
+          placeholder="请选择发布单位"
             v-model="form.adminId"
             :options="part"
             @select="selectPeo"
@@ -269,7 +270,7 @@
           <treeselect
             v-model="form.unitId"
             :options="users"
-            
+            placeholder="请选择执行单位"
             class="threeselects"
             @select="selectPeo1"
           />
@@ -280,7 +281,7 @@
               <el-select
                 multiple
                 v-model="form.peopleName"
-                
+                placeholder="请选择执行人"
                 id="execute"
                 ref="peoplenames"
               >
@@ -303,7 +304,7 @@
             v-model="form.startTime"
             type="date"
             value-format="yyyy-MM-dd"
-           
+           placeholder="请选择开始时间"
           >
           </el-date-picker>
         </el-form-item>
@@ -314,7 +315,7 @@
             v-model="form.endTime"
             type="date"
             value-format="yyyy-MM-dd"
-            
+            placeholder="请选择结束时间"
             style="width: 200px"
           >
           </el-date-picker>
@@ -1085,8 +1086,11 @@ export default {
     /** 提交按钮 */
     submitForm() {
       console.log(this.form)
-      this.form.fileName=this.form.file[0].name
+      if(this.form.file[0]){
+        this.form.fileName=this.form.file[0].name
       this.form.file=this.form.file[0].url
+      }
+      
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.adminId === this.form.unitId) {
@@ -1473,6 +1477,16 @@ export default {
 .el-form-item__content{
   border-bottom: none !important;
 }
+/* 调整输入框提示文字颜色 */
+ .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+ input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+ input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 /* 去除默认字体 */
 /* .el-select .el-input__inner */
 </style>

src/views/workingArrangements/workTask/index.vue

@@ -273,6 +273,7 @@
             v-model="form.type"
             style="width: 200px"
             clearable
+            placeholder="请选择任务类型"
             size="small"
           >
             <el-option
@@ -290,6 +291,7 @@
             :options="part"
             @select="selectPeo"
             class="threeselects"
+            placeholder="请选择发布单位"
           />
         </el-form-item>
         <el-form-item label="执行单位" prop="unitId">
@@ -298,6 +300,7 @@
             :options="users"
             class="threeselects"
             @select="selectPeo1"
+            placeholder="请选择执行单位"
           />
         </el-form-item>
         <div>
@@ -308,6 +311,7 @@
                 v-model="form.peopleName"
                 id="execute"
                 ref="peoplenames"
+                placeholder="请选择执行人"
               >
                 <el-option
                   v-for="item in executor"
@@ -799,6 +803,7 @@ export default {
       this.loading = true;
       listWorkTask(this.queryParams).then((response) => {
         this.workTaskList = response.rows;
+        console.log(this.workTaskList)
         this.total = response.total;
         this.loading = false;
       });
@@ -935,7 +940,9 @@ 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 + "  ";
             }
           });
@@ -943,7 +950,9 @@ export default {
       } else if (parseInt(this.workTaskList[0].common) == 0) {
         this.rylist.map((item) => {
           row.peopleName.split(",").forEach((items, index) => {
+            
             if (item.userId == items) {
+              // console.log(item.nickName)
               deptName += item.nickName + " ";
             }
           });
@@ -988,8 +997,10 @@ export default {
     /** 提交按钮 */
     submitForm() {
       console.log(this.form);
-       this.form.fileName=this.form.file[0].name
-      this.form.file=this.form.file[0].url
+      if(this.form.file[0]){
+         this.form.fileName=this.form.file[0].name
+        this.form.file=this.form.file[0].url
+      }
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.adminId === this.form.unitId) {
@@ -1393,4 +1404,14 @@ export default {
 .el-form-item__content{
   border-bottom: none !important;
 }
+/* 调整输入框提示文字颜色 */
+ .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+ input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+ input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>