完善弹出层X轴出现滚动条，基层登记，人员进出，车辆管理，营具管理，医疗管理，思想政治教育中控制台的打印清除，月统计计划，月统计计划响应操作居左显示，响应按钮间距的调整

src/assets/styles/global.css

@@ -1117,6 +1117,7 @@ input:-moz-placeholder {
 .el-dialog__body .userAgree {
   height: 600px;
   overflow: auto;
+  overflow-x: hidden;
 }
 
 /*定义滚动条宽高及背景，宽高分别对应横竖滚动条的尺寸*/
@@ -1224,6 +1225,6 @@ input:-moz-placeholder {
 }
 
 /* 教案库上传文件弹框样式 */
-#uploadfile .el-dialog__body{
+#uploadfile .el-dialog__body {
   padding: 30px 0px !important;
 }

src/components/ImageUpload/index.vue

@@ -14,16 +14,20 @@
       :headers="headers"
       :file-list="fileList"
       :on-preview="handlePictureCardPreview"
-      :class="{hide: this.fileList.length >= this.limit}"
+      :class="{ hide: this.fileList.length >= this.limit }"
     >
       <i class="el-icon-plus"></i>
     </el-upload>
-    
+
     <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
-      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+      <template v-if="fileSize">
+        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+      </template>
+      <template v-if="fileType">
+        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+      </template>
       的文件
     </div>
 
@@ -54,7 +58,7 @@ export default {
     },
     // 大小限制(MB)
     fileSize: {
-       type: Number,
+      type: Number,
       default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
@@ -65,8 +69,8 @@ export default {
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
@@ -78,7 +82,7 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      fileList: []
+      fileList: [],
     };
   },
   watch: {
@@ -86,14 +90,14 @@ export default {
       handler(val) {
         if (val) {
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          const list = Array.isArray(val) ? val : this.value.split(",");
           // 然后将数组转为对象数组
-          this.fileList = list.map(item => {
+          this.fileList = list.map((item) => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
+                item = { name: this.baseUrl + item, url: this.baseUrl + item };
               } else {
-                  item = { name: item, url: item };
+                item = { name: item, url: item };
               }
             }
             return item;
@@ -104,8 +108,8 @@ export default {
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   computed: {
     // 是否显示提示
@@ -116,8 +120,8 @@ export default {
   methods: {
     // 删除图片
     handleRemove(file, fileList) {
-      const findex = this.fileList.map(f => f.name).indexOf(file.name);
-      if(findex > -1) {
+      const findex = this.fileList.map((f) => f.name).indexOf(file.name);
+      if (findex > -1) {
         this.fileList.splice(findex, 1);
         this.$emit("input", this.listToString(this.fileList));
       }
@@ -136,7 +140,7 @@ export default {
         if (file.name.lastIndexOf(".") > -1) {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
         }
-        isImg = this.fileType.some(type => {
+        isImg = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
@@ -188,25 +192,26 @@ export default {
       for (let i in list) {
         strs += list[i].url.replace(this.baseUrl, "") + separator;
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
-    }
-  }
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
+    },
+  },
 };
 </script>
 <style scoped lang="scss">
 // .el-upload--picture-card 控制加号部分
 ::v-deep.hide .el-upload--picture-card {
-    display: none;
+  display: none;
 }
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {
-    transition: all 0s;
+  transition: all 0s;
 }
 
-::v-deep .el-list-enter, .el-list-leave-active {
-    opacity: 0;
-    transform: translateY(0);
+::v-deep .el-list-enter,
+.el-list-leave-active {
+  opacity: 0;
+  transform: translateY(0);
 }
 </style>
 

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -38,9 +38,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery"  
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -2247,7 +2245,6 @@ export default {
       const id = row.id || this.ids;
       getBdglcookbook(id).then((response) => {
         this.wordInfo = response.data;
-        console.log(this.wordInfo);
         this.title = "查看一周食谱";
         this.menuRoleVisible = true;
       });
@@ -2639,7 +2636,6 @@ export default {
             this.Thursday.wanFu1 = this.Thursday.wanFu1.map((i) =>
               parseInt(i, 0)
             );
-            console.log(this.Thursday.wanFu1);
             this.Thursday.wanFu1Ren = this.wanFu4.peopleIds.split(",");
             this.Thursday.wanFu1Ren = this.Thursday.wanFu1Ren.map((i) =>
               parseInt(i, 0)
@@ -2919,7 +2915,6 @@ export default {
           }
         });
       });
-      console.log(this.arr);
     },
     /** 提交按钮 */
     submitForm(style) {
@@ -3837,7 +3832,6 @@ export default {
             // 中主;
             if (this.Sunday.zhongZu1 != "") {
               var str21 = this.Sunday.zhongZu1.join(",");
-              console.log(str21, 11);
               var pstr21 = this.Sunday.zhongZu1Ren.join(",");
             }
 

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1175,7 +1175,6 @@ export default {
       s = s < 10 ? "0" + s : s;
       let dateTime = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
       getXunLian(id, dateTime).then((res) => {
-        console.log(res.data);
         this.xunlian = res.data;
         // for (var i = 0; i < res.data.length; i++) {
         //   res.data[i].centertext =
@@ -1348,7 +1347,6 @@ export default {
     // 字典查询
     getdict() {
       getDicts(this.dictType.dictType).then((res) => {
-        // console.log(res);
         this.ziDian = res.data;
       });
     },

src/views/grassrootsregistration/bdglequip/index.vue

@@ -37,9 +37,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery"  
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -537,7 +535,6 @@ export default {
     getTreeselect2() {
       getDept2().then((response) => {
         this.deptOption = response.data;
-        console.log(response, 2);
       });
     },
     /** 查询训练器材/教材登记薄列表 */

src/views/grassrootsregistration/bdgleven/index.vue

@@ -44,9 +44,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" 
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
@@ -502,7 +500,6 @@ export default {
       this.loading = true;
       listBdgleven(this.queryParams).then((response) => {
         this.bdglevenList = response.rows;
-        console.log(this.bdglevenList);
         this.total = response.total;
         this.loading = false;
       });

src/views/grassrootsregistration/bdglfood/index.vue

@@ -42,9 +42,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery"  
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -1652,7 +1650,6 @@ export default {
       this.getShu();
       const id = row.id || this.ids;
       getBdglfood(id).then((response) => {
-        console.log(response);
         this.form = response.data;
         this.getdict();
         this.getRen(this.form.unitId);
@@ -1672,7 +1669,6 @@ export default {
         // 实物检查验收
         this.acceptance = response.data.bdglFoodKinds;
         // 采购食材
-        console.log(response.data.bdglFoodProcurements, "点");
         this.caiGou = response.data.bdglFoodProcurements;
         // 交/退伙食费
         this.expenses = response.data.bdglFoodBoardWagess;
@@ -1694,7 +1690,6 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdglfood(id).then((response) => {
-        console.log(response);
         this.wordInfo = response.data;
         this.title = "查看伙食管理登记薄";
         this.menuRoleVisible = true;
@@ -1713,7 +1708,6 @@ export default {
             this.Arr.push(this.zhongCan);
             this.Arr.push(this.wanCan);
             this.form.bdglFoodMeal = this.Arr;
-            console.log(this.form.bdglFoodMeal);
             // 赋值字段
             this.form.bdglFoodKinds = this.acceptance;
             // 采购食物
@@ -1729,7 +1723,6 @@ export default {
             });
           } else {
             // 转换字符串
-            console.log(11);
             if (this.form.peopleIds !== null) {
               this.form.peopleIds = this.form.peopleIds.join(",");
             }
@@ -1744,7 +1737,6 @@ export default {
             this.form.bdglFoodBoardWagess = this.expenses;
             // 在食堂购物
             this.form.bdglFoodShoppings = this.canteen;
-            console.log(this.form);
             addBdglfood(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -509,7 +509,6 @@ export default {
       var str = str.replace(/<\/?[^>]*>/g, "");
       str = str.replace(/[ | ]*\n/g, "\n");
       str = str.replace(/ /gi, "");
-      console.log(str);
       return str;
     },
     // 获取搜索下拉部门
@@ -693,7 +692,6 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            console.log(this.form);
             if (this.form.joinId !== undefined) {
               this.form.joinId = this.form.joinId.join(",");
             }

src/views/grassrootsregistration/bdglparty/index.vue

@@ -493,7 +493,6 @@ export default {
       var str = str.replace(/<\/?[^>]*>/g, "");
       str = str.replace(/[ | ]*\n/g, "\n");
       str = str.replace(/ /gi, "");
-      // console.log(str);
       return str;
     },
     // 重置表单人员
@@ -661,8 +660,6 @@ export default {
               this.form.absentIds = this.form.absentIds.join(",");
             }
             updateBdglparty(this.form).then((response) => {
-              console.log(11);
-              console.log(this.form);
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -34,9 +34,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -502,7 +500,6 @@ export default {
     /** 查询部门下拉树结构 */
     getTreeselect() {
       getDept().then((response) => {
-        // console.log(response);
         this.deptOptions = response.data;
       });
     },
@@ -514,15 +511,12 @@ export default {
     },
     // 选中添加部门单位触发
     department() {
-      console.log(this.form);
       getZhuChiRen(this.form.unitId).then((res) => {
-        console.log(res);
         this.renYuan = res.data;
       });
     },
     // 选中责任人触发
     zheRenRe(name) {
-      // // console.log(val);
       // this.form.peopleId = val.id;
       this.form.peopleName = name;
     },
@@ -532,7 +526,6 @@ export default {
     },
     // 选中批准人触发
     piZhuiRen(name) {
-      // console.log(val);
       // this.form.peopleId2 = val.id;
       this.form.people2Name = name;
     },
@@ -625,7 +618,6 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdglsecrecy(id).then((response) => {
-        console.log(response);
         this.wordInfo = response.data;
         this.title = "查看网络/手机/涉密载体登记本";
         this.menuRoleVisible = true;

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -483,7 +483,6 @@ export default {
       var str = str.replace(/<\/?[^>]*>/g, "");
       str = str.replace(/[ | ]*\n/g, "\n");
       str = str.replace(/ /gi, "");
-      console.log(str);
       return str;
     },
     // 搜索主持人选中触发
@@ -530,7 +529,6 @@ export default {
     //  记录人点击触发
     jiLu(name) {
       this.form.peopleJiLu = name;
-      console.log(this.form);
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -660,7 +658,6 @@ export default {
             if (this.form.absentIds !== undefined) {
               this.form.absentIds = this.form.absentIds.join(",");
             }
-            console.log(this.form);
             updateBdglsoldier(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -670,12 +667,11 @@ export default {
             (this.form.joinId = this.form.joinId.join(",")),
               (this.form.peopleIds = this.form.peopleIds.join(",")),
               (this.form.absentIds = this.form.absentIds.join(",")),
-              console.log(this.form);
-            addBdglsoldier(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              addBdglsoldier(this.form).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
           }
         }
       });

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -661,7 +661,6 @@ export default {
       }
       if (date) {
         this.tomList[i].week = this.getNowWeek(date);
-        console.log(this.getNowWeek(date));
       } else {
         this.tomList[i].week = "";
       }
@@ -876,7 +875,6 @@ export default {
       const id = row.id || this.ids;
       getBdglweekwork(id).then((response) => {
         this.wordInfo = response.data;
-        console.log(this.wordInfo);
         this.title = "查看一周工作安排";
         this.menuRoleVisible = true;
       });
@@ -889,13 +887,20 @@ export default {
     submitForm() {
       this.$refs["refform"].validate((valid) => {
         if (valid) {
-          this.form.bdglWeekworkRegisterList = this.tomList;
-          if (this.form.id != null) {
-            updateBdglweekwork(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+          if (
+            new Date(this.gongZuoTiem) >= new Date(this.form.startTime) &&
+            new Date(this.gongZuoTiem) <= new Date(this.form.endTime)
+          ) {
+            this.form.bdglWeekworkRegisterList = this.tomList;
+            if (this.form.id != null) {
+              updateBdglweekwork(this.form).then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.$modal.msgWarning("请选择开始时间与结束时间区级内的日期");
+            }
           } else {
             if (
               new Date(this.gongZuoTiem) >= new Date(this.form.startTime) &&
@@ -911,6 +916,8 @@ export default {
                   });
                 }
               }
+            } else {
+              this.$modal.msgWarning("请选择开始时间与结束时间区级内的日期");
             }
           }
         }
@@ -947,7 +954,6 @@ export default {
         .catch(() => {});
     },
     datelinefun(val) {
-      console.log(val);
       if (val == "早晨") {
         this.option.start = "06:00";
         this.option.end = "08:00";

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -8,8 +8,8 @@
         </div>
         <div class="tree">
           <el-tree
-        class="userAgrees"
-         style = "height:700px;overflow:auto;"
+            class="userAgrees"
+            style="height: 700px; overflow: auto"
             :data="deptOptions"
             :props="defaultProps"
             @node-click="handleNodeClick"
@@ -972,7 +972,6 @@ export default {
       }
     });
     treeselect().then((res) => {
-      console.log(res);
       if (res.code == 200) {
         this.deptOptions = res.data;
       }
@@ -1100,7 +1099,6 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getPeople(id).then((response) => {
-        console.log(response);
         this.form = response.data;
         this.jtlist = response.data.familyInformation;
         this.bdglPeopleList = response.data.bdglPeopleList;
@@ -1140,7 +1138,7 @@ export default {
       const deptId = row.deptId;
       getRenYuanXiangQing(deptId).then((response) => {
         this.renshu = response.data[0];
-          this.wordInfo =  response.data[1];
+        this.wordInfo = response.data[1];
         this.title = "查看人员名册";
         this.menuRoleVisible = true;
       });

src/views/materialManagement/distribution/index.vue

@@ -698,12 +698,12 @@ export default {
     // 点击选择接收人触发
     rens(data) {
       this.form.recipientId = data.id;
-      console.log(data);
+      // console.log(data);
       this.$set(this.form, "recipient", data.name);
     },
     // 点击发放对象
     dianJi(value) {
-      console.log(value);
+      // console.log(value);
       if (value == "0") {
         this.danWei = false;
         this.ren = true;

src/views/materialManagement/equipmentReceiving/index.vue

@@ -644,7 +644,7 @@ export default {
     },
     // 点击发放对象
     dianJi(value) {
-      console.log(value);
+      // console.log(value);
       if (value == "0") {
         this.danWei = false;
         this.ren = true;
@@ -671,7 +671,7 @@ export default {
     },
     // 点击物品名称触发
     wuPing(data) {
-      console.log(data);
+      // console.log(data);
       this.form.responsibilityUnit = data.responsibilityUnit;
       this.form.price = data.price;
       this.form.archivesId = data.archivesId;

src/views/materialManagement/propertyChange/index.vue

@@ -508,7 +508,7 @@ export default {
   methods: {
     // 物品名称触发
     wuPing(data) {
-      console.log(data);
+      // console.log(data);
       this.form.beforeUnitName = data.responsibilityUnit;
       this.form.beforeUnitId = data.unitId;
       this.form.beforePeopleName = data.personLiable;

src/views/medicalhealth/antiepidemicguoqi/index.vue

@@ -415,7 +415,7 @@ export default {
           cancelButtonText: "取消",
         })
         .then(() => {
-          console.log(this.form);
+          // console.log(this.form);
           this.form.state = "1";
           updateAntiepidemicputin(this.form).then((response) => {
             this.$modal.msgSuccess("销毁成功");

src/views/medicalhealth/antiepidemiclingyong/index.vue

@@ -554,7 +554,7 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions);
+        // console.log(this.deptOptions);
       });
     },
     // 选择防疫品

src/views/medicalhealth/antiepidemicruin/index.vue

@@ -342,7 +342,7 @@ export default {
     // 获取防疫品列表
     getFang() {
       listAntiepidemicarchives().then((response) => {
-        console.log(response);
+        // console.log(response);
         this.fangList = response.rows;
       });
     },

src/views/medicalhealth/bdgldurgarchives/index.vue

@@ -427,7 +427,7 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions);
+        // console.log(this.deptOptions);
       });
     },
     /** 查询药品库存档案列表 */

src/views/medicalhealth/bdgldurgguoqi/index.vue

@@ -369,7 +369,7 @@ export default {
     getList() {
       this.loading = true;
       exportYaoPing(this.queryParams).then((response) => {
-        console.log(response);
+        // console.log(response);
         this.bdgldurgputinList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/medicalhealth/bdgldurglingyong/index.vue

@@ -566,14 +566,14 @@ export default {
     getYaoPing() {
       exportYao().then((response) => {
         this.yaoList = response.data;
-        console.log(response.data);
+        // console.log(response.data);
       });
     },
     /** 查询药品出库登记列表 */
     getList() {
       this.loading = true;
       listBdgldurgputout(this.queryParams).then((response) => {
-        console.log(response);
+        // console.log(response);
         this.bdgldurgputoutList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/medicalhealth/bdgldurgputin/index.vue

@@ -420,7 +420,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      console.log(id);
+      // console.log(id);
       getBdgldurgputin(id).then((response) => {
         this.form = response.data;
         this.getYaoPing();

src/views/medicalhealth/bdgldurgputout/index.vue

@@ -536,7 +536,7 @@ export default {
     },
     // 新增选择单位触发
     selectPeo(val) {
-      console.log(val);
+      // console.log(val);
       this.form.unitId1 = val.id;
       this.form.unitName1 = val.label;
       // 选中单位触发获取人员

src/views/medicalhealth/bdgldurgruin/index.vue

@@ -347,7 +347,7 @@ export default {
     // 获取药品名称
     getYaoPingMingCheng() {
       listBdgldurgarchives().then((response) => {
-        console.log(response);
+        // console.log(response);
         this.yaoList = response.rows;
       });
     },

src/views/medicalhealth/consumelingyong/index.vue

@@ -630,7 +630,7 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions);
+        // console.log(this.deptOptions);
       });
     },
     /** 查询耗材出库登记列表 */

src/views/medicalhealth/consumeputout/index.vue

@@ -643,7 +643,7 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions);
+        // console.log(this.deptOptions);
       });
     },
     /** 查询耗材出库登记列表 */

src/views/medicalhealth/consumeruin/index.vue

@@ -346,7 +346,7 @@ export default {
     // 获取耗材名称列表
     getHaoList() {
       listArchives().then((response) => {
-        console.log(response);
+        // console.log(response);
         this.haoList = response.rows;
       });
     },

src/views/medicalhealth/examine/index.vue

@@ -494,7 +494,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            console.log(this.form);
+            // console.log(this.form);
             updateExamine(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -130,9 +130,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -174,7 +172,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-        class="box"
+          class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -457,7 +455,6 @@ export default {
     // 获取车牌号列表
     getCarPai() {
       listPrivateCar().then((response) => {
-        console.log(response);
         this.carList = response.rows;
       });
     },
@@ -621,7 +618,6 @@ export default {
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
-
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -739,9 +735,9 @@ export default {
   color: #bdbdbd4f !important;
 }
 ::v-deep .el-input__inner {
-    border: 1px solid white !important;
+  border: 1px solid white !important;
 }
-.box{
+.box {
   background-color: #ffba00 !important;
 }
 </style>

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -376,13 +376,11 @@ export default {
     },
     // 车牌号触发
     carPaiHao(data) {
-      console.log(data);
       // this.form.vehiclenumber = name;
     },
     // 查询车牌号列表
     getCarPaiList() {
       listThebus().then((response) => {
-        console.log(response);
         this.carList = response.rows;
       });
     },

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -1087,7 +1087,7 @@ export default {
     // 审批通过
     submitFormShenPi() {
       if (this.form.shenpijiedian == "1") {
-        console.log("营级");
+        // console.log("营级");
         this.form.isTongguo = "0";
         if (this.form.id != null) {
           exportThebusYin(this.form).then((response) => {
@@ -1098,7 +1098,7 @@ export default {
           return;
         }
       } else if (this.form.shenpijiedian == "2") {
-        console.log("初级");
+        // console.log("初级");
         this.form.isTongguo = "0";
         exportThebusChu(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
@@ -1108,7 +1108,7 @@ export default {
         return;
       } else if (this.form.shenpijiedian == "3") {
         this.form.isTongguo = "0";
-        console.log("一级");
+        // console.log("一级");
         exportThebusOne(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.getList();
@@ -1117,7 +1117,7 @@ export default {
         return;
       } else if (this.form.shenpijiedian == "4") {
         this.form.isTongguo = "0";
-        console.log("二级");
+        // console.log("二级");
         exportThebusTwo(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.getList();
@@ -1126,7 +1126,7 @@ export default {
         return;
       } else if (this.form.shenpijiedian == "5") {
         this.form.isTongguo = "0";
-        console.log("三级");
+        // console.log("三级");
         exportThebusThree(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.getList();
@@ -1183,7 +1183,7 @@ export default {
     },
     // 审批按钮
     handleShenPi(row) {
-      console.log(row);
+      // console.log(row);
       this.reset();
       this.getTreeList();
       this.getYingJi();
@@ -1212,7 +1212,7 @@ export default {
     // 获取审批模板列表
     getShenPi() {
       listThebusConfig().then((response) => {
-        console.log();
+        // console.log();
         this.shenPi = response.rows;
       });
     },
@@ -1253,11 +1253,11 @@ export default {
     getList() {
       this.loading = true;
       listThebusApply(this.queryParams).then((response) => {
-        console.log(
-          (response.rows.unitPeopleState == "1" ||
-            response.rows.status == "1") &&
-            response.rows.isCaoZuo != null
-        );
+        // console.log(
+        //   (response.rows.unitPeopleState == "1" ||
+        //     response.rows.status == "1") &&
+        //     response.rows.isCaoZuo != null
+        // );
         this.thebusApplyList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -631,7 +631,7 @@ export default {
       });
     },
     chuche(data) {
-      console.log(data);
+      // console.log(data);
     },
     // 获取搜索所有人
     getSuo() {

src/views/peopleChuRu/bdglLeave/index.vue

@@ -880,7 +880,6 @@ export default {
         .then(() => {
           if (this.form.id != null) {
             this.form.rejoin = "1";
-            console.log(this.form, 1);
             updateBdglLeave(this.form).then((response) => {
               this.$modal.msgSuccess("归队成功");
               this.getList();
@@ -991,7 +990,6 @@ export default {
     getList() {
       this.loading = true;
       listBdglLeave(this.queryParams).then((response) => {
-        console.log(response);
         this.bdglLeaveList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/peopleChuRu/leaveOne/index.vue

@@ -851,7 +851,6 @@ export default {
       this.form.unitId = data.id;
       this.getYong(this.form.unitId);
       this.getRen(this.form.unitId, 0);
-      console.log(1);
     },
     // 重置表单人员
     ChongZhiRen() {

src/views/peopleChuRu/peopleBorrow/index.vue

@@ -355,7 +355,6 @@ export default {
     },
     // 请假人选中
     jieRen(name, rankId, jobTitle, data) {
-      console.log(data);
       // console.log(name, rankId, jobTitle);
       this.form.transferPeople = name;
       this.form.rankId = rankId;
@@ -501,7 +500,6 @@ export default {
     },
     // 点击归队弹出询问框
     handle(row) {
-      console.log(row);
       this.form.id = row.id;
       this.$confirm("是否确认归队？", {
         confirmButtonText: "确定",

src/views/thought/responses/index.vue

@@ -266,7 +266,7 @@
             fixed="right"
             width="200"
             label="操作"
-            align="center"
+            align="left"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
@@ -397,89 +397,111 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="form2"
-        :model="form"
-        :rules="rules2"
-        :inline="true"
-        label-width="100px"
-      >
-        <div class="jiben">文档信息</div>
-        <el-form-item label="计划名称" prop="planName">
-          <el-input
-            v-model="form.planName"
-            placeholder="请输入计划名称"
-            readonly
-          />
-        </el-form-item>
-        <el-form-item label="计划开始时间" prop="planStartTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.planStartTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择计划开始时间"
-            readonly
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="计划结束时间" prop="planEndTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.planEndTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择计划结束时间"
-            readonly
-          ></el-date-picker>
-        </el-form-item>
-        <div class="jiben">计划简介</div>
-        <el-form-item label="" prop="planIntroduction">
-          <el-input
-            type="textarea"
-            v-model="form.planIntroduction"
-            placeholder="请输入计划简介"
-            readonly
-          />
-        </el-form-item>
-        <div class="jiben">计划条数</div>
-        <div class="jiHua">
-          <el-form v-for="(item, e) in checkShop" :key="e">
-            <el-form-item prop="remark">
+      <div class="userAgree">
+        <el-form
+          ref="form2"
+          :model="form"
+          :rules="rules2"
+          :inline="true"
+          label-width="100px"
+        >
+          <div class="jiben">文档信息</div>
+          <el-form-item label="计划名称" prop="planName">
+            <el-input
+              v-model="form.planName"
+              placeholder="请输入计划名称"
+              readonly
+            />
+          </el-form-item>
+          <el-form-item label="计划开始时间" prop="planStartTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.planStartTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择计划开始时间"
+              readonly
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划结束时间" prop="planEndTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.planEndTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择计划结束时间"
+              readonly
+            ></el-date-picker>
+          </el-form-item>
+          <div class="jiben">计划简介</div>
+          <el-form-item label="" prop="planIntroduction">
+            <el-input
+              type="textarea"
+              v-model="form.planIntroduction"
+              placeholder="请输入计划简介"
+              readonly
+              autosize
+            />
+          </el-form-item>
+          <div class="jiben">计划条数</div>
+          <div class="jiHua">
+            <el-form v-for="(item, e) in checkShop" :key="e">
+              <span
+                style="
+                  color: #13ce66;
+                  margin-bottom: 9px;
+                  display: inline-block;
+                "
+                v-if="item.isresponse == '1'"
+                >此条计划需各单位配合执行</span
+              >
+              <span
+                style="
+                  color: #ff4949;
+                  margin-bottom: 9px;
+                  display: inline-block;
+                "
+                v-if="item.isresponse == '0'"
+                >此条计划非必要，各单位根据实际执行</span
+              >
+              <el-form-item prop="remark">
+                <el-input
+                  type="textarea"
+                  v-model="item.planContent"
+                  placeholder="请输入计划详情"
+                  readonly
+                  autosize
+                />
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="jiben" v-if="planResponsefus.length != 0">文件</div>
+          <el-form v-for="(item, i) in planResponsefus" :key="i">
+            <el-form-item prop="file">
               <el-input
-                type="textarea"
-                v-model="item.planContent"
-                placeholder="请输入计划详情"
+                label="附件名称"
+                v-model="item.fileName"
+                style="width: 260px"
                 readonly
               />
+              <a
+                :href="item.filePath"
+                download
+                title="下载"
+                style="color: white; margin-left: -58px"
+                class="downloadfile"
+                >下载附件</a
+              >
             </el-form-item>
           </el-form>
-        </div>
-        <div class="jiben" v-if="planResponsefus.length != 0">文件</div>
-        <el-form v-for="(item, i) in planResponsefus" :key="i">
-          <el-form-item prop="file">
-            <el-input
-              label="附件名称"
-              v-model="item.fileName"
-              style="width: 260px"
-              readonly
-            />
-            <a
-              :href="item.filePath"
-              download
-              title="下载"
-              style="color: white; margin-left: -58px"
-              class="downloadfile"
-              >下载附件</a
-            >
+          <div class="jiben">审批驳回原因</div>
+          <el-form-item prop="reasons">
+            <el-input v-model="form.reasons" type="textarea" />
           </el-form-item>
         </el-form>
-        <div class="jiben">审批驳回原因</div>
-        <el-form-item prop="reasons">
-          <el-input v-model="form.reasons" type="textarea" />
-        </el-form-item>
-      </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">通过</el-button>
         <el-button @click="submitFormBoHui" size="btn">驳回</el-button>
@@ -494,91 +516,105 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="form3"
-        :model="form"
-        :rules="rules3"
-        :inline="true"
-        label-width="100px"
-      >
-        <div class="jiben">文档信息</div>
-        <el-form-item label="计划名称" prop="planName">
-          <el-input
-            v-model="form.planName"
-            placeholder="请输入计划名称"
-            readonly
-          />
-        </el-form-item>
-        <el-form-item label="计划开始时间" prop="planStartTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.planStartTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择计划开始时间"
-            readonly
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="计划结束时间" prop="planEndTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.planEndTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择计划结束时间"
-            readonly
-          ></el-date-picker>
-        </el-form-item>
-        <div class="jiben">计划简介</div>
-        <el-form-item label="" prop="planIntroduction">
-          <el-input
-            type="textarea"
-            v-model="form.planIntroduction"
-            placeholder="请输入计划简介"
-            readonly
-          />
-        </el-form-item>
-        <div class="jiben">计划条数</div>
-        <div class="jiHua">
-          <el-form v-for="(item, e) in checkShop" :key="e">
-            <el-form-item prop="remark">
-              <el-input
-                type="textarea"
-                v-model="item.planContent"
-                placeholder="请输入计划详情"
-                readonly
-              />
-              <span style="color: #fff" v-if="item.isresponse == '1'"
+      <div class="userAgree">
+        <el-form
+          ref="form3"
+          :model="form"
+          :rules="rules3"
+          :inline="true"
+          label-width="100px"
+        >
+          <div class="jiben">文档信息</div>
+          <el-form-item label="计划名称" prop="planName">
+            <el-input
+              v-model="form.planName"
+              placeholder="请输入计划名称"
+              readonly
+            />
+          </el-form-item>
+          <el-form-item label="计划开始时间" prop="planStartTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.planStartTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择计划开始时间"
+              readonly
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划结束时间" prop="planEndTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.planEndTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择计划结束时间"
+              readonly
+            ></el-date-picker>
+          </el-form-item>
+          <div class="jiben">计划简介</div>
+          <el-form-item label="" prop="planIntroduction">
+            <el-input
+              type="textarea"
+              v-model="form.planIntroduction"
+              placeholder="请输入计划简介"
+              readonly
+            />
+          </el-form-item>
+          <div class="jiben">计划条数</div>
+          <div class="jiHua">
+            <el-form v-for="(item, e) in checkShop" :key="e">
+              <span
+                style="
+                  color: #13ce66;
+                  margin-bottom: 9px;
+                  display: inline-block;
+                "
+                v-if="item.isresponse == '1'"
                 >此条计划需各单位配合执行</span
               >
-              <span style="color: #fff" v-if="item.isresponse == '0'"
+              <span
+                style="
+                  color: #ff4949;
+                  margin-bottom: 9px;
+                  display: inline-block;
+                "
+                v-if="item.isresponse == '0'"
                 >此条计划非必要，各单位根据实际执行</span
               >
+              <el-form-item prop="remark">
+                <el-input
+                  type="textarea"
+                  v-model="item.planContent"
+                  placeholder="请输入计划详情"
+                  readonly
+                />
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="jiben" v-if="planResponsefus.length != 0">文件</div>
+          <el-form v-for="(item, i) in planResponsefus" :key="i">
+            <el-form-item prop="file">
+              <el-input
+                label="附件名称"
+                v-model="item.fileName"
+                style="width: 260px"
+                readonly
+              />
+              <a
+                :href="item.filePath"
+                download
+                title="下载"
+                style="color: white; margin-left: -58px"
+                class="downloadfile"
+                >下载附件</a
+              >
             </el-form-item>
           </el-form>
-        </div>
-        <div class="jiben" v-if="planResponsefus.length != 0">文件</div>
-        <el-form v-for="(item, i) in planResponsefus" :key="i">
-          <el-form-item prop="file">
-            <el-input
-              label="附件名称"
-              v-model="item.fileName"
-              style="width: 260px"
-              readonly
-            />
-            <a
-              :href="item.filePath"
-              download
-              title="下载"
-              style="color: white; margin-left: -58px"
-              class="downloadfile"
-              >下载附件</a
-            >
-          </el-form-item>
         </el-form>
-      </el-form>
+      </div>
     </el-dialog>
   </div>
 </template>