同步

src/assets/styles/global.css

@@ -30,6 +30,14 @@
   font-style: normal;
 }
 
+/* 宋体字体 */
+@font-face {
+  font-family: 'songti';
+  src: url('../css/宋体.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
 /* 新增表单字体颜色 */
 .el-dialog__body .el-form-item__label {
   color: black;
@@ -692,6 +700,7 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 /* 输入框显示手指 */
 ::v-deep .el-input__inner {
   cursor: pointer !important;
+  border: none;
 }
 
 /* 页面左栏图标大小 */
@@ -790,4 +799,7 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 .el-date-picker__editor-wrap .el-input__inner{
   color: black;
 } */
+::v-deep .el-form-item__content{
+  border-bottom: none;
+}
 

src/components/look_word/bdgldiary.vue

@@ -9,7 +9,7 @@
           text-align: center;
           margin-botttom: 30px;
           color: black;
-          font-family: 'kaiti';
+          font-family: 'songti';
         "
       >
         《连队要事日记》
@@ -22,9 +22,10 @@
         >
         <span style="margin-left: 380px">值班员:{{ message.peopleName }}</span>
       </div> -->
-       
-       <table border="none"
-       style="
+
+      <table
+        border="none"
+        style="
           border-collapse: collapse;
           mso-border-left-alt: 0.5pt solid windowtext;
           mso-border-top-alt: 0.5pt solid windowtext;
@@ -37,24 +38,25 @@
           margin-left: -20px;
           color: black;
           font-size: 16px;
-          font-weight: 600;
-          border:none;
-        ">
-         <tr
+          font-weight: 500;
+          border: none;
+        "
+      >
+        <tr
           height="30"
           align="center"
-          style="border: none; font-family: 'kaiti'"
+          style="border: none; font-family: 'songti'"
         >
-          <td colspan="3" height="40" style="border:none">
-            {{ message.blogDate | dataFormat}}
+          <td colspan="3" height="40" style="border: none">
+            {{ message.blogDate | dataFormat }}
           </td>
-          <td colspan="2" style="border:none" >{{ week }}</td>
-          <td colspan="6"  style="border:none">天气：{{ message.weather }}</td>
-          <td colspan="3" style="border:none" >
+          <td colspan="2" style="border: none">{{ week }}</td>
+          <td colspan="6" style="border: none">天气：{{ message.weather }}</td>
+          <td colspan="3" style="border: none">
             值班员:{{ message.peopleName }}
           </td>
         </tr>
-       </table>
+      </table>
       <table
         border="1"
         style="
@@ -72,16 +74,15 @@
           border-color: black;
           color: black;
           font-size: 16px;
-          font-weight: 600;
+          font-weight: 500;
         "
       >
-        
         <!-- 实力 -->
         <tr
           class="JR_tr"
           height="30"
           align="center"
-          style="font-family: 'kaiti'"
+          style="font-family: 'songti'"
         >
           <td colspan="2" rowspan="2" class="JR_left">实力</td>
           <td colspan="6" style="letter-spacing: 20px" class="JR_left">
@@ -92,31 +93,31 @@
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td width="68" class="JR_left" style="font-family: 'kaiti'">干部</td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">干部</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
             {{ message.orgcadre }}
           </td>
-          <td width="68" class="JR_left" style="font-family: 'kaiti'">战士</td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">战士</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
             {{ message.orgsoldier }}
           </td>
-          <td width="68" class="JR_left" style="font-family: 'kaiti'">合计</td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
-          <td width="68" class="JR_left" style="font-family: 'kaiti'">干部</td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">干部</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
             {{ message.nowcadre }}
           </td>
-          <td width="68" class="JR_left" style="font-family: 'kaiti'">战士</td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">战士</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'">
             {{ message.nowsoldier }}
           </td>
-          <td width="68" class="JR_left" style="font-family: 'kaiti'">合计</td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
         <tr class="JR_tr" height="20" align="center">
           <td rowspan="6" class="JR_left">
-            <p align="center" style="margin: 0 15px; font-family: 'kaiti'">
+            <p align="center" style="margin: 0 15px; font-family: 'songti'">
               训 <br />
               练 <br />
               、 <br />
@@ -138,7 +139,7 @@
             rowspan="2"
             width="68"
             class="JR_left"
-            style="font-family: 'kaiti'"
+            style="font-family: 'songti'"
           >
             区分
           </td>
@@ -147,16 +148,17 @@
             rowspan="2"
             style="letter-spacing: 60px; font-family: 'fangsong'"
             class="JR_left"
+            align="center"
           >
             内容
           </td>
-          <td colspan="3" class="JR_left" style="font-family: 'kaiti'">人数</td>
+          <td colspan="3" class="JR_left" style="font-family: 'songti'">人数</td>
         </tr>
         <tr
           class="JR_tr"
           height="30"
           align="center"
-          style="font-family: 'kaiti'"
+          style="font-family: 'songti'"
         >
           <td class="JR_left">应到</td>
           <td class="JR_left">实到</td>
@@ -171,19 +173,19 @@
           :key="index"
           v-show="message.weekworkRegisters.length > 0"
         >
-          <td class="JR_left">{{ items.dateline }}</td>
+          <td class="JR_right" height="70">{{ items.dateline }}</td>
           <td colspan="9" v-html="items.contents"></td>
-          <td class="JR_right">{{ items.shouldArrive }}</td>
-          <td class="JR_right">{{ items.realTo }}</td>
-          <td class="JR_right">{{ items.percentage }}</td>
+          <td class="JR_right" height="70">{{ items.shouldArrive }}</td>
+          <td class="JR_right" height="70">{{ items.realTo }}</td>
+          <td class="JR_right" height="70">{{ items.percentage }}</td>
         </tr>
         <tr
           class="JR_tr"
           height="70"
           align="center"
-          v-show="message.weekworkRegisters == null"
+          v-if="message.weekworkRegisters == null"
         >
-          <td class="JR_left">早晨</td>
+          <td class="JR_left" height="70">早晨</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -193,9 +195,9 @@
           class="JR_tr"
           height="70"
           align="center"
-          v-show="message.weekworkRegisters == null"
+          v-if="message.weekworkRegisters == null"
         >
-          <td class="JR_left">上午</td>
+          <td class="JR_left" height="70">上午</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -205,9 +207,9 @@
           class="JR_tr"
           height="70"
           align="center"
-          v-show="message.weekworkRegisters == null"
+          v-if="message.weekworkRegisters == null"
         >
-          <td class="JR_left">下午</td>
+          <td class="JR_left" height="70">下午</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -217,9 +219,9 @@
           class="JR_tr"
           height="70"
           align="center"
-          v-show="message.weekworkRegisters == null"
+          v-if="message.weekworkRegisters == null"
         >
-          <td class="JR_left">晚上</td>
+          <td class="JR_left" height="70">晚上</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
@@ -228,7 +230,7 @@
         <!-- 公差勤务 -->
         <tr class="JR_tr">
           <td colspan="2">
-            <p align="center" class="JR_left" style="font-family: 'kaiti'">
+            <p align="center" class="JR_left" style="font-family: 'songti'">
               公差勤务
             </p>
           </td>
@@ -242,7 +244,7 @@
         <tr class="JR_tr">
           <!-- 人员装备变动 -->
           <td colspan="2" class="JR_left">
-            <p align="center" style="font-family: 'kaiti'">
+            <p align="center" style="font-family: 'songti'">
               人员或 <br />
               装备变动
             </p>
@@ -259,7 +261,7 @@
         <!-- 武器装备检查情况 -->
         <tr class="JR_tr">
           <td height="150" rowspan=":count($xlian)" colspan="2" class="JR_left">
-            <p align="center" style="font-family: 'kaiti'">
+            <p align="center" style="font-family: 'songti'">
               武 内 <br />
               器 务 <br />
               装 卫 <br />
@@ -281,7 +283,7 @@
           </td>
         </tr>
         <!-- 查铺查哨 -->
-        <tr class="JR_tr" style="font-family: 'kaiti'">
+        <tr class="JR_tr" style="font-family: 'songti'" >
           <td :rowspan="chapu" class="JR_left">
             <p align="center">
               查 <br />
@@ -290,7 +292,7 @@
               哨
             </p>
           </td>
-          <td class="JR_left"><p align="center">检查人</p></td>
+          <td class="JR_left" ><p align="center">检查人</p></td>
           <td class="JR_left"><p align="center">时　间</p></td>
           <td class="JR_left"><p align="center">领班员</p></td>
           <td class="JR_left" colspan="2"><p align="center">卫兵姓名</p></td>
@@ -302,7 +304,6 @@
           v-for="(item, i) in message.inspect"
           :key="i"
           class="JR_tr"
-          height="30"
           style="font-family: 'fangsong'"
         >
           <td class="JR_right">
@@ -336,7 +337,7 @@
           <td class="JR_right" colspan="8"><p align="center"></p></td>
         </tr> -->
         <!-- 派班情况 -->
-        <tr class="JR_tr" style="font-family: 'kaiti'">
+        <tr class="JR_tr" style="font-family: 'songti'">
           <td class="JR_left" rowspan="4">
             <p align="center">
               派 <br />
@@ -354,7 +355,7 @@
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" style="font-family: 'kaiti'">值班员</td>
+          <td class="JR_left" style="font-family: 'songti'">值班员</td>
           <td class="JR_right">
             <p align="center" style="font-family: 'fangsong'">
               {{ message.dutya }}
@@ -373,7 +374,7 @@
           <td class="JR_right" colspan="8"><p align="center"></p></td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" style="font-family: 'kaiti'">值日员</td>
+          <td class="JR_left" style="font-family: 'songti'">值日员</td>
           <td class="JR_right">
             <p align="center" style="font-family: 'fangsong'">
               {{ message.dutyc }}
@@ -395,7 +396,7 @@
           <td class="JR_right" colspan="8"></td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" style="font-family: 'kaiti'">厨房值班</td>
+          <td class="JR_left" style="font-family: 'songti'">厨房值班</td>
           <td class="JR_right">
             <p align="center" style="font-family: 'fangsong'">
               {{ message.dutye }}
@@ -410,7 +411,7 @@
         </tr>
 
         <!-- 临时来队亲属 -->
-        <tr class="JR_tr" height="30" style="font-family: 'kaiti'">
+        <tr class="JR_tr" height="30" style="font-family: 'songti'">
           <td :rowspan="qinshu" class="JR_left">
             <p align="center" style="margin: 0 15px">
               临 <br />
@@ -433,20 +434,20 @@
           <td class="JR_left" height="30" colspan="2">
             <p align="center">时　间</p>
           </td>
-          <td class="JR_left" height="30" colspan="10">
-            <p align="center" style="letter-spacing: 12px">
+          <td class="JR_left" height="30" colspan="8">
+            <p align="center" style="letter-spacing: 10px">
               病 号 及 处 理 情 况
             </p>
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" height="30" style="font-family: 'kaiti'">来队</td>
-          <td class="JR_left" height="30" style="font-family: 'kaiti'">离队</td>
+          <td class="JR_left" height="30" style="font-family: 'songti'">来队</td>
+          <td class="JR_left" height="30" style="font-family: 'songti'">离队</td>
           <td
             style="font-family: 'fangsong'"
             class="JR_right"
             height="30"
-            colspan="10"
+            colspan="8"
             :rowspan="qinshu2"
             v-html="message.invalid"
           >
@@ -458,7 +459,7 @@
           class="JR_tr"
           v-for="(item1, i) in message.kinsfolk"
           :key="i"
-          v-show="message.kinsfolk.length>0"
+          v-show="message.kinsfolk.length > 0"
         >
           <td class="JR_right" height="30">
             <p align="center">{{ item1.peopleName }}</p>
@@ -471,17 +472,17 @@
             <p align="center">{{ item1.relation }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.comeDate | dataFormat}}</p>
+            <p align="center">{{ item1.comeDate | dataFormat }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.leaveDate | dataFormat}}</p>
+            <p align="center">{{ item1.leaveDate | dataFormat }}</p>
           </td>
         </tr>
 
-         <tr
+        <tr
           style="font-family: 'fangsong'"
           class="JR_tr"
-          v-if="message.kinsfolk==null || message.kinsfolk.length==0"
+          v-if="message.kinsfolk == null || message.kinsfolk.length == 0"
         >
           <td class="JR_right" height="30">
             <p align="center"></p>
@@ -514,7 +515,7 @@
           class="JR_tr"
           align="center"
           height="30"
-          style="font-family: 'kaiti'"
+          style="font-family: 'songti'"
         >
           <td rowspan="6" class="JR_left">
             <p align="center" style="margin: 0 15px">
@@ -605,7 +606,7 @@
         </tr>
         <!-- 上级通知 -->
         <tr class="JR_tr">
-          <td class="JR_left" width="101" style="font-family: 'kaiti'">
+          <td class="JR_left" width="101" style="font-family: 'songti'">
             <p align="center" style="margin: 0 15px">
               上 <br />
               级 <br />
@@ -632,7 +633,40 @@
         </tr>
       </table>
 
-      <span
+      <table
+        border="none"
+        style="
+          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;
+          width: 960px;
+          margin-left: -20px;
+          color: black;
+          font-size: 16px;
+          font-weight: 600;
+          border: none;
+        "
+      >
+        <tr
+          height="30"
+          style="border: none; font-family: 'songti'"
+        ><td colspan="3" style="border: none"></td>
+          <td colspan="6" style="border: none"></td>
+          <td colspan="2" height="40" style="border: none">
+            连队首长签字:
+          </td>
+          
+          <td colspan="3" style="border: none">
+            &nbsp;&nbsp;时&nbsp;&nbsp;&nbsp;&nbsp;分
+          </td>
+        </tr>
+      </table>
+      <!-- <span
         style="
           margin-left: 48px;
           color: black;
@@ -652,7 +686,7 @@
           font-weight: 600;
         "
         >&nbsp;&nbsp;时&nbsp;&nbsp;&nbsp;&nbsp;分</span
-      >
+      > -->
     </div>
   </div>
 </template>
@@ -670,15 +704,14 @@ export default {
       chapu: 4,
       qinshu: 4,
       week: "",
-      qinshu2:""
+      qinshu2: 2,
     };
   },
   created() {
     this.chapu = this.chapus();
     this.qinshu = this.qinshus();
     this.week = this.getWeek(this.message.blogDate);
-    this.qinshu2 = this.qinshus2()
-
+    this.qinshu2 = this.qinshus2();
   },
   methods: {
     daochu() {
@@ -707,7 +740,7 @@ export default {
       );
       return "星期" + "日一二三四五六".charAt(date.getDay());
     },
-    
+
     /*
       标准时间转换格式
      */
@@ -721,8 +754,8 @@ export default {
       var h = date.getHours();
       var minute = date.getMinutes();
       minute = minute < 10 ? "0" + minute : minute;
-      let time = y + "-" + m + "-" + d ; //这里如果不需要小时 分  后边的可以不需要拼接
-      return time
+      let time = y + "-" + m + "-" + d; //这里如果不需要小时 分  后边的可以不需要拼接
+      return time;
     },
   },
 };

src/components/look_word/personnelRoster.vue

@@ -68,15 +68,15 @@
             style="font-family: 'fangsong'"
           >
             <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
+            <td class="JR_right">{{ renshu.bzwgb }}</td>
+            <td class="JR_right">{{ renshu.bzwsb }}</td>
+            <td class="JR_right">{{ renshu.bzwyw }}</td>
+            <td class="JR_right">{{ renshu.zbgb }}</td>
+            <td class="JR_right">{{ renshu.zbsb }}</td>
+            <td class="JR_right">{{ renshu.zbyw }}</td>
+            <td class="JR_right">{{ renshu.zwgb }}</td>
+            <td class="JR_right">{{ renshu.zwsb }}</td>
+            <td class="JR_right">{{ renshu.zwyw }}</td>
           </tr>
 
           <tr class="JR_tr" height="40" align="center">
@@ -101,7 +101,8 @@
           font-size: 16px;
           color: black;
           font-family: 'kaiti';
-          font-size: 16px;font-weight: 600;
+          font-size: 16px;
+          font-weight: 600;
         "
       >
         日期
@@ -124,7 +125,12 @@
         bordercolor="black"
       >
         <tbody style="font-size: 16px; font-weight: 600">
-          <tr class="JR_tr" height="40" align="center" style="font-family: 'kaiti'">
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'kaiti'"
+          >
             <td class="JR_left">姓名</td>
             <td class="JR_left">职务</td>
             <td class="JR_left">军衔</td>
@@ -141,17 +147,46 @@
             <td class="JR_left">家庭住址及联系方式</td>
             <td class="JR_left">备注</td>
           </tr>
-          <tr class="JR_tr" height="40" align="center" style="font-family: 'fangsong'">
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'fangsong'"
+          >
             <td class="JR_right">{{ message.name }}</td>
-            <td class="JR_right">{{ message.postId }}</td>
-            <td class="JR_right">{{ message.rankId }}</td>
-            <td class="JR_right">{{ message.nationId }}</td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.post_Level"
+                :value="message.postId"
+              />
+            </td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.post_Level"
+                :value="message.rankId"
+              />
+            </td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.sys_familyName"
+                :value="message.nationId"
+              />
+            </td>
             <td class="JR_right">{{ message.origin }}</td>
             <td class="JR_right">{{ message.birthDate }}</td>
             <td class="JR_right">{{ message.enlistDate }}</td>
             <td class="JR_right">{{ message.partyDate }}</td>
-            <td class="JR_right">{{ message.educationId }}</td>
-            <td class="JR_right">{{ message.marryList }}</td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.Degree_level"
+                :value="message.educationId"
+              />
+            </td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.marryList"
+                :value="message.marryList"
+              /></td>
             <td class="JR_right">{{ message.live }}{{ message.phone }}</td>
             <td class="JR_right"></td>
           </tr>
@@ -180,14 +215,54 @@ import { lookWord } from "@/utils/look_word.js";
 import "@/utils/lodJs.js";
 export default {
   name: "bdgleven",
-  props: ["message"],
+  props: ["message", "renshu"],
+  dicts: [
+    "post_Level",
+    "sys_user_rank",
+    "sys_familyName",
+    "Degree_level",
+    "marryList",
+  ],
   data() {
     return {
       title: "人员名册",
       style:
         ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+      //学历
+      educationId: [],
+      //军衔
+      rankIds: [],
+      //民族
+      nationIds: [],
+      //职务层级
+      postIds: [],
+      //婚姻情况
+      marryList: [],
+      xueLi: "",
     };
   },
+  created() {
+    //学历
+    this.getDicts("Degree_level").then((response) => {
+      this.educationId = response.data;
+    });
+    //婚姻情况
+    this.getDicts("marryList").then((response) => {
+      this.marryList = response.data;
+    });
+    //职务层级
+    this.getDicts("post_Level").then((response) => {
+      this.postIds = response.data;
+    });
+    //军衔
+    this.getDicts("sys_user_rank").then((response) => {
+      this.rankIds = response.data;
+    });
+    //民族
+    this.getDicts("sys_familyName").then((response) => {
+      this.nationIds = response.data;
+    });
+  },
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);

src/views/combatduty/militarydutyinfo/index.vue

@@ -603,18 +603,7 @@ export default {
   height: 36px;
   line-height: 36px;
 }
-/* 计数器按钮 */
-::v-deep .el-input-number__increase {
-  background-color: transparent !important;
-  border: none;
-  color: #cccccc;
-  border-bottom: none !important;
-}
-::v-deep .el-input-number__decrease {
-  background-color: transparent !important;
-  border: none !important;
-  color: #cccccc;
-}
+
 .el-radio-group {
   width: 216px;
 }

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -332,6 +332,7 @@
                     placeholder="请输入内容"
                     v-model="item.contents"
                     :autosize="true"
+                    resize="none"
                   >
                     {{ item.contents }}
                   </el-input>
@@ -1782,4 +1783,8 @@ export default {
   background-color: #ff4949;
   margin-left: 26px;
 }
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -667,4 +667,8 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/bdglequip/index.vue

@@ -851,4 +851,8 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -731,4 +731,8 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -1088,7 +1088,6 @@ export default {
 ::v-deep .el-dialog__body {
   padding: none !important;
 }
-
 /* 调整输入框提示文字颜色 */
 ::v-deep .vue-treeselect__placeholder {
   color: #bdbdbd4f !important;
@@ -1099,4 +1098,8 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -635,6 +635,7 @@
           v-if="menuRoleVisible"
           ref="menuRole"
           :message="wordInfo"
+          :renshu='renshu'
         ></personnelRoster>
       </el-dialog>
     </div>
@@ -680,6 +681,7 @@ export default {
       //查看页面
       menuRoleVisible: false,
       wordInfo: {},
+      renshu:{},
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -971,7 +973,8 @@ export default {
     xiangQi(id) {
       // console.log(id);
       getXiangQi(id).then((res) => {
-        console.log(res);
+        // console.log(res.data[0]);
+       this.renshu=res.data[0]
       });
     },
     /** 查询人员管理列表 */
@@ -1087,6 +1090,7 @@ 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;
@@ -1454,4 +1458,13 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
 </style>

src/views/grassrootsregistration/statistics/index.vue

@@ -451,4 +451,18 @@ export default {
     height: 36px;
     line-height: 36px;
 }
+/* 调整输入框提示文字颜色 */
+::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 ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>