Selaa lähdekoodia

更改战备值班

sunyanqiang 3 vuotta sitten
vanhempi
commit
be09241b59

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

@@ -1025,5 +1025,5 @@ margin-right: 34px;
 .el-form-item__error {
   margin-left: 0px;} 
   .el-form-item__error {
-    left: 0;
+    left: 0 !important;
   }

+ 182 - 77
src/views/combatduty/basedutyinfo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-row >
-    <el-col :span="1.5" class="isSubmit">
+    <el-row>
+      <el-col :span="1.5" class="isSubmit">
         <el-radio-group v-model="queryParams.type" @change="caoZuoTypefun">
           <el-radio-button label="null">所有值班</el-radio-button>
           <el-radio-button label="1">今日值班</el-radio-button>
@@ -9,7 +9,7 @@
         </el-radio-group>
       </el-col>
     </el-row>
-        <hr/>
+    <hr />
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -28,8 +28,18 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="" prop="chiefDutyName">
-        <el-select v-model="queryParams.chiefDutyName" filterable clearable placeholder="请选择值班首长">
-          <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        <el-select
+          v-model="queryParams.chiefDutyName"
+          filterable
+          clearable
+          placeholder="请选择值班首长"
+        >
+          <el-option
+            v-for="item in rylist"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
@@ -236,7 +246,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['combatduty:basedutyinfo:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -258,7 +269,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['combatduty:basedutyinfo:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -271,7 +283,7 @@
           v-hasPermi="['combatduty:basedutyinfo:export']"
         >导出</el-button>
       </el-col>-->
-      
+
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
@@ -288,13 +300,21 @@
       <el-table-column label="值班首长" align="center" prop="chiefDutyName" />
       <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyId" :formatter="chiefDutyIdFormat" /> -->
       <!-- <el-table-column label="值班首长电话" align="center" prop="chiefDutyPhone" /> -->
-      <el-table-column label="作战值班员" align="center" prop="combatDutyName" />
+      <el-table-column
+        label="作战值班员"
+        align="center"
+        prop="combatDutyName"
+      />
       <!-- <el-table-column label="作战值班员" align="center" prop="combatDutyId" :formatter="combatDutyIdFormat" /> -->
       <!-- <el-table-column label="作战值班员手机号" align="center" prop="combatDutyPhone" /> -->
       <el-table-column label="总值班员" align="center" prop="dutyOffierName" />
       <!-- <el-table-column label="总值班员" align="center" prop="dutyOffierId" :formatter="dutyOffierIdFormat" /> -->
       <!-- <el-table-column label="总值班员电话" align="center" prop="dutyOffierPhone" /> -->
-      <el-table-column label="值班分队1" align="center" prop="detachmentoneName" />
+      <el-table-column
+        label="值班分队1"
+        align="center"
+        prop="detachmentoneName"
+      />
       <!-- <el-table-column
         label="值班分队1"
         align="center"
@@ -302,10 +322,18 @@
         :formatter="detachmentoneIdFormat"
       /> -->
       <!-- <el-table-column label="值班分队1人数" align="center" prop="detachmentoneNumber" /> -->
-      <el-table-column label="值班分队1指挥员" align="center" prop="detachmentonePeopleName" />
+      <el-table-column
+        label="值班分队1指挥员"
+        align="center"
+        prop="detachmentonePeopleName"
+      />
       <!-- <el-table-column label="值班分队1指挥员" align="center" prop="detachmentonePeopleId" :formatter="detachmentonePeopleIdFormat" /> -->
       <!-- <el-table-column label="值班分队1指挥员电话" align="center" prop="detachmentonePeoplePhone" />  -->
-      <el-table-column label="值班分队2" align="center" prop="detachmentwoName" />
+      <el-table-column
+        label="值班分队2"
+        align="center"
+        prop="detachmentwoName"
+      />
       <!-- <el-table-column
         label="值班分队2"
         align="center"
@@ -313,24 +341,35 @@
         :formatter="detachmentwoIdFormat"
       /> -->
       <!-- <el-table-column label="值班分队2人数" align="center" prop="detachmentwoNumber" /> -->
-      <el-table-column label="值班分队2指挥员" align="center" prop="detachmentwoPeopleName" />
+      <el-table-column
+        label="值班分队2指挥员"
+        align="center"
+        prop="detachmentwoPeopleName"
+      />
       <!-- <el-table-column label="值班分队2指挥员" align="center" prop="detachmentwoPeopleId" :formatter="detachmentwoPeopleIdFormat" /> -->
       <!-- <el-table-column label="值班分队2指挥员电话" align="center" prop="detachmentwoPeoplePhone" />
       <el-table-column label="备注" align="center" prop="remarks" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
         <template slot-scope="scope">
           <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['combatduty:basedutyinfo:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['combatduty:basedutyinfo:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -344,8 +383,20 @@
     />
 
     <!-- 添加或修改基地值班对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="150px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :inline="true"
+        label-width="150px"
+      >
         <div class="jiben">基本信息</div>
         <el-form-item label="值班时间" prop="attendedTime">
           <el-date-picker
@@ -355,7 +406,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder=""
-            v-if="qdflg==2"
+            v-if="qdflg == 2"
           ></el-date-picker>
           <el-date-picker
             v-model="form.attendedTime"
@@ -364,7 +415,7 @@
             start-placeholder
             end-placeholder
             value-format="yyyy-MM-dd"
-            v-if="qdflg==1"
+            v-if="qdflg == 1"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="值班首长" prop="chiefDutyName">
@@ -375,7 +426,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
@@ -392,7 +448,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="作战值班员Id" prop="combatDutyId">
@@ -409,7 +470,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="总值班员ID" prop="dutyOffierId">
@@ -419,7 +485,12 @@
           <el-input v-model="form.dutyOffierPhone" placeholder="" />
         </el-form-item>
         <el-form-item label="值班分队1" prop="detachmentoneName">
-          <el-select v-model="form.detachmentoneName" @change="detachmentoneNamechange" clearable placeholder="">
+          <el-select
+            v-model="form.detachmentoneName"
+            @change="detachmentoneNamechange"
+            clearable
+            placeholder=""
+          >
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
@@ -432,7 +503,12 @@
           <el-input v-model="form.detachmentoneId" placeholder="请输入值班分队1ID" />
         </el-form-item>-->
         <el-form-item label="值班分队1人数" prop="detachmentoneNumber">
-          <el-input v-model="form.detachmentoneNumber" type="number" :min="0" placeholder="" />
+          <el-input
+            v-model="form.detachmentoneNumber"
+            type="number"
+            :min="0"
+            placeholder=""
+          />
           <!-- <el-input-number v-model="form.detachmentoneNumber" controls-position="right" :min="0"></el-input-number> -->
           <!-- <el-input-number v-model="form.detachmentoneNumber" type='Number' controls-position="right" :min="0" /> -->
           <!-- <el-input
@@ -449,17 +525,30 @@
             placeholder=""
             @change="detachmentonePeopleNamefun"
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班分队1指挥员ID" prop="detachmentonePeopleId">
           <el-input v-model="form.detachmentonePeopleId" placeholder="请输入值班分队1指挥员ID" />
         </el-form-item>-->
-        <el-form-item label="值班分队1指挥员电话" prop="detachmentonePeoplePhone">
+        <el-form-item
+          label="值班分队1指挥员电话"
+          prop="detachmentonePeoplePhone"
+        >
           <el-input v-model="form.detachmentonePeoplePhone" placeholder="" />
         </el-form-item>
         <el-form-item label="值班分队2" prop="detachmentwoName">
-          <el-select v-model="form.detachmentwoName" @change="detachmentwoNamechange" clearable placeholder="">
+          <el-select
+            v-model="form.detachmentwoName"
+            @change="detachmentwoNamechange"
+            clearable
+            placeholder=""
+          >
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
@@ -473,7 +562,12 @@
         </el-form-item>-->
         <el-form-item label="值班分队2人数" prop="detachmentwoNumber">
           <!-- <el-input-number v-model="form.detachmentwoNumber" controls-position="right" :min="0" /> -->
-          <el-input v-model="form.detachmentwoNumber" type="number" :min="0" placeholder="" />
+          <el-input
+            v-model="form.detachmentwoNumber"
+            type="number"
+            :min="0"
+            placeholder=""
+          />
           <!-- <el-input
             v-model="form.detachmentwoNumber"
             type="number"
@@ -488,18 +582,30 @@
             placeholder=""
             @change="detachmentwoPeopleNamefun"
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班分队2指挥员ID" prop="detachmentwoPeopleId">
           <el-input v-model="form.detachmentwoPeopleId" placeholder="请输入值班分队2指挥员ID" />
         </el-form-item>-->
-        <el-form-item label="值班分队2指挥员电话" prop="detachmentwoPeoplePhone">
+        <el-form-item
+          label="值班分队2指挥员电话"
+          prop="detachmentwoPeoplePhone"
+        >
           <el-input v-model="form.detachmentwoPeoplePhone" placeholder="" />
         </el-form-item>
         <div class="jiben">备注</div>
         <el-form-item label prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
+          <el-input
+            v-model="form.remarks"
+            type="textarea"
+            placeholder="请输入备注"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -520,7 +626,7 @@ import {
   exportBasedutyinfo,
   rllist,
   listPeople,
-  getDept
+  getDept,
 } from "@/api/combatduty/basedutyinfo";
 
 export default {
@@ -574,7 +680,7 @@ export default {
         detachmentwoPeopleId: null,
         detachmentwoPeoplePhone: null,
         remarks: null,
-        type: null
+        type: null,
       },
       // 表单参数
       form: {},
@@ -584,7 +690,7 @@ export default {
       rylist: [],
       //单位数据
       deptOptions: [],
-      qdflg: null
+      qdflg: null,
     };
   },
   created() {
@@ -595,14 +701,14 @@ export default {
   methods: {
     //获取人员
     getrylist() {
-      listPeople().then(res => {
+      listPeople().then((res) => {
         if (res.code == 200) {
           this.rylist = res.rows;
         }
       });
     },
     gettreeselect() {
-      getDept().then(res => {
+      getDept().then((res) => {
         console.log(res);
         if (res.code == 200) {
           this.deptOptions = res.data;
@@ -632,7 +738,7 @@ export default {
     //首长
     chiefDutyIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.chiefDutyId) {
           deptName = item.name;
         }
@@ -641,7 +747,7 @@ export default {
     },
     combatDutyIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.combatDutyId) {
           deptName = item.name;
         }
@@ -650,7 +756,7 @@ export default {
     },
     detachmentonePeopleIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.detachmentonePeopleId) {
           deptName = item.name;
         }
@@ -659,7 +765,7 @@ export default {
     },
     detachmentwoPeopleIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.detachmentwoPeopleId) {
           deptName = item.name;
         }
@@ -668,7 +774,7 @@ export default {
     },
     dutyOffierIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.chiefDutyId) {
           deptName = item.name;
         }
@@ -678,7 +784,7 @@ export default {
     /** 查询基地值班列表 */
     getList() {
       this.loading = true;
-      listBasedutyinfo(this.queryParams).then(response => {
+      listBasedutyinfo(this.queryParams).then((response) => {
         this.basedutyinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -715,7 +821,7 @@ export default {
         detachmentwoPeopleName: null,
         detachmentwoPeopleId: null,
         detachmentwoPeoplePhone: null,
-        remarks: null
+        remarks: null,
       };
       this.resetForm("form");
     },
@@ -731,7 +837,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -748,7 +854,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getBasedutyinfo(id).then(response => {
+      getBasedutyinfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改基地值班";
@@ -757,10 +863,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateBasedutyinfo(this.form).then(response => {
+            updateBasedutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -768,7 +874,7 @@ export default {
           } else {
             this.form.timequjian = this.form.attendedTime;
             this.form.attendedTime = this.form.attendedTime.join(",");
-            addBasedutyinfo(this.form).then(response => {
+            addBasedutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -782,7 +888,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除该数据项?")
-        .then(function() {
+        .then(function () {
           return delBasedutyinfo(ids);
         })
         .then(() => {
@@ -800,7 +906,7 @@ export default {
           this.exportLoading = true;
           return exportBasedutyinfo(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -847,8 +953,8 @@ export default {
     detachmentwoNamechange(val) {
       this.form.detachmentwoId = val.deptId;
       this.form.detachmentwoName = val.deptName;
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>
@@ -1062,49 +1168,48 @@ export default {
   border: none !important;
   color: #cccccc;
 }
-::v-deep .el-dialog__body{
+::v-deep .el-dialog__body {
   padding: 30px 0px 0px 40px !important;
 }
-::v-deep .el-dialog__footer{
+::v-deep .el-dialog__footer {
   margin-right: 20px !important;
 }
 .isSubmit {
-   margin-left: 40% !important;  
-   margin-right: 30%;
-   margin-bottom: 5px;
-   padding-bottom: 5px;
+  margin-left: 40% !important;
+  margin-right: 30%;
+  margin-bottom: 5px;
+  padding-bottom: 5px;
 }
 .el-radio-button {
-width: 122px !important;
-height: 30px !important;
-line-height: 30px !important;
-border: none !important;
+  width: 122px !important;
+  height: 30px !important;
+  line-height: 30px !important;
+  border: none !important;
 }
-::v-deep .el-radio-button__inner{
+::v-deep .el-radio-button__inner {
   width: 120px !important;
-height: 30px !important;
+  height: 30px !important;
   line-height: 8px !important;
-  background: rgb(10, 67, 224);
+  background: #034b81;
   border: none;
   color: #fff;
 }
-::v-deep .el-radio-button:first-child .el-radio-button__inner{
+::v-deep .el-radio-button:first-child .el-radio-button__inner {
   border-left: none !important;
 }
 ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
-    color: #FFFFFF;
-    background-color: #034b81 !important;
-    border-color: #034b81 !important;
-    -webkit-box-shadow: -1px 0 0 0 #034b81 !important;
-    box-shadow: -1px 0 0 0 #034b81 !important;
+  color: #ffffff;
+  background-color: rgb(10, 67, 224) !important;
+  border-color: rgb(10, 67, 224) !important;
+  -webkit-box-shadow: -1px 0 0 0 rgb(10, 67, 224) !important;
+  box-shadow: -1px 0 0 0 rgb(10, 67, 224) !important;
 }
 /* 将水平线设为红色: */
 hr {
- border: none;
- height: 1px;
- background-color: rgba(204, 204, 204, 0.5);
- margin-bottom: 15px;
+  border: none;
+  height: 1px;
+  background-color: rgba(204, 204, 204, 0.5);
+  margin-bottom: 15px;
 }
-
 </style>
 

+ 156 - 52
src/views/combatduty/grassdutyinfo/index.vue

@@ -1,5 +1,15 @@
 <template>
   <div class="app-container">
+    <el-row>
+      <el-col :span="1.5" class="isSubmit">
+        <el-radio-group v-model="queryParams.type" @change="caoZuoTypefun">
+          <el-radio-button label="null">所有值班</el-radio-button>
+          <el-radio-button label="1">今日值班</el-radio-button>
+          <el-radio-button label="2">次日值班</el-radio-button>
+        </el-radio-group>
+      </el-col>
+    </el-row>
+    <hr />
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -18,7 +28,7 @@
         >
         </el-date-picker>
       </el-form-item>-->
-      <el-form-item label="值班时间" prop="attendedTime">
+      <el-form-item prop="attendedTime">
         <el-date-picker
           clearable
           size="small"
@@ -28,9 +38,14 @@
           placeholder="请选择值班时间"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="值班首长" prop="chiefDutyName">
-        <el-select v-model="queryParams.chiefDutyId" filterable clearable placeholder="请选择值班首长">
-          <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+      <el-form-item prop="chiefDutyName">
+        <el-select v-model="queryParams.chiefDutyId" filterable clearable>
+          <el-option
+            v-for="item in rylist"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="单位名称" prop="unitName">
@@ -113,8 +128,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="值班员" prop="dutyOffierName">
-        <el-select v-model="queryParams.dutyOffierName" placeholder="请选择值班员" clearable size="small">
+      <el-form-item prop="dutyOffierName">
+        <el-select
+          v-model="queryParams.dutyOffierName"
+          placeholder="请选择值班员"
+          clearable
+          size="small"
+        >
           <el-option label="请选择字典生成" value />
         </el-select>
       </el-form-item>
@@ -171,7 +191,9 @@
         </el-select>
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery">搜索</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>
@@ -185,7 +207,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['combatduty:grassdutyinfo:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -208,7 +231,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['combatduty:grassdutyinfo:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -222,14 +246,8 @@
           >导出</el-button
         >
       </el-col>-->
-      <el-col :span="1.5" class="isSubmit">
-        <el-radio-group v-model="queryParams.type" @change="caoZuoTypefun">
-          <el-radio-button label="null">所有值班</el-radio-button>
-          <el-radio-button label="1">今日值班</el-radio-button>
-          <el-radio-button label="2">次日值班</el-radio-button>
-        </el-radio-group>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -250,14 +268,25 @@
         prop="chiefDutyId"
         :formatter="chiefDutyIdFormat"
       />
-      <el-table-column label="值班首长职务" align="center" prop="chiefDutyZhiwu">
+      <el-table-column
+        label="值班首长职务"
+        align="center"
+        prop="chiefDutyZhiwu"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_duty_hief" :value="scope.row.chiefDutyZhiwu" />
+          <dict-tag
+            :options="dict.type.sys_duty_hief"
+            :value="scope.row.chiefDutyZhiwu"
+          />
         </template>
       </el-table-column>
       <el-table-column label="办公电话" align="center" prop="telephoneBg" />
       <el-table-column label="宿舍电话" align="center" prop="telephoneSs" />
-      <el-table-column label="值班首长手机" align="center" prop="chiefDutyPhone" />
+      <el-table-column
+        label="值班首长手机"
+        align="center"
+        prop="chiefDutyPhone"
+      />
       <!-- <el-table-column label="值班员" align="center" prop="dutyOffierName" /> -->
       <el-table-column
         label="值班员"
@@ -267,7 +296,10 @@
       />
       <el-table-column label="值班员职务" align="center" prop="dutyOffierZw">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_duty_hief" :value="scope.row.dutyOffierZw" />
+          <dict-tag
+            :options="dict.type.sys_duty_hief"
+            :value="scope.row.dutyOffierZw"
+          />
         </template>
       </el-table-column>
       <!-- <el-table-column label="值班员手机" align="center" prop="dutyOffierPhone" />
@@ -278,25 +310,37 @@
         prop="dutyGangwei"
         :formatter="dutyGangweiFormat"
       />
-      <el-table-column label="值班时间" align="center" prop="attendedTime" width="180">
+      <el-table-column
+        label="值班时间"
+        align="center"
+        prop="attendedTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.attendedTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        width="200"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['combatduty:grassdutyinfo:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['combatduty:grassdutyinfo:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -310,8 +354,20 @@
     />
 
     <!-- 添加或修改基层值班对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
         <div class="jiben">基本信息</div>
         <!-- <el-form-item label="值班时间" prop="attendedTime">
           <el-date-picker
@@ -332,7 +388,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder=""
-            v-if="qdflg==2"
+            v-if="qdflg == 2"
           ></el-date-picker>
           <el-date-picker
             v-model="form.attendedTime"
@@ -341,7 +397,7 @@
             start-placeholder
             end-placeholder
             value-format="yyyy-MM-dd"
-            v-if="qdflg==1"
+            v-if="qdflg == 1"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="单位名称" prop="unitName">
@@ -378,7 +434,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班首长" prop="chiefDutyId">
@@ -414,7 +475,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班员" prop="dutyOffierId">
@@ -467,7 +533,7 @@ import {
   exportGrassdutyinfo,
   rllist,
   listPeople,
-  getDept
+  getDept,
 } from "@/api/combatduty/grassdutyinfo";
 
 export default {
@@ -514,7 +580,7 @@ export default {
         dutyOffierPhone: null,
         dutyPhone: null,
         dutyGangwei: null,
-        type: null
+        type: null,
       },
       // 表单参数
       form: {},
@@ -524,7 +590,7 @@ export default {
       rylist: [],
       //单位数据
       deptOptions: [],
-      qdflg: null
+      qdflg: null,
     };
   },
   created() {
@@ -535,14 +601,14 @@ export default {
   methods: {
     //获取人员
     getrylist() {
-      listPeople().then(res => {
+      listPeople().then((res) => {
         if (res.code == 200) {
           this.rylist = res.rows;
         }
       });
     },
     gettreeselect() {
-      getDept().then(res => {
+      getDept().then((res) => {
         if (res.code == 200) {
           this.deptOptions = res.data;
         }
@@ -551,7 +617,7 @@ export default {
     //首长
     chiefDutyIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.chiefDutyId) {
           deptName = item.name;
         }
@@ -560,7 +626,7 @@ export default {
     },
     dutyOffierIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.dutyOffierId) {
           deptName = item.name;
         }
@@ -580,7 +646,7 @@ export default {
     //岗位
     dutyGangweiFormat(row, column) {
       var deptName = "";
-      this.deptOptions.map(item => {
+      this.deptOptions.map((item) => {
         if (item.deptId == Number(row.dutyGangwei)) {
           deptName = item.deptName;
         }
@@ -590,7 +656,7 @@ export default {
     /** 查询基层值班列表 */
     getList() {
       this.loading = true;
-      listGrassdutyinfo(this.queryParams).then(response => {
+      listGrassdutyinfo(this.queryParams).then((response) => {
         this.grassdutyinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -619,7 +685,7 @@ export default {
         dutyOffierZw: null,
         dutyOffierPhone: null,
         dutyPhone: null,
-        dutyGangwei: null
+        dutyGangwei: null,
       };
       this.resetForm("form");
     },
@@ -635,7 +701,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -650,7 +716,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getGrassdutyinfo(id).then(response => {
+      getGrassdutyinfo(id).then((response) => {
         this.form = response.data;
         this.form.dutyGangwei = Number(this.form.dutyGangwei);
         this.open = true;
@@ -660,10 +726,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateGrassdutyinfo(this.form).then(response => {
+            updateGrassdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -671,7 +737,7 @@ export default {
           } else {
             this.form.timequjian = this.form.attendedTime;
             this.form.attendedTime = this.form.attendedTime.join(",");
-            addGrassdutyinfo(this.form).then(response => {
+            addGrassdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -685,7 +751,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除该数据项?")
-        .then(function() {
+        .then(function () {
           return delGrassdutyinfo(ids);
         })
         .then(() => {
@@ -703,7 +769,7 @@ export default {
           this.exportLoading = true;
           return exportGrassdutyinfo(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -728,12 +794,12 @@ export default {
     unitNamechange(val) {
       this.form.unitId = val.deptId;
       this.form.unitName = val.deptName;
-    }
+    },
     // detachmentwoNamechange(val) {
     //   this.form.detachmentwoId = val.deptId;
     //   this.form.detachmentwoName = val.deptName;
     // }
-  }
+  },
 };
 </script>
 <style scoped>
@@ -768,8 +834,9 @@ export default {
   color: #fff;
 }
 ::v-deep .el-dialog__body {
-    padding: 30px 0px 30px 46px;}
-  ::v-deep .el-dialog__footer{
+  padding: 30px 0px 30px 46px;
+}
+::v-deep .el-dialog__footer {
   margin-right: 30px !important;
 }
 /* 单位框背景颜色 */
@@ -840,4 +907,41 @@ export default {
   border: none !important;
   color: #cccccc;
 }
+.isSubmit {
+  margin-left: 40% !important;
+  margin-right: 30%;
+  margin-bottom: 5px;
+  padding-bottom: 5px;
+}
+.el-radio-button {
+  width: 122px !important;
+  height: 30px !important;
+  line-height: 30px !important;
+  border: none !important;
+}
+::v-deep .el-radio-button__inner {
+  width: 120px !important;
+  height: 30px !important;
+  line-height: 8px !important;
+  background: #034b81;
+  border: none;
+  color: #fff;
+}
+::v-deep .el-radio-button:first-child .el-radio-button__inner {
+  border-left: none !important;
+}
+::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+  color: #ffffff;
+  background-color: rgb(10, 67, 224) !important;
+  border-color: rgb(10, 67, 224) !important;
+  -webkit-box-shadow: -1px 0 0 0 rgb(10, 67, 224) !important;
+  box-shadow: -1px 0 0 0 rgb(10, 67, 224) !important;
+}
+/* 将水平线设为红色: */
+hr {
+  border: none;
+  height: 1px;
+  background-color: rgba(204, 204, 204, 0.5);
+  margin-bottom: 15px;
+}
 </style>

+ 94 - 43
src/views/combatduty/militarydutyinfo/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="auto"
     >
-      <el-form-item label="值班时间" prop="attendedTime">
+      <el-form-item prop="attendedTime">
         <el-date-picker
           clearable
           size="small"
@@ -26,14 +26,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="号码号牌" prop="numberPlateName">
+      <el-form-item prop="numberPlateName">
         <el-select
           v-model="queryParams.numberPlateName"
           placeholder="请选择号码号牌"
           clearable
           size="small"
         >
-          <el-option label="请选择字典生成" value />
+          <el-option value />
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="车属单位ID" prop="carUnitId">
@@ -83,8 +83,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="司机名字" prop="driverName">
-        <el-select v-model="queryParams.driverName" placeholder="请选择司机名字" clearable size="small">
+      <el-form-item prop="driverName">
+        <el-select
+          v-model="queryParams.driverName"
+          placeholder="请选择司机名字"
+          clearable
+          size="small"
+        >
           <el-option label="请选择字典生成" value />
         </el-select>
       </el-form-item>
@@ -98,7 +103,9 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery">搜索</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>
@@ -112,7 +119,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['combatduty:militarydutyinfo:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -123,7 +131,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['combatduty:militarydutyinfo:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -134,7 +143,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['combatduty:militarydutyinfo:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -147,7 +157,7 @@
           v-hasPermi="['combatduty:militarydutyinfo:export']"
         >导出</el-button>
       </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -159,7 +169,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="值班时间" align="center" prop="attendedTime" width="180">
+      <el-table-column
+        label="值班时间"
+        align="center"
+        prop="attendedTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.attendedTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -171,27 +186,37 @@
       <el-table-column label="车辆类别" align="center" prop="carType" />
       <el-table-column label="车辆状态" align="center" prop="carStates">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.vehicle_status" :value="scope.row.carStates" />
+          <dict-tag
+            :options="dict.type.vehicle_status"
+            :value="scope.row.carStates"
+          />
         </template>
       </el-table-column>
       <el-table-column label="所在位置" align="center" prop="adress" />
       <!-- <el-table-column label="司机id" align="center" prop="driverId" /> -->
       <el-table-column label="司机名字" align="center" prop="driverName" />
       <el-table-column label="联系方式" align="center" prop="telephone" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
         <template slot-scope="scope">
           <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['combatduty:militarydutyinfo:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['combatduty:militarydutyinfo:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -205,8 +230,20 @@
     />
 
     <!-- 添加或修改军车值班对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
         <div class="jiben">基本信息</div>
         <!-- <el-form-item label="值班时间" prop="attendedTime">
           <el-date-picker
@@ -227,7 +264,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder=""
-            v-if="qdflg==2"
+            v-if="qdflg == 2"
           ></el-date-picker>
           <el-date-picker
             v-model="form.attendedTime"
@@ -236,7 +273,7 @@
             start-placeholder
             end-placeholder
             value-format="yyyy-MM-dd"
-            v-if="qdflg==1"
+            v-if="qdflg == 1"
           ></el-date-picker>
         </el-form-item>
         <!-- <el-form-item label="号码号牌ID" prop="numberPlateId">
@@ -246,7 +283,11 @@
           />
         </el-form-item>-->
         <el-form-item label="号码号牌" prop="numberPlateName">
-          <el-select v-model="form.numberPlateName" @change="numberPlateNamechange" placeholder="">
+          <el-select
+            v-model="form.numberPlateName"
+            @change="numberPlateNamechange"
+            placeholder=""
+          >
             <el-option
               v-for="dict in buslist"
               :key="dict.id"
@@ -266,7 +307,12 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="车属单位名称" prop="carUnitName">
-           <el-select v-model="form.carUnitName" @change="carUnitNamechange" clearable placeholder="">
+          <el-select
+            v-model="form.carUnitName"
+            @change="carUnitNamechange"
+            clearable
+            placeholder=""
+          >
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
@@ -302,7 +348,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="联系方式" prop="telephone">
@@ -328,7 +379,7 @@ import {
   rllist,
   listPeople,
   getDept,
-  getthebus
+  getthebus,
 } from "@/api/combatduty/militarydutyinfo";
 
 export default {
@@ -370,7 +421,7 @@ export default {
         adress: null,
         driverId: null,
         driverName: null,
-        telephone: null
+        telephone: null,
       },
       // 表单参数
       form: {},
@@ -382,7 +433,7 @@ export default {
       deptOptions: [],
       qdflg: null,
       //车牌号
-      buslist: []
+      buslist: [],
     };
   },
   created() {
@@ -404,21 +455,21 @@ export default {
     // },
     //获取人员
     getrylist() {
-      listPeople().then(res => {
+      listPeople().then((res) => {
         if (res.code == 200) {
           this.rylist = res.rows;
         }
       });
     },
     gettreeselect() {
-      getDept().then(res => {
+      getDept().then((res) => {
         if (res.code == 200) {
           this.deptOptions = res.data;
         }
       });
     },
     getthebusfun() {
-      getthebus().then(res => {
+      getthebus().then((res) => {
         if (res.code == 200) {
           this.buslist = res.rows;
         }
@@ -427,7 +478,7 @@ export default {
     /** 查询军车值班列表 */
     getList() {
       this.loading = true;
-      listMilitarydutyinfo(this.queryParams).then(response => {
+      listMilitarydutyinfo(this.queryParams).then((response) => {
         this.militarydutyinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -453,7 +504,7 @@ export default {
         driverId: null,
         driverName: null,
         telephone: null,
-        modelInfo:null
+        modelInfo: null,
       };
       this.resetForm("form");
     },
@@ -469,7 +520,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -484,7 +535,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getMilitarydutyinfo(id).then(response => {
+      getMilitarydutyinfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改军车值班";
@@ -493,10 +544,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateMilitarydutyinfo(this.form).then(response => {
+            updateMilitarydutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -504,7 +555,7 @@ export default {
           } else {
             this.form.timequjian = this.form.attendedTime;
             this.form.attendedTime = this.form.attendedTime.join(",");
-            addMilitarydutyinfo(this.form).then(response => {
+            addMilitarydutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -518,7 +569,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除该数据项?")
-        .then(function() {
+        .then(function () {
           return delMilitarydutyinfo(ids);
         })
         .then(() => {
@@ -536,7 +587,7 @@ export default {
           this.exportLoading = true;
           return exportMilitarydutyinfo(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -553,11 +604,11 @@ export default {
       this.form.carUnitId = val.deptId;
       this.form.carUnitName = val.deptName;
     },
-    numberPlateNamechange(val){
-      this.form.numberPlateName=val.vehiclenumber;
-      this.form.modelInfo=val.vehiclemodel;
-    }
-  }
+    numberPlateNamechange(val) {
+      this.form.numberPlateName = val.vehiclenumber;
+      this.form.modelInfo = val.vehiclemodel;
+    },
+  },
 };
 </script>
 <style scoped>
@@ -602,7 +653,7 @@ export default {
   background: transparent !important;
   color: #fff;
 }
- ::v-deep .el-dialog__footer{
+::v-deep .el-dialog__footer {
   margin-right: 40px !important;
 }
 /* 单位框背景颜色 */

+ 5 - 5
src/views/combatduty/regisdutyinfo/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="单位名称" prop="unitName">
+      <el-form-item prop="unitName">
         <el-select
           v-model="queryParams.unitName"
           placeholder="请选择单位名称"
@@ -53,7 +53,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="类型" prop="type">
+      <el-form-item prop="type">
         <el-select
           v-model="queryParams.type"
           placeholder="请选择类型"
@@ -92,7 +92,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="值班日期" prop="attendedTime">
+      <el-form-item prop="attendedTime">
         <el-date-picker
           clearable
           size="small"
@@ -159,10 +159,10 @@
           >导出</el-button
         >
       </el-col> -->
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table

+ 121 - 42
src/views/combatduty/taskdutyinfo/index.vue

@@ -7,8 +7,12 @@
       v-show="showSearch"
       label-width="auto"
     >
-      <el-form-item label="单位" prop="unitName">
-        <el-select v-model="queryParams.unitName" clearable placeholder="请选择单位">
+      <el-form-item prop="unitName">
+        <el-select
+          v-model="queryParams.unitName"
+          clearable
+          placeholder="请选择单位"
+        >
           <el-option
             v-for="dict in deptOptions"
             :key="dict.deptId"
@@ -31,7 +35,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="指挥员" prop="commanderName">
+      <el-form-item prop="commanderName">
         <el-select
           v-model="queryParams.commanderName"
           @change="driverNamefun"
@@ -39,7 +43,12 @@
           clearable
           placeholder="请选择指挥员"
         >
-          <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+          <el-option
+            v-for="item in rylist"
+            :key="item.id"
+            :label="item.name"
+            :value="item"
+          ></el-option>
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="指挥员" prop="commanderName">
@@ -100,7 +109,9 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery">搜索</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>
@@ -114,7 +125,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['combatduty:taskdutyinfo:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -125,7 +137,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['combatduty:taskdutyinfo:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -136,7 +149,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['combatduty:taskdutyinfo:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -149,7 +163,7 @@
           v-hasPermi="['combatduty:taskdutyinfo:export']"
         >导出</el-button>
       </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -165,37 +179,73 @@
       <!-- <el-table-column label="部门ID" align="center" prop="unitId" /> -->
       <el-table-column label="指挥员" align="center" prop="commanderName" />
       <!-- <el-table-column label="指挥员ID" align="center" prop="commanderId" /> -->
-      <el-table-column label="指挥员电话" align="center" prop="commanderPhone" />
+      <el-table-column
+        label="指挥员电话"
+        align="center"
+        prop="commanderPhone"
+      />
       <!-- <el-table-column label="参加人员" align="center" prop="participantsName" /> -->
       <!-- <el-table-column label="参加人员ID" align="center" prop="participantsId" /> -->
-      <el-table-column label="参加人员" align="center" prop="participantsIds" :formatter="unit2Format" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+      <el-table-column
+        label="参加人员"
+        align="center"
+        prop="participantsIds"
+        :formatter="unit2Format"
+      />
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="startTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+      <el-table-column
+        label="结束时间"
+        align="center"
+        prop="endTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="所在位置" align="center" prop="adress" />
-      <el-table-column label="是由" show-overflow-tooltip align="center" prop="question" />
-      <el-table-column label="备注" show-overflow-tooltip align="center" prop="remarks" />
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+      <el-table-column
+        label="是由"
+        show-overflow-tooltip
+        align="center"
+        prop="question"
+      />
+      <el-table-column
+        label="备注"
+        show-overflow-tooltip
+        align="center"
+        prop="remarks"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        width="200"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['combatduty:taskdutyinfo:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['combatduty:taskdutyinfo:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -209,11 +259,28 @@
     />
 
     <!-- 添加或修改执行任务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
         <div class="jiben">基本信息</div>
         <el-form-item label="单位" prop="unitName">
-          <el-select v-model="form.unitName" @change="unitNamechange" clearable placeholder="">
+          <el-select
+            v-model="form.unitName"
+            @change="unitNamechange"
+            clearable
+            placeholder=""
+          >
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
@@ -233,7 +300,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="指挥员" prop="commanderId">
@@ -263,7 +335,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
@@ -316,7 +393,7 @@ import {
   exportTaskdutyinfo,
   rllist,
   listPeople,
-  getDept
+  getDept,
 } from "@/api/combatduty/taskdutyinfo";
 
 export default {
@@ -358,7 +435,7 @@ export default {
         endTime: null,
         adress: null,
         question: null,
-        remarks: null
+        remarks: null,
       },
       // 表单参数
       form: {},
@@ -368,7 +445,7 @@ export default {
       rylist: [],
       //单位数据
       deptOptions: [],
-      qdflg: null
+      qdflg: null,
     };
   },
   created() {
@@ -379,14 +456,14 @@ export default {
   methods: {
     //获取人员
     getrylist() {
-      listPeople().then(res => {
+      listPeople().then((res) => {
         if (res.code == 200) {
           this.rylist = res.rows;
         }
       });
     },
     gettreeselect() {
-      getDept().then(res => {
+      getDept().then((res) => {
         if (res.code == 200) {
           this.deptOptions = res.data;
         }
@@ -404,7 +481,7 @@ export default {
     // },
     unit2Format(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         row.participantsIds.forEach((items, index) => {
           if (item.id == items) {
             deptName += item.name + "  ";
@@ -417,7 +494,7 @@ export default {
     /** 查询执行任务列表 */
     getList() {
       this.loading = true;
-      listTaskdutyinfo(this.queryParams).then(response => {
+      listTaskdutyinfo(this.queryParams).then((response) => {
         this.taskdutyinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -443,7 +520,7 @@ export default {
         endTime: null,
         adress: null,
         question: null,
-        remarks: null
+        remarks: null,
       };
       this.resetForm("form");
     },
@@ -459,7 +536,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -473,7 +550,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getTaskdutyinfo(id).then(response => {
+      getTaskdutyinfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改执行任务";
@@ -481,16 +558,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateTaskdutyinfo(this.form).then(response => {
+            updateTaskdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addTaskdutyinfo(this.form).then(response => {
+            addTaskdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -504,7 +581,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除该数据项?")
-        .then(function() {
+        .then(function () {
           return delTaskdutyinfo(ids);
         })
         .then(() => {
@@ -522,7 +599,7 @@ export default {
           this.exportLoading = true;
           return exportTaskdutyinfo(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -539,7 +616,7 @@ export default {
       this.form.unitId = val.deptId;
       this.form.unitName = val.deptName;
     },
-  }
+  },
 };
 </script>
 <style scoped>
@@ -552,9 +629,11 @@ export default {
   height: 124px;
 }
 ::v-deep .el-dialog__body {
-    padding: 30px 0px 30px 48px;}
-   ::v-deep  .el-dialog__footer {
-    margin-right: 28px !important;}
+  padding: 30px 0px 30px 48px;
+}
+::v-deep .el-dialog__footer {
+  margin-right: 28px !important;
+}
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
 }

+ 138 - 55
src/views/combatduty/teamdutyinfo/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="auto"
     >
-      <el-form-item label="值班时间" prop="attendedTime">
+      <el-form-item prop="attendedTime">
         <el-date-picker
           clearable
           size="small"
@@ -18,7 +18,7 @@
           @keyup.enter.native="handleQuery"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="值班首长" prop="chiefDutyName">
+      <el-form-item prop="chiefDutyName">
         <el-input
           v-model="queryParams.chiefDutyName"
           placeholder="请输入值班首长"
@@ -262,7 +262,9 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery">搜索</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>
@@ -276,7 +278,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['combatduty:teamdutyinfo:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -287,7 +290,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['combatduty:teamdutyinfo:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -298,7 +302,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['combatduty:teamdutyinfo:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -311,7 +316,7 @@
           v-hasPermi="['combatduty:teamdutyinfo:export']"
         >导出</el-button>
       </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -379,7 +384,7 @@
         :formatter="messengerIdFormat"
       />
       <!-- <el-table-column label="值班通信员电话" align="center" prop="messengerPhone" /> -->
-      <el-table-column label="值班分队" align="center" prop="detachmentName"  />
+      <el-table-column label="值班分队" align="center" prop="detachmentName" />
       <!-- <el-table-column
         label="值班分队"
         align="center"
@@ -390,25 +395,32 @@
       <el-table-column label="值班分队指挥员" align="center" prop="detachmentPeopleName" />
       <el-table-column label="值班分队指挥员ID" align="center" prop="detachmentPeopleId" />
       <el-table-column label="值班分队指挥员电话" align="center" prop="detachmentPeoplePhone" />-->
-      <el-table-column label="值班时间" align="center" prop="attendedTime" >
+      <el-table-column label="值班时间" align="center" prop="attendedTime">
         <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.attendedTime, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+          <span>{{ parseTime(scope.row.attendedTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
         <template slot-scope="scope">
           <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['combatduty:teamdutyinfo:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['combatduty:teamdutyinfo:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -422,8 +434,20 @@
     />
 
     <!-- 添加或修改大队值班对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="155px" :inline="true">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="155px"
+        :inline="true"
+      >
         <div class="jiben">基本信息</div>
         <el-form-item label="值班时间" prop="attendedTime">
           <el-date-picker
@@ -433,7 +457,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder=""
-            v-if="qdflg==2"
+            v-if="qdflg == 2"
           ></el-date-picker>
           <el-date-picker
             v-model="form.attendedTime"
@@ -442,7 +466,7 @@
             start-placeholder
             end-placeholder
             value-format="yyyy-MM-dd"
-            v-if="qdflg==1"
+            v-if="qdflg == 1"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="值班首长" prop="chiefDutyName">
@@ -453,7 +477,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班首长" prop="chiefDutyId">
@@ -475,7 +504,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="作战值班员" prop="combatDutyId">
@@ -500,7 +534,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="通信值班员" prop="dutyOffierId">
@@ -519,7 +558,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="机要值班员" prop="confidentialId">
@@ -538,7 +582,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="政治工作部值班员" prop="politicalId">
@@ -557,7 +606,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="保障部值班员" prop="guaranteeId">
@@ -576,7 +630,12 @@
             clearable
             placeholder=""
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班通信员" prop="messengerId">
@@ -588,7 +647,12 @@
           <el-input v-model="form.messengerPhone" placeholder="" />
         </el-form-item>
         <el-form-item label="值班分队" prop="detachmentName">
-          <el-select v-model="form.detachmentName" @change="detachmentNamechange" clearable placeholder="">
+          <el-select
+            v-model="form.detachmentName"
+            @change="detachmentNamechange"
+            clearable
+            placeholder=""
+          >
             <el-option
               v-for="dict in deptOptions"
               :key="dict.deptId"
@@ -608,7 +672,12 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="值班分队人数" prop="detachmentNumber">
-          <el-input v-model="form.detachmentNumber" type="number" :min="0" placeholder="" />
+          <el-input
+            v-model="form.detachmentNumber"
+            type="number"
+            :min="0"
+            placeholder=""
+          />
         </el-form-item>
         <el-form-item label="值班分队指挥员" prop="detachmentPeopleName">
           <el-select
@@ -618,7 +687,12 @@
             placeholder=""
             @change="detachmentPeopleNamechange"
           >
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班分队指挥员" prop="detachmentPeopleId">
@@ -636,11 +710,19 @@
         </el-form-item>
         <div class="jiben">值班情况</div>
         <el-form-item label prop="zhibanqingkaung">
-          <el-input v-model="form.zhibanqingkaung" type="textarea" placeholder="" />
+          <el-input
+            v-model="form.zhibanqingkaung"
+            type="textarea"
+            placeholder=""
+          />
         </el-form-item>
         <div class="jiben">兵力情况</div>
         <el-form-item label prop="bingliqingkuang">
-          <el-input v-model="form.bingliqingkuang" type="textarea" placeholder="" />
+          <el-input
+            v-model="form.bingliqingkuang"
+            type="textarea"
+            placeholder=""
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -661,7 +743,7 @@ import {
   exportTeamdutyinfo,
   rllist,
   listPeople,
-  getDept
+  getDept,
 } from "@/api/combatduty/teamdutyinfo";
 
 export default {
@@ -721,7 +803,7 @@ export default {
         detachmentPeopleId: null,
         detachmentPeoplePhone: null,
         zhibanqingkaung: null,
-        bingliqingkuang: null
+        bingliqingkuang: null,
       },
       // 表单参数
       form: {},
@@ -739,7 +821,7 @@ export default {
       //人员数据
       rylist: [],
       //单位数据
-      deptOptions: []
+      deptOptions: [],
     };
   },
   created() {
@@ -750,14 +832,14 @@ export default {
   methods: {
     //获取人员
     getrylist() {
-      listPeople().then(res => {
+      listPeople().then((res) => {
         if (res.code == 200) {
           this.rylist = res.rows;
         }
       });
     },
     gettreeselect() {
-      getDept().then(res => {
+      getDept().then((res) => {
         console.log(res);
         if (res.code == 200) {
           this.deptOptions = res.data;
@@ -777,7 +859,7 @@ export default {
     //首长
     chiefDutyIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.chiefDutyId) {
           deptName = item.name;
         }
@@ -786,7 +868,7 @@ export default {
     },
     combatDutyIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.combatDutyId) {
           deptName = item.name;
         }
@@ -795,7 +877,7 @@ export default {
     },
     dutyOffierIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.dutyOffierId) {
           deptName = item.name;
         }
@@ -804,7 +886,7 @@ export default {
     },
     confidentialIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.confidentialId) {
           deptName = item.name;
         }
@@ -813,7 +895,7 @@ export default {
     },
     politicalIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.politicalId) {
           deptName = item.name;
         }
@@ -822,7 +904,7 @@ export default {
     },
     guaranteeIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.guaranteeId) {
           deptName = item.name;
         }
@@ -831,7 +913,7 @@ export default {
     },
     messengerIdFormat(row, column) {
       var deptName = "";
-      this.rylist.map(item => {
+      this.rylist.map((item) => {
         if (item.id == row.messengerId) {
           deptName = item.name;
         }
@@ -841,7 +923,7 @@ export default {
     /** 查询大队值班列表 */
     getList() {
       this.loading = true;
-      listTeamdutyinfo(this.queryParams).then(response => {
+      listTeamdutyinfo(this.queryParams).then((response) => {
         this.teamdutyinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -885,7 +967,7 @@ export default {
         detachmentPeopleId: null,
         detachmentPeoplePhone: null,
         zhibanqingkaung: null,
-        bingliqingkuang: null
+        bingliqingkuang: null,
       };
       this.resetForm("form");
     },
@@ -901,7 +983,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -916,7 +998,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getTeamdutyinfo(id).then(response => {
+      getTeamdutyinfo(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改大队值班";
@@ -925,10 +1007,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateTeamdutyinfo(this.form).then(response => {
+            updateTeamdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -936,7 +1018,7 @@ export default {
           } else {
             this.form.timequjian = this.form.attendedTime;
             this.form.attendedTime = this.form.attendedTime.join(",");
-            addTeamdutyinfo(this.form).then(response => {
+            addTeamdutyinfo(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -950,7 +1032,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除该数据项?")
-        .then(function() {
+        .then(function () {
           return delTeamdutyinfo(ids);
         })
         .then(() => {
@@ -968,7 +1050,7 @@ export default {
           this.exportLoading = true;
           return exportTeamdutyinfo(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -1026,7 +1108,7 @@ export default {
       this.form.detachmentId = val.deptId;
       this.form.detachmentName = val.deptName;
     },
-  }
+  },
 };
 </script>
 <style scoped>
@@ -1090,11 +1172,12 @@ export default {
   width: 1086px;
   height: 104px;
 }
-::v-deep .el-dialog__footer{
+::v-deep .el-dialog__footer {
   margin-right: 14px !important;
 }
 ::v-deep .el-dialog__body {
-    padding: 30px 0px 30px 31px;}
+  padding: 30px 0px 30px 31px;
+}
 .addspan {
   width: 30px;
   height: 30px;