修改人员进出，门岗管理，车辆管理表单修改

src/assets/styles/global.css

@@ -1014,4 +1014,8 @@ margin-right: 34px;
   
   #app .main-container{
     margin-left: 265px !important;
-  }
+  }
+
+  .el-input__inner {
+    border: 1px solid white !important;
+}

src/views/doormanManage/bdglVisit/index.vue

@@ -20,6 +20,7 @@
       </el-form-item>
       <el-form-item label="到访人员姓名" prop="name">
         <el-input
+        placeholder="请选择到访人员姓名"
         class="daofang"
           v-model="queryParams.name"
           clearable
@@ -128,7 +129,7 @@
     />
 
     <!-- 添加或修改人员来访登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1090px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1090px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px"  :inline="true">
         <el-form-item label="到访单位" prop="unitId" style="margin-left:20px">
           <treeselect
@@ -479,7 +480,7 @@ export default {
 }
 /* 输入框 */
 ::v-deep .el-dialog .el-input__inner{
-  background-color: #004D86 !important;
+  background-color: #004d86 !important;
   width: 220px;
   color: white;
 }
@@ -649,4 +650,6 @@ v-deep .el-table thead tr{
 ::v-deep .el-date-picker__editor-wrap .el-input__inner{
   width: 30px;
 }
+::v-deep .el-dialog__footer {
+    padding: 20px 40px !important;}
 </style>

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -314,55 +314,46 @@
           <div class="jiben">训练、教育或者执行其他任务情况</div>
           <div class="box" v-for="(item, i) in xunlian" :key="i">
             <table
-              border="1"
               width="920"
               cellspacing="0"
               align="center"
-              style="border-color: white"
+              border="1"
+              style="
+                border-bottom: white;
+                border-collapse: collapse;
+                mso-border-left-alt: 0.5pt solid windowtext;
+                mso-border-top-alt: 0.5pt solid windowtext;
+                mso-border-right-alt: 0.5pt solid windowtext;
+                mso-border-bottom-alt: 0.5pt solid windowtext;
+                mso-border-insideh: 0.5pt solid windowtext;
+                mso-border-insidev: 0.5pt solid windowtext;
+                mso-padding-alt: 0pt 0pt 0pt 0pt;
+              "
+              bordercolor="white"
             >
               <tr align="center">
-                <td
-                  width="200"
-                  height="40"
-                  style="
-                    border-top: none;
-                    border-right: none;
-                    border-left: none;
-                  "
-                >
-                  区分
-                </td>
-                <td colspan="2" width="420" style="border-top: none">内容</td>
+                <td width="200" height="40">区分</td>
+                <td colspan="2" width="420">内容</td>
                 <td
                   width="100"
-                  style="
-                    border-top: none;
-                    border-right: none;
-                    border-left: none;
-                  "
                 >
                   应到人数
                 </td>
-                <td width="100" style="border-top: none">实到人数</td>
+                <td width="100" >实到人数</td>
                 <td
                   width="100"
-                  style="
-                    border-top: none;
-                    border-right: none;
-                    border-left: none;
-                  "
                 >
                   到课率
                 </td>
               </tr>
               <tr align="center">
-                <td height="60" style="border-right: none; border-left: none">
+                <td height="60">
                   <el-input
                     v-model="item.dateline"
                     placeholder="请输入时间"
                   ></el-input>
                 </td>
-                <td rowspan="2" colspan="2">
+                <td rowspan="2" colspan="2" >
                   <el-input
                     type="textarea"
                     :rows="1"
@@ -374,7 +365,7 @@
                     {{ item.contents }}
                   </el-input>
                 </td>
-                <td style="border-right: none; border-left: none">
+                <td>
                   <el-input
                     v-model="item.shouldArrive"
                     placeholder="应到人数"
@@ -390,7 +381,7 @@
                     oninput="value=value.replace(/[^\d]/g,'')"
                   ></el-input>
                 </td>
-                <td style="border-right: none; border-left: none">
+                <td>
                   <el-input
                     v-model="item.percentage"
                     placeholder="到课率"
@@ -1950,4 +1941,7 @@ export default {
 ::v-deep .el-tree-node__label {
   color: #fff !important;
 }
+::v-deep .box table td {
+  border-bottom: 1px solid white !important;
+}
 </style>

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -72,7 +72,7 @@
             label="职务等级时间"
             align="center"
             prop="postDate"
-            width="180"
+            width="100"
           >
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.postDate, "{y}-{m}-{d}") }}</span>
@@ -988,7 +988,6 @@ export default {
     /** 查询人员管理列表 */
     getList() {
       this.loading = true;
-      console.log(this.queryParams);
       getXiangQis(this.queryParams).then((response) => {
         this.peopleList = response.rows;
         this.total = response.total;
@@ -1134,14 +1133,13 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
+      this.wordInfo=row
       // 是否隐藏按钮
       console.log(row);
       this.opens = false;
-      // const id = row.id || this.ids;
       const deptId = row.deptId;
-
       getRenYuanXiangQing(deptId).then((response) => {
-        this.wordInfo = response.data;
+        this.renshu = response.data[0];
         this.title = "查看人员名册";
         this.menuRoleVisible = true;
       });

src/views/militaryvehicleManagement/driver/index.vue

@@ -33,7 +33,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button size="btn" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -816,4 +816,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+::v-deep .el-input__inner {
+    border: 1px solid white !important;
+}
 </style>

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -130,7 +130,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button  size="btn" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -735,4 +735,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+::v-deep .el-input__inner {
+    border: 1px solid white !important;
+}
 </style>

src/views/militaryvehicleManagement/privateCar/index.vue

@@ -40,7 +40,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button  size="btn" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -178,7 +178,7 @@
     />
 
     <!-- 添加或修改私家车管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form
         ref="form"
         :model="form"

src/views/militaryvehicleManagement/thebus/index.vue

@@ -199,7 +199,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button  size="btn" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -972,4 +972,7 @@ export default {
 ::v-deep ::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+::v-deep .el-input__inner {
+    border: 1px solid white !important;
+}
 </style>

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -19,12 +19,11 @@
       <el-form-item>
         <el-button
           type="primary"
-          icon="el-icon-search"
-          size="mini"
+          size="btr"
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button  size="btn" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -143,7 +142,7 @@
     />
 
     <!-- 添加或修改军车进出查询对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form
         ref="form"
         :model="form"

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -33,7 +33,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button  size="btn" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -543,6 +543,7 @@
       :visible.sync="opens"
       width="500px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="forms"
@@ -684,6 +685,7 @@
       :visible.sync="opensTe"
       width="500px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="formsTe"

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -31,7 +31,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button  size="btn" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -150,7 +150,7 @@
     />
 
     <!-- 添加军车管理设置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form
         ref="form"
         :model="form"
@@ -246,6 +246,7 @@
       :visible.sync="opens"
       width="500px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -40,7 +40,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button  size="btn" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -117,7 +117,7 @@
     />
 
     <!-- 出车会话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form
         ref="form"
         :model="form"
@@ -227,12 +227,16 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+
     <!-- 查看会话框 -->
     <el-dialog
-      :title="title"
+      title="查看可出车列表"
       :visible.sync="opens"
       width="500px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"
@@ -257,7 +261,21 @@
           <el-input v-model="forms.cause" />
         </el-form-item>
         <div class="box4">
-          <table border="1">
+          <table border="1"
+          style="
+          border-collapse: collapse;
+          border: none;
+          mso-border-left-alt: 0.5pt solid windowtext;
+          mso-border-top-alt: 0.5pt solid windowtext;
+          mso-border-right-alt: 0.5pt solid windowtext;
+          mso-border-bottom-alt: 0.5pt solid windowtext;
+          mso-border-insideh: 0.5pt solid windowtext;
+          mso-border-insidev: 0.5pt solid windowtext;
+          mso-padding-alt: 0pt 0pt 0pt 0pt;
+        "
+        width="907px"
+          >
+           <tbody style="">
             <tr align="center" class="tr">
               <td width="220" height="40">车牌型号</td>
               <td width="220" height="40">号牌号码</td>
@@ -279,6 +297,7 @@
               <td width="220" height="40">{{ item.driverName }}</td>
               <td width="220" height="40">{{ item.driverPhone }}</td>
             </tr>
+           </tbody>
           </table>
         </div>
       </el-form>
@@ -688,7 +707,7 @@ export default {
 }
 /* 查看表格 */
 .box4 {
-  width: 920px;
+  width: 923px;
   min-height: 70px;
   border-radius: 5px;
   /* background: #409eff; */
@@ -705,5 +724,8 @@ export default {
 .box4 table {
   border-color: #fff;
 }
+::v-deep .box4 table td {
+  border-bottom: 1px solid white !important;
+}
 </style>
 

src/views/militaryvehicleManagement/thebusThemplate/index.vue

@@ -69,7 +69,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button  size="btn" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -177,7 +177,7 @@
     />
 
     <!-- 添加或修改军车审批模板对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="审批模板名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入审批模板名称" />

src/views/peopleChuRu/bdglLeave/index.vue

@@ -308,7 +308,7 @@
     </el-table>
 
     <!-- 添加或修改人员请假对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form
         ref="form"
         :model="form"
@@ -1291,10 +1291,11 @@ export default {
 }
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
-  padding: 30px 50px;
+    padding: 18px 50px !important;
+    margin-right: 19px !important;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 30px;
+  margin: 10px 0px 20px 51px;
   padding-top: 20px !important;
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */

src/views/peopleChuRu/peopleBorrow/index.vue

@@ -173,7 +173,7 @@
     /> -->
 
     <!-- 添加或修改人员借调对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form
         ref="form"
         :model="form"
@@ -570,7 +570,8 @@ export default {
 }
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
-  padding: 30px 50px;
+    padding: 18px 50px !important;
+    margin-right: 0px !important;
 }
 ::v-deep .el-dialog__body {
   margin: 10px 30px 20px 30px;

src/views/peopleManage/examination/index.vue

@@ -105,8 +105,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="btn" @click="handleQuery">搜索</el-button>
+        <el-button  size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -230,7 +230,7 @@
     />
 
     <!-- 添加或修改人员政审对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
         <div class="jiben">基本信息</div>
         <el-form-item label="政审对象" prop="peopleId">
@@ -641,7 +641,7 @@ export default {
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
-  background: #004d86;
+  background: transparent !important;
   color: #fff;
   border: 1px solid #fff !important;
 }
@@ -696,4 +696,8 @@ export default {
   background-color: #003C69;
   color: #fff;
   }
+::v-deep .el-dialog__body {
+    padding: 30px 0px 30px 25px !important;}
+  ::v-deep .el-dialog__footer {
+    padding: 20px 25px !important;}
 </style>

src/views/peopleManage/people/index.vue

@@ -740,7 +740,7 @@
     </el-row>
 
     <!-- 添加或修改人员管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
         <div class="jiben">基本信息</div>
         <div class="div-box-title1">
@@ -1097,6 +1097,7 @@
         <el-row
           style="background-color: rgba(255, 255, 255, 0.10980392156862745);padding-top:20px;margin-top:10px;margin-bottom:20px;"
           v-for="(item, index) in jtlist"
+          :key="index"
         >
           <el-form-item label="姓名">
             <el-input v-model="item.name" placeholder />
@@ -1793,7 +1794,7 @@ export default {
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
-  background: #004d86;
+  background: transparent !important;
   color: #fff;
   border: 1px solid #fff !important;
 }
@@ -1826,7 +1827,7 @@ export default {
   display: none;
 }
 ::v-deep .el-textarea__inner {
-  width: 980px;
+  width: 990px;
   height: 104px;
 }
 .jiben span {

src/views/peopleManage/transfer/index.vue

@@ -179,8 +179,8 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="btn" @click="handleQuery">搜索</el-button>
+        <el-button  size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -303,7 +303,7 @@
     />
 
     <!-- 添加或修改调动管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
         <div class="jiben">基本信息</div>
         <el-form-item label="调动人员" prop="peopleId">
@@ -764,7 +764,7 @@ export default {
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
-  background: #004d86;
+  background: transparent !important;
   color: #fff;
   border: 1px solid #fff !important;
 }
@@ -815,4 +815,6 @@ export default {
   height: 210px;
   width: 170px;
 }
+::v-deep .el-dialog__footer {
+    padding: 20px 30px !important;}
 </style>

src/views/system/role/index.vue

@@ -219,6 +219,7 @@
       width="700px"
       style=""
       append-to-body
+      :closeOnClickModal="false"
       :expand-on-click-node="false"
     >
       <div class="jiben">基本信息</div>