Bladeren bron

修改态势,修改提示文字

sunyanqiang 3 jaren geleden
bovenliggende
commit
d9da51dd7e

+ 8 - 1
src/assets/styles/global.css

@@ -1018,4 +1018,11 @@ margin-right: 34px;
 
   /* .el-input__inner {
     border: 1px solid white !important;
-} */
+} */
+
+/* 表单验证提示文字居左 */
+.el-form-item__error {
+  margin-left: 0px;} 
+  .el-form-item__error {
+    left: 0;
+  }

+ 3 - 1
src/views/grassrootsregistration/bdglparty/index.vue

@@ -333,7 +333,6 @@
       append-to-body
       id="chakan"
       :close-on-click-modal="false"
-
     >
       <bdglparty
         v-if="menuRoleVisible"
@@ -895,4 +894,7 @@ export default {
   overflow: hidden;
   white-space: nowrap;
 }
+::v-deep .el-form-item__error {
+  left: 0;
+}
 </style>

+ 30 - 52
src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -7,22 +7,6 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item prop="unitId">
-        <el-select
-          v-model="queryParams.unitId"
-          placeholder="请选择单位"
-          @change="host"
-        >
-          <el-option
-            v-for="(item, i) in deptOptionss"
-            :key="i"
-            :label="item.deptName"
-            :value="item.deptId"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="" prop="time">
         <el-date-picker
           clearable
@@ -304,16 +288,23 @@
             :inline="true"
           >
             <el-form-item label="" prop="week">
-              <el-select v-model="item.week" placeholder="星期">
+              <el-input
+                v-model="item.week"
+                placeholder="星期"
+                class="input_xiala"
+                readonly
+              >
+                {{ item.time }}
+              </el-input>
+              <!-- <el-select v-model="item.week">
                 <el-option
                   v-for="item in week"
                   :key="item.value"
                   :label="item.label"
                   :value="item.label"
-                  class="input_xiala"
                 >
                 </el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
 
             <el-form-item label="" prop="daytime">
@@ -323,6 +314,7 @@
                 value-format="yyyy-MM-dd"
                 placeholder="选择时间"
                 @change="change_time"
+                :firstDayOfWeek="btn"
               >
               </el-date-picker>
             </el-form-item>
@@ -472,6 +464,7 @@ import {
   getZhuChiRen,
   getDept,
   getShouBu,
+  getDate,
 } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Bdglweekwork",
@@ -534,37 +527,7 @@ export default {
       //工作等级时间(开始-结束)
       startTime: "",
       endTime: "",
-      //星期选择
-      week: [
-        {
-          value: "选项1",
-          label: "星期一",
-        },
-        {
-          value: "选项2",
-          label: "星期二",
-        },
-        {
-          value: "选项3",
-          label: "星期三",
-        },
-        {
-          value: "选项4",
-          label: "星期四",
-        },
-        {
-          value: "选项5",
-          label: "星期五",
-        },
-        {
-          value: "选项6",
-          label: "星期六",
-        },
-        {
-          value: "选项7",
-          label: "星期日",
-        },
-      ],
+
       //早中晚选中
       day: [
         {
@@ -608,6 +571,7 @@ export default {
       code: 0,
       // 单位的保存
       names: "",
+      num: 0,
     };
   },
   created() {
@@ -616,6 +580,9 @@ export default {
     this.getDept();
   },
   methods: {
+    btn(value) {
+      console.log(value);
+    },
     //增加工作登记表单
     tianJia() {
       this.tomList.push({
@@ -629,21 +596,31 @@ export default {
         address: null,
         contents: null,
       });
+      this.num++;
     },
     //点击删除工作登记
     jtDelete(i) {
       this.tomList.splice(i, 1);
+      this.num--;
     },
     // 搜索时间触发
     tiem() {
       this.getList();
     },
 
+    // 点击日期获取时间
     change_time(date) {
-      console.log(`data${date}`);
+      var i = this.num;
+      var dangqian = this.getNowWeek(date);
+      // this.tomList[this.num].week = this.getNowWeek(date);
+      // this.xingQi = this.getNowWeek(date);
+      // this.tomList.forEach((item) => {
+      //   console.log(item);
+      //   // item[i].week = dangqian;
+      // });
+      this.tomList[i].week = dangqian;
       console.log(this.getNowWeek(date));
     },
-
     // 搜索单位触发
     host() {
       this.getList();
@@ -874,6 +851,7 @@ export default {
             });
           } else {
             this.form.bdglWeekworkRegisterList = this.tomList;
+            this.form.week = this.xingQi;
             if (this.code != 200) {
               if (this.form.unitId) {
                 addBdglweekwork(this.form).then((response) => {

+ 10 - 3
src/views/peopleChuRu/peopleBorrow/index.vue

@@ -526,7 +526,7 @@ export default {
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
-  width: 700px;
+  width: 650px;
   height: 104px;
   margin: auto;
 }
@@ -577,10 +577,12 @@ export default {
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
   padding: 18px 50px !important;
-  margin-right: 0px !important;
+  margin-right: 28px !important;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 30px;
+  /* margin: 10px 30px 20px 30px; */
+  margin-left: 56px;
+  margin-top: 10px;
   padding-top: 20px !important;
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */
@@ -661,5 +663,10 @@ export default {
 ::v-deep .el-dialog__body {
   padding: none !important;
 }
+
+/* 表格对其 */
+.el-form--inline .el-form-item {
+  margin-right: 50px;
+}
 </style>
 

File diff suppressed because it is too large
+ 379 - 140
src/views/taishi/index.vue


Some files were not shown because too many files changed in this diff