修改

src/api/bdglregular/regularcountinfo.js

@@ -40,11 +40,3 @@ export function getRegularinfo(id) {
   })
 }
 
-// 查询部门 
-export function getDeptss(query) {
-  return request({
-    url: '/grassrootsregistration/common/getDept',
-    method: 'get',
-    params: query
-  })
-}

src/api/combatduty/Quantitative.js

@@ -39,10 +39,11 @@ export function equipment() {
 }
 
 // 获取执行任务人员情况接口
-export function zhixingrenwu() {
+export function zhixingrenwu(data) {
   return request({
     url: "/combatduty/taskdutyinfo/list",
-    method: "get"
+    method: "get",
+    params:data
   })
 }
 

src/components/look_word/bdglweekwork.vue

@@ -43,6 +43,7 @@
         width="907"
         align="center"
         bordercolor="black"
+        id="tabless"
       >
         <tr
           class="JR_tr"
@@ -50,7 +51,7 @@
             border: none;
             color: black;
             font-weight: 500;
-            line-height: 30px;
+            line-height: 20px;
             width: 930px;
             margin-left: 8px;
           "
@@ -59,179 +60,163 @@
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px; font-size: 16px"
+            style="border: none; padding-left: 10px; font-family: '楷体_GB2312'"
           >
-            <span style="margin-left: 8px"
-              >连值班领导：{{ message.peopleName }}</span
-            >
-          </td>
-          <td class="JR_left" colspan="2" align="left" style="border: none">
-            <span style="margin-left: 188px; font-size: 16px">
-              电话：{{ message.phone }}</span
-            >
+            连值班领导：{{ message.peopleName }}
           </td>
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; text-align: right"
+            style="
+              border: none;
+              padding-left: 190px;
+              font-family: '楷体_GB2312';
+            "
+          >
+            电话：{{ message.phone }}
+          </td>
+          <td
+            class="JR_left"
+            colspan="2"
+            align="left"
+            style="border: none; text-align: right; font-family: '楷体_GB2312'"
           >
-            <span style="margin-left: 20px; font-size: 16px">
-              {{ message.startTime | dataFormaty }}—{{
-                message.endTime | dataFormaty
-              }}</span
-            >
+            {{ message.startTime | dataFormaty }}—{{
+              message.endTime | dataFormaty
+            }}
           </td>
         </tr>
-        <tbody style="font-size: 16px; font-weight: 500">
-          <tr
-            class="JR_tr"
-            style="
-              font-size: 16px;
-              font-weight: 500;
-              font-family: 'heiti';
-              border-bottom: none;
-            "
+        <tr
+          class="JR_tr"
+          style="
+            font-size: 16px;
+            font-weight: 500;
+            font-family: 'heiti';
+            border-bottom: none;
+          "
+        >
+          <td
+            width="157"
+            height="23"
+            valign="center"
+            colspan="3"
+            class="JR_left"
+            style="font-family: '黑体'; text-align: center; font-size: 16px"
           >
-            <td
-              width="142"
-              height="22"
-              valign="center"
-              colspan="3"
-              class="JR_left"
-              style="font-family: '黑体'; text-align: center; font-size: 16px"
-            >
-              <span align="center" style="display: block; text-align: center"
-                >日期</span
-              >
-            </td>
-            <td
-              width="241"
-              valign="center"
-             
-              class="JR_left"
-              style="font-family: '黑体'; text-align: center; font-size: 16px"
-            >
-              <span align="center" style="display: block; text-align: center"
-                >内容</span
-              >
-            </td>
+            日期
+          </td>
+          <td
+            width="245"
+            valign="center"
+            class="JR_left"
+            style="font-family: '黑体'; text-align: center; font-size: 16px"
+          >
+            内容
+          </td>
 
-            <td
-              width="85"
-              valign="center"
-             
-              class="JR_left"
-              style="font-family: '黑体'; text-align: center; font-size: 16px"
-            >
-              <!-- <p align="center" style="font-family: 'heiti'">负责单位</p> -->
-              <span align="center" style="display: block; text-align: center"
-                >负责单位</span
-              >
-            </td>
-            <td
-              width="153"
-              valign="center"
-           
-              class="JR_left"
-              style="font-family: '黑体'; text-align: center; font-size: 16px"
-            >
-              <!-- <p align="center" style="font-family: 'heiti'">负责单位</p> -->
-              <span align="center" style="display: block; text-align: center"
-                >参加人员</span
-              >
-            </td>
-            <td
-              width="126"
-              valign="center"
-           
-              class="JR_left"
-              style="font-family: '黑体'; text-align: center; font-size: 16px"
-            >
-              <!-- <p align="center" style="font-family: 'heiti'">负责单位</p> -->
-              <span align="center" style="display: block; text-align: center"
-                >地点</span
-              >
-            </td>
-            <td
-              width="151"
-              valign="center"
-             
-              class="JR_left"
-              style="font-family: '黑体'; text-align: center; font-size: 16px"
-            >
-              <!-- <p align="center" style="font-family: 'heiti'">负责单位</p> -->
-              <span align="center" style="display: block; text-align: center"
-                >时间</span
-              >
-            </td>
-          </tr>
-        </tbody>
-        <tbody id="tbody" style="font-size: 16px; font-weight: 500">
-          <tr
-            class="JR_tr"
-            v-for="(item, i) in message.bdglWeekworkRegisterList"
-            :key="i"
-            style="text-align: center; height: 45px; font-family: 'fangsong'"
+          <td
+            width="83"
+            valign="center"
+            class="JR_left"
+            style="font-family: '黑体'; text-align: center; font-size: 16px"
+          >
+            负责单位
+          </td>
+          <td
+            width="150"
+            valign="center"
+            class="JR_left"
+            style="font-family: '黑体'; text-align: center; font-size: 16px"
+          >
+            参加人员
+          </td>
+          <td
+            width="123"
+            valign="center"
+            class="JR_left"
+            style="font-family: '黑体'; text-align: center; font-size: 16px"
+          >
+            地点
+          </td>
+          <td
+            width="180"
+            valign="center"
+            class="JR_left"
+            style="font-family: '黑体'; text-align: center; font-size: 16px"
+          >
+            时间
+          </td>
+        </tr>
+
+        <tr
+          class="JR_tr"
+          v-for="(item, i) in message.bdglWeekworkRegisterList"
+          :key="i"
+          style="text-align: center; height: 45px; font-family: 'fangsong'"
+        >
+          <td
+            style="text-align: center; width: 57px"
+            rowspan="1"
+            class="JR_right"
+          >
+            {{ item.week }}
+          </td>
+          <td
+            style="text-align: center; width: 50px"
+            rowspan="1"
+            class="JR_right"
+          >
+            {{ item.time }}
+          </td>
+          <td
+            style="text-align: center; width: 47px"
+            rowspan="1"
+            class="JR_right"
+          >
+            {{ item.dateline }}
+          </td>
+          <td
+            style="text-align: center; width: 245px"
+            rowspan="1"
+            class="JR_right"
           >
-            <td
-              style="text-align: center; width: 80px"
-              rowspan="1"
-              class="JR_right"
-            >
-              {{ item.week }}
-            </td>
-            <td
-              style="text-align: center; width: 100px"
-              rowspan="1"
-              class="JR_right"
-            >
-              {{ item.time }}
-            </td>
-            <td
-              style="text-align: center; width: 70px"
-              rowspan="1"
-              class="JR_right"
-            >
-              {{ item.dateline }}
-            </td>
-            <td style="text-align: center" rowspan="1" class="JR_right">
-              {{ item.contents }}
-            </td>
-            <td
-              style="text-align: center; width: 110px"
-              rowspan="1"
-              class="JR_right"
-            >
-              {{ item.unitId1 }}
-            </td>
-            <td
-              style="text-align: center; width: 60px"
-              rowspan="1"
-              class="JR_right"
-            >
-              {{ item.peopleIds }}
-            </td>
-            <td
-              style="text-align: center; width: 60px"
-              rowspan="1"
-              class="JR_right"
-            >
-              {{ item.address }}
-            </td>
-            <td
-              style="text-align: center; width: 110px"
-              rowspan="1"
-              class="JR_right"
-            >
-              {{ item.startTime }}—{{ item.endTime }}
-            </td>
-          </tr>
-        </tbody>
-        <tr style="border-bottom: 1px solid #333">
+            {{ item.contents }}
+          </td>
+          <td
+            style="text-align: center; width: 83px"
+            rowspan="1"
+            class="JR_right"
+          >
+            {{ item.unitId1 }}
+          </td>
+          <td
+            style="text-align: center; width: 150px"
+            rowspan="1"
+            class="JR_right"
+          >
+            {{ item.peopleIds }}
+          </td>
+          <td
+            style="text-align: center; width: 123px"
+            rowspan="1"
+            class="JR_right"
+          >
+            {{ item.address }}
+          </td>
+          <td
+            style="text-align: center; width: 158px"
+            rowspan="1"
+            class="JR_right"
+          >
+            {{ item.startTime }}—{{ item.endTime }}
+          </td>
+        </tr>
+        <!-- <tr style="border-bottom: 1px solid #333">
           <td
             width="37"
             height="89px"
+            colspan="1"
             valign="center"
             style="
               font-family: '仿宋_GB2312';
@@ -239,23 +224,68 @@
               font-size: 16px;
             "
           >
-            <span align="center"> 备注 </span>
+            备注
           </td>
           <td
             width="897"
             valign="center"
             colspan="7"
-            v-html="message.info"
+            
             style="
               font-family: '仿宋_GB2312';
               text-align: center;
               font-size: 16px;
             "
           >
-            <span>{{ message.remark }}</span>
+            {{ message.remark }}
           </td>
+        </tr> -->
+        <tr
+          class="JR_tr"
+          style="
+            color: black;
+            font-weight: 500;
+            line-height: 30px;
+            width: 930px;
+            margin-left: 8px;
+            border: 1px solid black;
+            font-size: 14px;
+          "
+        >
+          <td
+            class="JR_left"
+            colspan="1"
+            align="center"
+            style="
+              border-right: 1px solid black;
+              line-height: 45px;
+              font-size: 16px;
+              font-family: 'fangsong';
+              font-size: 14px;
+            "
+          >
+            备注
+          </td>
+          <td
+            class="JR_left"
+            colspan="7"
+            align="left"
+            style="
+              border: none;
+              font-family: 'fangsong';
+              font-size: 14px;
+              padding: 10px;
+            "
+          >
+            {{ message.remark }}
+          </td>
+          <td
+            class="JR_left"
+            colspan="0"
+            align="left"
+            style="border: none; text-align: center; display: none"
+          ></td>
         </tr>
-        <!-- </tbody> -->
         <tr
           class="JR_tr"
           style="border: none; color: black; font-size: 12pt; line-height: 30px"
@@ -265,27 +295,42 @@
             colspan="4"
             width="401"
             align="left"
-            style="font-family: '仿宋_GB2312'; font-size: 14px; border: none"
+            style="
+              font-family: '仿宋_GB2312';
+              font-size: 14px;
+              border: none;
+              padding-left: 22px;
+            "
           >
-            <span style="margin-left: 25px">军事主官：</span>
+            军事主官：{{ message.people1Name }}
           </td>
           <td
             class="JR_right"
             colspan="3"
             width="382"
             align="left"
-            style="font-family: '仿宋_GB2312'; font-size: 14px; border: none"
+            style="
+              font-family: '仿宋_GB2312';
+              font-size: 14px;
+              border: none;
+              padding-left: 10px;
+            "
           >
-            <span style="margin-left: 12px">政治主官：</span>
+            政治主官：{{ message.people2Name }}
           </td>
           <td
             class="JR_right"
             colspan="1"
-            width="124"
+            width="180"
             align="left"
-            style="font-family: '仿宋_GB2312'; font-size: 14px; border: none"
+            style="
+              font-family: '仿宋_GB2312';
+              font-size: 14px;
+              border: none;
+              padding-left: 10px;
+            "
           >
-            <span style="margin-left: 34px">时间：</span>
+            时间：{{ message.startTime | dataFormaty }}
           </td>
         </tr>
       </table>
@@ -339,111 +384,50 @@ export default {
     this.message.bdglWeekworkRegisterList.forEach((item) => {
       item.time = this.zhuantime(item.time);
     });
-    console.log(this.message.bdglWeekworkRegisterList);
-    //循环遍历
-    for (var i = 0; i < this.message.bdglWeekworkRegisterList.length; i++) {
-      //循环开始行
-      var start_row;
-      //需合并的行数
-      var rowspan = 1;
-      //循环到最后一行时
-      if (i == this.message.bdglWeekworkRegisterList.length - 1) {
-        //如果最后一行和倒数第二行属性不同，则rowspan=1；否则直接结束循环
-        if (
-          this.message.bdglWeekworkRegisterList[i].week !=
-          this.message.bdglWeekworkRegisterList[i - 1].week
-        ) {
-          this.message.bdglWeekworkRegisterList[i].rowspan = rowspan;
-        }
-        break;
-      }
-      //内层循环记录rowspan的数量
-      for (
-        var j = i;
-        j < this.message.bdglWeekworkRegisterList.length - 1;
-        j++
-      ) {
-        //记录循环结束的行数
-        start_row = j;
-        //属性相同则rowspan+1；否则直接结束内循环
-        if (
-          this.message.bdglWeekworkRegisterList[j].week ==
-          this.message.bdglWeekworkRegisterList[j + 1].week
-        ) {
-          rowspan++;
-        } else {
-          break;
-        }
-      }
-      //为数组添加rowspan属性
-      this.message.bdglWeekworkRegisterList[i].rowspan = rowspan;
-      //控制外循环从内循环结束的行数开始
-      i = start_row;
-    }
-    //页面渲染
-    var tbody = document.getElementById("tbody");
-    var html = "";
-    for (var i = 0; i < this.message.bdglWeekworkRegisterList.length; i++) {
-      html += "<tr>";
-      //动态添加rowspan属性
-      if (this.message.bdglWeekworkRegisterList[i].rowspan != null) {
-        html += `<td width="57" style="font-family: '宋体';" rowspan = ${this.message.bdglWeekworkRegisterList[i].rowspan}>${this.message.bdglWeekworkRegisterList[i].week}</td><td width="38"  rowspan = ${this.message.bdglWeekworkRegisterList[i].rowspan}>${this.message.bdglWeekworkRegisterList[i].time}</td><td width="48" rowspan = ${this.message.bdglWeekworkRegisterList[i].rowspan}>${this.message.bdglWeekworkRegisterList[i].dateline}</td>`;
-      }
-      html += `
-           <td width="245"
-              valign="center"
-              style="
-                font-family: '仿宋_GB2312';
-                text-align: center;
-                font-size: 16px;>
-             
-              <span align="center" class="JR_right"> ${this.message.bdglWeekworkRegisterList[i].contents}</span>
-            </td>
-            <td
-              width="84"
-              valign="center"
-              style="
-                font-family: '仿宋_GB2312';
-                text-align: center;
-                font-size: 16px;
-            >
-              <span align="center" class="JR_right">  ${this.message.bdglWeekworkRegisterList[i].unitId1}</span>
-            </td>
-            <td
-               width="151"
-              valign="center"
-              style="
-                font-family: '仿宋_GB2312';
-                text-align: center;
-                font-size: 16px;
-            >
-                <span align="center" class="JR_right">  ${this.message.bdglWeekworkRegisterList[i].peopleIds}</span>
-            </td>
-            <td
-                width="125"
-              valign="center"
-              style="
-                font-family: '仿宋_GB2312';
-                text-align: center;
-                font-size: 16px;
-            >
-             <span align="center" class="JR_right"> ${this.message.bdglWeekworkRegisterList[i].address}</span>
-            </td>
-            <td
-             width="157"
-              valign="center"
-              style="
-                font-family: '仿宋_GB2312';
-                text-align: center;
-                font-size: 16px;
-            >
-              <span align="center" class="JR_right">${this.message.bdglWeekworkRegisterList[i].startTime}-${this.message.bdglWeekworkRegisterList[i].endTime}</span>
-            </td>
-          </tr>`;
-    }
-    tbody.innerHTML = html;
+    this.mergeCell("tabless", [0, 1, 2]);
   },
   methods: {
+    mergeCell(tableId, cols) {
+      var table = document.getElementById(tableId);
+      var table_rows = table.rows;
+      // 需要合并的列的数组
+      cols.forEach((v, k) => {
+        // 循环table每一行
+        for (let i = 0; i < table_rows.length - 1; i++) {
+          // row
+          let now_row = table_rows[i];
+          let next_row = table_rows[i + 1];
+          // col
+          let now_col = now_row.cells[v];
+          let next_col = next_row.cells[v];
+
+          if (now_col.innerHTML == next_col.innerHTML) {
+            console.log(now_col.innerHTML);
+            if (
+              now_row.cells[1].innerHTML != next_row.cells[1].innerHTML &&
+              now_row.cells[2].innerHTML == next_row.cells[2].innerHTML
+            ) {
+              $(next_col).addClass("has");
+            } else {
+              // 标记为需要删除
+              $(next_col).addClass("remove");
+              // 递归判断当前对象时候已经被删除
+              this.setParentSpan(table, i, v);
+            }
+          }
+        }
+      });
+      $(".remove").remove();
+    },
+    // (递归方法，用于多行统计) pram => table表格 当前行 对应的列
+    setParentSpan(table, row, col) {
+      var col_item = table.rows[row].cells[col];
+      if ($(col_item).hasClass("remove")) {
+        this.setParentSpan(table, --row, col);
+      } else {
+        col_item.rowSpan += 1;
+      }
+    },
     zhuantime(originVal) {
       const dt = new Date(originVal);
       if (originVal) {

src/views/bdglregular/regularinfo/index.vue

@@ -1239,6 +1239,7 @@ export default {
     getBuMeng() {
       getDeptss().then((res) => {
         this.deptOptions = res.data;
+        console.log(this.deptOptions)
       });
     },
     danWiess() {

src/views/combatduty/Quantitative/index.vue

@@ -226,7 +226,7 @@
       <div class="wrap-footer-center">
         <div class="wrap-top-left-top-head"><b>执行任务人员情况</b></div>
         <table width="95%" style="table-layout: fixed">
-          <tr>
+          <tr height="30">
             <!-- <th style="width:100px;font-weight:500" height="40">单位</th> -->
             <th style="width: 100px; font-weight: 500">指挥员</th>
             <th style="width: 120px; font-weight: 500">事由</th>
@@ -235,13 +235,13 @@
             <th style="width: 110px; font-weight: 500">结束时间</th>
           </tr>
 
-          <tr v-for="item in performanceTask" :key="item.id">
+          <tr height="30" v-for="item in performanceTask" :key="item.id">
             <!-- <td style="color:#ccc"  height="28">{{item.unitName}}</td> -->
             <td style="color: #ccc">{{ item.commanderName }}</td>
             <td style="color: #ccc" class="shiyou" :title="item.question">
               {{ item.question }}
             </td>
-            <td style="color: #ccc">{{ item.adress }}</td>
+            <td style="color: #ccc" class="shiyou">{{ item.adress }}</td>
             <td style="color: #ccc">{{ item.startTime }}</td>
             <td style="color: #ccc">{{ item.endTime }}</td>
           </tr>
@@ -519,6 +519,7 @@ export default {
       fenShu: "",
       // 分队总人数
       fenZong: "",
+
     };
   },
   created() {
@@ -551,8 +552,21 @@ export default {
         this.Equipment = res.rows;
       }
     });
+    var date = new Date();
+    var seperator1 = "-";
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var strDate = date.getDate();
+    if (month >= 1 && month <= 9) {
+      month = "0" + month;
+    }
+    if (strDate >= 0 && strDate <= 9) {
+      strDate = "0" + strDate;
+    }
+    var currentdate = year + seperator1+ month + seperator1 + strDate;
+    console.log(currentdate)
     // 执行任务人员情况
-    zhixingrenwu().then((res) => {
+    zhixingrenwu({startTime:currentdate}).then((res) => {
       if (res.rows != undefined) {
         this.performanceTask = res.rows;
       }

src/views/thought/getready/index.vue

@@ -319,7 +319,7 @@
                 size="btk"
                 type="text"
                 @click="handlelook(scope.row)"
-                v-hasPermi="['thought:getready:edit']"
+                v-hasPermi="['thought:getready:query']"
                 >查看</el-button
               >
               <el-button

src/views/thought/parliament/index.vue

@@ -133,7 +133,7 @@
             size="btk"
             type="text"
             @click="handlelook(scope.row)"
-            v-hasPermi="['thought:parliament:edit']"
+            v-hasPermi="['thought:parliament:query']"
             >查看</el-button
           >
           <el-button
@@ -476,7 +476,7 @@
           ></quill-editor>
         </el-form-item>
         <div class="jiben">附件</div>
-        <el-form-item>
+        <el-form-item class="fujian">
           <span class="filename">{{ form1.fileName }}</span>
           <a
             :href="form1.filePath"
@@ -820,6 +820,9 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .fujian .el-form-item__content{
+  display: flex;
+}
 /* 备注 */
 .thistext {
   color: white;

src/views/thought/responses/index.vue

@@ -288,7 +288,7 @@
                 size="btc"
                 type="text"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['thought:responses:edit']"
+                v-hasPermi="['thought:responses:query']"
                 >查看</el-button
               >
               <!-- <el-button

src/views/thought/thoughtPlan/index.vue

@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['thought:responses:add']"
+          v-hasPermi="['thought:thoughtPlan:add']"
           >新增</el-button
         >
       </el-col>
@@ -32,7 +32,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['thought:responses:remove']"
+          v-hasPermi="['thought:thoughtPlan:remove']"
           >删除</el-button
         >
       </el-col>

src/views/thought/weekjob/index.vue

@@ -326,7 +326,7 @@
                 size="btk"
                 type="text"
                 @click="handlelook(scope.row)"
-                v-hasPermi="['thought:weekjob:edit']"
+                v-hasPermi="['thought:weekjob:query']"
                 >查看</el-button
               >
               <el-button