修改基层弹出层的所有取消按钮颜色

src/assets/styles/global.css

@@ -1128,4 +1128,9 @@ input:-moz-placeholder {
 .navbar .hamburger-container svg {
   color: white;
   fill: currentColor;
+}
+
+/* 删除按钮取消位置 */
+.el-message-box__btns .el-button {
+  float: right;
 }

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -303,8 +303,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定 </el-button>
-        <el-button @click="cancel">取消</el-button>
-        
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
 

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -1760,7 +1760,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -113,8 +113,8 @@
           <template scope="scope">
             <span>{{
               (queryParams.pageNum - 1) * queryParams.pageSize +
-                scope.$index +
-                1
+              scope.$index +
+              1
             }}</span>
           </template>
         </el-table-column>
@@ -659,7 +659,7 @@
                     <el-time-picker
                       v-model="item1.examineDate"
                       :picker-options="{
-                        selectableRange: '00:00:00 - 23:59:59'
+                        selectableRange: '00:00:00 - 23:59:59',
                       }"
                       placeholder="选择日期时间"
                       value-format="hh:mm:ss"
@@ -732,7 +732,7 @@
                     <el-time-picker
                       v-model="item1.comeDate"
                       :picker-options="{
-                        selectableRange: '00:00:00 - 23:59:59'
+                        selectableRange: '00:00:00 - 23:59:59',
                       }"
                       placeholder="来队时间"
                       value-format="hh:mm:ss"
@@ -752,7 +752,7 @@
                     <el-time-picker
                       v-model="item1.leaveDate"
                       :picker-options="{
-                        selectableRange: '00:00:00 - 23:59:59'
+                        selectableRange: '00:00:00 - 23:59:59',
                       }"
                       placeholder="离队时间"
                       value-format="hh:mm:ss"
@@ -781,9 +781,8 @@
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="resertwo">重置</el-button>
-
           <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+          <el-button @click="resertwo" size="btn">重置</el-button>
         </div>
       </el-dialog>
       <!-- 查看 -->
@@ -843,7 +842,7 @@ import {
   updateBdgldiary,
   exportBdgldiary,
   exportBdgShuju,
-  updateBdglShenPi
+  updateBdglShenPi,
 } from "@/api/grassrootsregistration/bdgldiary";
 
 import {
@@ -852,7 +851,7 @@ import {
   getUser,
   getShiLi,
   getXunLian,
-  getWeiShu
+  getWeiShu,
 } from "@/api/grassrootsregistration/bdglmeeting";
 
 import { getDicts } from "@/api/system/dict/data";
@@ -932,50 +931,50 @@ export default {
         weekwork: null,
         examine: null,
         peopleId1: null,
-        contents: null
+        contents: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         unitId: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" }
+          { required: true, message: "单位名称不能为空", trigger: "blur" },
         ],
         peopleId: [
           // { required: true, message: "值班人员不能为空", trigger: "blur" },
         ],
         blogDate: [
-          { required: true, message: "值班日期不能为空", trigger: "blur" }
+          { required: true, message: "值班日期不能为空", trigger: "blur" },
         ],
         weather: [{ required: true, message: "天气不能为空", trigger: "blur" }],
         lead: [
-          { required: true, message: "值班首长不能为空", trigger: "change" }
+          { required: true, message: "值班首长不能为空", trigger: "change" },
         ],
         orgcadre: [
-          { required: true, message: "编制干部不能为空", trigger: "blur" }
+          { required: true, message: "编制干部不能为空", trigger: "blur" },
         ],
         orgsoldier: [
-          { required: true, message: "编制战士不能为空", trigger: "blur" }
+          { required: true, message: "编制战士不能为空", trigger: "blur" },
         ],
         orgcivilian: [
-          { required: true, message: "编制文职不能为空", trigger: "blur" }
+          { required: true, message: "编制文职不能为空", trigger: "blur" },
         ],
         nowcadre: [
-          { required: true, message: "现有干部不能为空", trigger: "blur" }
+          { required: true, message: "现有干部不能为空", trigger: "blur" },
         ],
         nowsoldier: [
-          { required: true, message: "现有战士不能为空", trigger: "blur" }
+          { required: true, message: "现有战士不能为空", trigger: "blur" },
         ],
         nowcivilian: [
-          { required: true, message: "现有文职不能为空", trigger: "blur" }
-        ]
+          { required: true, message: "现有文职不能为空", trigger: "blur" },
+        ],
       },
       BdgDay: [],
       // 搜索人员
       Renyuan: [],
       // 字典类型查询
       dictType: {
-        dictType: "yssp"
+        dictType: "yssp",
       },
       // 字典数据
       ziDian: [],
@@ -985,12 +984,12 @@ export default {
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
-        }
+        },
       },
       // 树形配置
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       // 组织人搜索列表00
       list: [],
@@ -1003,8 +1002,8 @@ export default {
           foremanName: null,
           sentryName: null,
           examineDate: null,
-          dialogue: null
-        }
+          dialogue: null,
+        },
       ],
       //添加对话框来访人员表格为空
       relatives: [
@@ -1013,8 +1012,8 @@ export default {
           name: null,
           relation: null,
           comeDate: null,
-          leaveDate: null
-        }
+          leaveDate: null,
+        },
       ],
       // 临时来队亲属
       relatives: [
@@ -1023,8 +1022,8 @@ export default {
           name: null,
           relation: null,
           comeDate: null,
-          leaveDate: null
-        }
+          leaveDate: null,
+        },
       ],
       // 搜索时间保存
       tiem: null,
@@ -1036,8 +1035,8 @@ export default {
           shouldArrive: null,
           realTo: null,
           percentage: null,
-          organizer: null
-        }
+          organizer: null,
+        },
       ],
       // 数据时间
       DataTime: "",
@@ -1057,7 +1056,7 @@ export default {
       weishenpi: "",
       // 数据时间的保存
       tiems: "",
-      centertext: null
+      centertext: null,
     };
   },
   // updated() {
@@ -1085,7 +1084,7 @@ export default {
       this.opens = false;
       this.statusShen = true;
       const id = row.id || this.ids;
-      getBdgldiary(id).then(response => {
+      getBdgldiary(id).then((response) => {
         this.wordInfo = response.data;
         this.title = "审批要事日记";
         this.menuRoleVisible = true;
@@ -1095,7 +1094,7 @@ export default {
     queDing() {
       this.wordInfo.examine = "1";
       if (this.wordInfo.id != null) {
-        updateBdglShenPi(this.wordInfo).then(response => {
+        updateBdglShenPi(this.wordInfo).then((response) => {
           this.menuRoleVisible = false;
           this.getList();
           this.getShuJu(this.timeDate);
@@ -1105,7 +1104,7 @@ export default {
     },
     // 获取部门数据
     getShuJu(data) {
-      exportBdgShuju(data).then(res => {
+      exportBdgShuju(data).then((res) => {
         this.DataTime = data;
         this.registrationData = res;
         this.cg = res.cg;
@@ -1124,7 +1123,7 @@ export default {
     },
     // 应到人数失去焦点触发
     yinDao() {
-      this.xunlian.forEach(item => {
+      this.xunlian.forEach((item) => {
         if (item.shouldArrive != null && item.realTo != null) {
           var str = ((item.realTo / item.shouldArrive) * 100).toFixed(2);
           str += "%";
@@ -1134,7 +1133,7 @@ export default {
     },
     // 实到人数失去焦点触发
     shiDao() {
-      this.xunlian.forEach(item => {
+      this.xunlian.forEach((item) => {
         if (item.shouldArrive != null && item.realTo != null) {
           var str = ((item.realTo / item.shouldArrive) * 100).toFixed(2);
           str += "%";
@@ -1156,7 +1155,7 @@ export default {
       let s = tiem.getSeconds();
       s = s < 10 ? "0" + s : s;
       let dateTime = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
-      getXunLian(id, dateTime).then(res => {
+      getXunLian(id, dateTime).then((res) => {
         console.log(res.data);
         this.xunlian = res.data;
         for (var i = 0; i < res.data.length; i++) {
@@ -1179,7 +1178,7 @@ export default {
     },
     /** 新增查询部门下拉树结构 */
     getTreeselect() {
-      getDept().then(response => {
+      getDept().then((response) => {
         this.rese = response.data;
       });
     },
@@ -1191,7 +1190,7 @@ export default {
         foremanName: null,
         sentryName: null,
         examineDate: null,
-        dialogue: null
+        dialogue: null,
       });
     },
 
@@ -1207,7 +1206,7 @@ export default {
         name: null,
         relation: null,
         comeDate: null,
-        leaveDate: null
+        leaveDate: null,
       });
     },
     //删除对话框临时来访人员
@@ -1217,7 +1216,7 @@ export default {
 
     // 获取外面部门树形
     treeselect() {
-      getWeiShu().then(res => {
+      getWeiShu().then((res) => {
         this.deptOptions = res.data;
       });
     },
@@ -1243,12 +1242,12 @@ export default {
         dutyD: null,
         dutyE: null,
         dutyF: null,
-        dutylead: null
+        dutylead: null,
       }),
         (this.relatives = [
           {
-            peopleId: null
-          }
+            peopleId: null,
+          },
         ]);
     },
     // 当点击完成值班时间的选择发起请求
@@ -1260,7 +1259,7 @@ export default {
     },
     // 获取实力情况
     getShiLiRen(id) {
-      getShiLi(id).then(res => {
+      getShiLi(id).then((res) => {
         this.form.orgcadre = res.data.ganbu;
         this.form.orgsoldier = res.data.shiBin;
         this.form.orgcivilian = res.data.wenZhi;
@@ -1285,19 +1284,19 @@ export default {
     },
     // 根据部门获取人员
     getRenYuan(id) {
-      getZhuChiRen(id).then(res => {
+      getZhuChiRen(id).then((res) => {
         this.renYuan = res.data;
       });
     },
     // 获取首长
     getShou(id) {
-      getUser(id).then(res => {
+      getUser(id).then((res) => {
         this.shouZhang = res.data;
       });
     },
     // 搜索第一个选中触发
     search() {
-      getZhuChiRen(this.queryParams.deptId).then(res => {
+      getZhuChiRen(this.queryParams.deptId).then((res) => {
         this.Renyuan = res.data;
       });
       this.getList();
@@ -1309,7 +1308,7 @@ export default {
     },
     // 字典查询
     getdict() {
-      getDicts(this.dictType.dictType).then(res => {
+      getDicts(this.dictType.dictType).then((res) => {
         // console.log(res);
         this.ziDian = res.data;
       });
@@ -1317,7 +1316,7 @@ export default {
     /** 查询要事日记列表 */
     getList() {
       this.loading = true;
-      listBdgldiary(this.queryParams).then(response => {
+      listBdgldiary(this.queryParams).then((response) => {
         this.bdgldiaryList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1370,7 +1369,7 @@ export default {
         peopleId1: null,
         contents: null,
         createId: null,
-        createName: null
+        createName: null,
       };
       (this.relatives = [
         {
@@ -1379,8 +1378,8 @@ export default {
           comeDate: null,
           leaveDate: null,
           peopleId: null,
-          peopleName: null
-        }
+          peopleName: null,
+        },
       ]),
         (this.checkShop = [
           {
@@ -1388,8 +1387,8 @@ export default {
             foremanName: null,
             sentryName: null,
             examineDate: null,
-            dialogue: null
-          }
+            dialogue: null,
+          },
         ]),
         (this.xunlian = [
           {
@@ -1398,8 +1397,8 @@ export default {
             shouldArrive: null,
             realTo: null,
             percentage: null,
-            organizer: null
-          }
+            organizer: null,
+          },
         ]),
         this.resetForm("form");
     },
@@ -1420,7 +1419,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;
     },
@@ -1442,7 +1441,7 @@ export default {
       this.getTreeselect();
       this.reset();
       const id = row.id || this.ids;
-      getBdgldiary(id).then(response => {
+      getBdgldiary(id).then((response) => {
         this.form = response.data;
         this.xunlian = response.data.weekworkRegisters;
         for (var i = 0; i < this.xunlian.length; i++) {
@@ -1484,7 +1483,7 @@ export default {
       this.opens = false;
       this.statusShen = false;
       const id = row.id || this.ids;
-      getBdgldiary(id).then(response => {
+      getBdgldiary(id).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看要事日记";
         this.menuRoleVisible = true;
@@ -1494,7 +1493,7 @@ export default {
     /** 提交按钮 */
     submitForm(style) {
       this.style = style;
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (
             (this.relatives[0].name ||
@@ -1513,7 +1512,7 @@ export default {
             this.form.inspect = this.checkShop;
           }
           if (this.form.id != null) {
-            updateBdgldiary(this.form).then(response => {
+            updateBdgldiary(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -1535,7 +1534,7 @@ export default {
             }
             // 训练计划
             this.form.weekworkRegisters = this.xunlian;
-            addBdgldiary(this.form).then(response => {
+            addBdgldiary(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1561,7 +1560,7 @@ export default {
       this.$modal
         // .confirm('是否确认删除要事日记编号为"' + ids + '"的数据项？')
         .confirm("是否确认删除该数据？")
-        .then(function() {
+        .then(function () {
           return delBdgldiary(ids);
         })
         .then(() => {
@@ -1579,13 +1578,13 @@ export default {
           this.exportLoading = true;
           return exportBdgldiary(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
-    }
-  }
+    },
+  },
 };
 </script>
 

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -93,10 +93,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitId" />
       <el-table-column label="军事主官" align="center" prop="id" />
       <el-table-column label="训练项目" align="center" prop="project" />
@@ -240,8 +242,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
-        
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
     <div class="fff">
@@ -489,7 +490,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除军事训练登记簿编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdgldrill(ids);
         })

src/views/grassrootsregistration/bdglequip/index.vue

@@ -330,8 +330,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
-        
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdgleven/index.vue

@@ -294,8 +294,8 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer" v-if="opens">
-         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <div class="fff">

src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -302,8 +302,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
-        
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
 

src/views/grassrootsregistration/bdglfood/index.vue

@@ -1082,8 +1082,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
-        
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -198,154 +198,153 @@
       width="1016px"
       append-to-body
       :close-on-click-modal="false"
-    ><div class="userAgree">
-      <div class="jiben">基本信息</div>
+      ><div class="userAgree">
+        <div class="jiben">基本信息</div>
 
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
-        <el-form-item label="单位" prop="unitId">
-          <treeselect
-            v-model="form.unitId"
-            :options="deptOptions"
-            placeholder="请选择单位"
-            @select="selectPeo"
-            @open="blurSelect"
-          />
-        </el-form-item>
-        <el-form-item label="召开时间" prop="convokeTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.convokeTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择召开时间"
-            :editable="false"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="召开地点" prop="address" class="address">
-          <el-input v-model="form.address" placeholder="请输入召开地点" />
-        </el-form-item>
-        <el-form-item label="主持人" prop="compereId">
-          <el-select
-            v-model="form.compereId"
-            placeholder="请选择主持人"
-            ref="headerSearchSelect"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              :disabled="item.status == 1"
-              @click.native="compere(item.name)"
-              class="input_xiala"
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          :inline="true"
+        >
+          <el-form-item label="单位" prop="unitId">
+            <treeselect
+              v-model="form.unitId"
+              :options="deptOptions"
+              placeholder="请选择单位"
+              @select="selectPeo"
+              @open="blurSelect"
+            />
+          </el-form-item>
+          <el-form-item label="召开时间" prop="convokeTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.convokeTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择召开时间"
+              :editable="false"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="记录人" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请选择记录人">
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="people(item.name)"
-              class="input_xiala"
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="召开地点" prop="address" class="address">
+            <el-input v-model="form.address" placeholder="请输入召开地点" />
+          </el-form-item>
+          <el-form-item label="主持人" prop="compereId">
+            <el-select
+              v-model="form.compereId"
+              placeholder="请选择主持人"
+              ref="headerSearchSelect"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="会议议题" prop="title">
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                :disabled="item.status == 1"
+                @click.native="compere(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="记录人" prop="peopleId">
+            <el-select v-model="form.peopleId" placeholder="请选择记录人">
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                @click.native="people(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="会议议题" prop="title">
           <el-input v-model="form.title" placeholder="请输入会议议题" />
         </el-form-item> -->
 
-        <el-form-item label="参加人" prop="joinId" class="joinId">
-          <el-select
-            ref="aa"
-            v-model="form.joinId"
-            multiple
-            placeholder="请选择参加人"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.name"
-              class="input_xiala"
+          <el-form-item label="参加人" prop="joinId" class="joinId">
+            <el-select
+              ref="aa"
+              v-model="form.joinId"
+              multiple
+              placeholder="请选择参加人"
             >
-              {{ item.name }}
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="列席人" prop="peopleIds" class="joinId">
-          <el-select
-            ref="bb"
-            v-model="form.peopleIds"
-            multiple
-            placeholder="请选择列席人"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.name"
-              class="input_xiala"
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+                {{ item.name }}
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="列席人" prop="peopleIds" class="joinId">
+            <el-select
+              ref="bb"
+              v-model="form.peopleIds"
+              multiple
+              placeholder="请选择列席人"
             >
-              {{ item.name }}
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="缺席人" prop="absentIds" class="joinId">
-          <el-select
-            ref="cc"
-            v-model="form.absentIds"
-            multiple
-            placeholder="请选择缺席人"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.name"
-              class="input_xiala"
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+                {{ item.name }}
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="缺席人" prop="absentIds" class="joinId">
+            <el-select
+              ref="cc"
+              v-model="form.absentIds"
+              multiple
+              placeholder="请选择缺席人"
             >
-              {{ item.name }}
-            </el-option>
-          </el-select>
-        </el-form-item>
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+                {{ item.name }}
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-        <div class="jiben">会议议题</div>
-        <quill-editor
-          class="quill-editor"
-          ref="myTextEditor"
-          v-model="form.title"
-          style="height: 150px; width: 920px; 
+          <div class="jiben">会议议题</div>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            v-model="form.title"
+            style="height: 150px; width: 920px; 
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-        ></quill-editor>
+          ></quill-editor>
 
-        <div class="jiben">会议内容</div>
-        <quill-editor
-          class="quill-editor"
-          ref="myTextEditor"
-          v-model="form.contents"
-          style="height: 150px; width: 920px; 
+          <div class="jiben">会议内容</div>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            v-model="form.contents"
+            style="height: 150px; width: 920px; 
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-        ></quill-editor>
-      </el-form>
-</div>
+          ></quill-editor>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
-        
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdglparty/index.vue

@@ -324,8 +324,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
-        
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
     <el-dialog

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -268,8 +268,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
-        
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
 

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -100,10 +100,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="deptName" />
       <el-table-column label="分类" align="center" prop="kind" />
       <el-table-column label="编号" align="center" prop="number" />
@@ -314,8 +316,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
-        
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
     <div class="fff">
@@ -609,7 +610,7 @@ export default {
       this.getdict();
       this.form.unitId = row.unitId;
       this.getZhuChi(this.form.unitId);
-      this.reset()
+      this.reset();
       this.getTreeselect();
       const id = row.id || this.ids;
       getBdglsecrecy(id).then((response) => {
@@ -659,7 +660,7 @@ export default {
         // .confirm(
         //   '是否确认删除网络/手机/涉密载体登记本编号为"' + ids + '"的数据项？'
         // )
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglsecrecy(ids);
         })

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -178,149 +178,148 @@
       append-to-body
       :close-on-click-modal="false"
     >
-    <div class="userAgree">
-      <div class="jiben">基本信息</div>
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
-        <el-table-column type="selection" width="55" align="center" />
-        <el-form-item label="单位" prop="unitId">
-          <treeselect
-            v-model="form.unitId"
-            :options="deptOptions"
-            placeholder="请选择单位"
-            @select="selectPeo"
-            @open="blurSelect"
-          />
-        </el-form-item>
-        <el-form-item label="召开时间" prop="convokeTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.convokeTime"
-            type="date"
-            :editable="false"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择召开时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="召开地点" prop="address">
-          <el-input v-model="form.address" placeholder="请输入召开地点" />
-        </el-form-item>
-        <el-form-item label="主持人" prop="compereId">
-          <el-select
-            ref="aa"
-            v-model="form.compereId"
-            placeholder="请选择主持人"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="zhuChi(item.name)"
-              class="input_xiala"
+      <div class="userAgree">
+        <div class="jiben">基本信息</div>
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          :inline="true"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-form-item label="单位" prop="unitId">
+            <treeselect
+              v-model="form.unitId"
+              :options="deptOptions"
+              placeholder="请选择单位"
+              @select="selectPeo"
+              @open="blurSelect"
+            />
+          </el-form-item>
+          <el-form-item label="召开时间" prop="convokeTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.convokeTime"
+              type="date"
+              :editable="false"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择召开时间"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="记录人" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请选择记录人">
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="jiLu(item.name)"
-              class="input_xiala"
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="召开地点" prop="address">
+            <el-input v-model="form.address" placeholder="请输入召开地点" />
+          </el-form-item>
+          <el-form-item label="主持人" prop="compereId">
+            <el-select
+              ref="aa"
+              v-model="form.compereId"
+              placeholder="请选择主持人"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="会议议题" prop="title">
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                @click.native="zhuChi(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="记录人" prop="peopleId">
+            <el-select v-model="form.peopleId" placeholder="请选择记录人">
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                @click.native="jiLu(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="会议议题" prop="title">
           <el-input v-model="form.title" placeholder="请输入会议议题" />
         </el-form-item> -->
-        <el-form-item label="参加人" prop="joinId" class="joinId">
-          <el-select
-            ref="bb"
-            v-model="form.joinId"
-            multiple
-            placeholder="请选择参加人"
-          >
-            <el-option
-              v-for="item in renYuan"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
-              class="input_xiala"
+          <el-form-item label="参加人" prop="joinId" class="joinId">
+            <el-select
+              ref="bb"
+              v-model="form.joinId"
+              multiple
+              placeholder="请选择参加人"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="列席人" prop="peopleIds" class="joinId">
-          <el-select
-            ref="cc"
-            v-model="form.peopleIds"
-            multiple
-            placeholder="请选择列席人"
-          >
-            <el-option
-              v-for="item in renYuan"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
-              class="input_xiala"
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="列席人" prop="peopleIds" class="joinId">
+            <el-select
+              ref="cc"
+              v-model="form.peopleIds"
+              multiple
+              placeholder="请选择列席人"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="缺席人" prop="absentIds" class="joinId">
-          <el-select
-            ref="dd"
-            v-model="form.absentIds"
-            multiple
-            placeholder="请选择缺席人"
-          >
-            <el-option
-              v-for="item in renYuan"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
-              class="input_xiala"
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="缺席人" prop="absentIds" class="joinId">
+            <el-select
+              ref="dd"
+              v-model="form.absentIds"
+              multiple
+              placeholder="请选择缺席人"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-        <div class="jiben">会议议题</div>
-        <quill-editor
-          class="quill-editor"
-          ref="myTextEditor"
-          v-model="form.title"
-          style="height: 150px; width: 920px; 
+          <div class="jiben">会议议题</div>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            v-model="form.title"
+            style="height: 150px; width: 920px; 
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-        ></quill-editor>
+          ></quill-editor>
 
-        <div class="jiben">会议内容</div>
-        <quill-editor
-          class="quill-editor"
-          ref="myTextEditor"
-          v-model="form.contents"
-          style="height: 150px; width: 920px; 
+          <div class="jiben">会议内容</div>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            v-model="form.contents"
+            style="height: 150px; width: 920px; 
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-        ></quill-editor>
-      </el-form>
+          ></quill-editor>
+        </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
+        <el-button @click="cancel" size="btn">取消</el-button>
 
-        
         <!-- <el-button @click="cancel">取 消</el-button> -->
       </div>
     </el-dialog>

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -310,7 +310,7 @@
                   value-format="yyyy-MM-dd"
                   placeholder="选择时间"
                   @change="
-                    val => {
+                    (val) => {
                       change_time(val, i);
                     }
                   "
@@ -443,8 +443,8 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="resertwo" size="btn">重置</el-button>
       </div>
     </el-dialog>
     <!-- 查看 -->
@@ -474,7 +474,7 @@ import {
   addBdglweekwork,
   updateBdglweekwork,
   exportBdglweekwork,
-  exportBdglgetWeekWork
+  exportBdglgetWeekWork,
 } from "@/api/grassrootsregistration/bdglweekwork";
 
 import Treeselect from "@riophae/vue-treeselect";
@@ -482,7 +482,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {
   getZhuChiRen,
   getDept,
-  getShouBu
+  getShouBu,
 } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Bdglweekwork",
@@ -525,18 +525,18 @@ export default {
         peopleId2: null,
         time: null,
         unitId: null,
-        adminId: null
+        adminId: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         unitId: [
-          { required: true, message: "单位名称不能为空", trigger: "change" }
+          { required: true, message: "单位名称不能为空", trigger: "change" },
         ],
         startTime: [
-          { required: true, message: "时间不能为空", trigger: "change" }
-        ]
+          { required: true, message: "时间不能为空", trigger: "change" },
+        ],
       },
       //下拉s
       options: [],
@@ -549,51 +549,51 @@ export default {
       week: [
         {
           value: "选项1",
-          label: "星期一"
+          label: "星期一",
         },
         {
           value: "选项2",
-          label: "星期二"
+          label: "星期二",
         },
         {
           value: "选项3",
-          label: "星期三"
+          label: "星期三",
         },
         {
           value: "选项4",
-          label: "星期四"
+          label: "星期四",
         },
         {
           value: "选项5",
-          label: "星期五"
+          label: "星期五",
         },
         {
           value: "选项6",
-          label: "星期六"
+          label: "星期六",
         },
         {
           value: "选项7",
-          label: "星期日"
-        }
+          label: "星期日",
+        },
       ],
       //早中晚选中
       day: [
         {
           value: "选项1",
-          label: "早晨"
+          label: "早晨",
         },
         {
           value: "选项2",
-          label: "上午"
+          label: "上午",
         },
         {
           value: "选项3",
-          label: "下午"
+          label: "下午",
         },
         {
           value: "选项4",
-          label: "晚上"
-        }
+          label: "晚上",
+        },
       ],
       //  树形列表
       deptOptions: [],
@@ -611,8 +611,8 @@ export default {
           peopleIds: null,
           address: null,
           contents: null,
-          organizer:null,
-        }
+          organizer: null,
+        },
       ],
       // 搜索单位列表
       deptOptionss: [],
@@ -626,8 +626,8 @@ export default {
       option: {
         start: "06:00",
         step: "00:30",
-        end: "08:00"
-      }
+        end: "08:00",
+      },
     };
   },
   created() {
@@ -648,7 +648,7 @@ export default {
         peopleIds: null,
         address: null,
         contents: null,
-        organizer:null,
+        organizer: null,
       });
     },
     //点击删除工作登记
@@ -677,7 +677,7 @@ export default {
     },
     // 查询单位列表
     getDept() {
-      getShouBu().then(res => {
+      getShouBu().then((res) => {
         this.deptOptionss = res.data;
       });
     },
@@ -695,7 +695,7 @@ export default {
     },
     // 获取人员
     ZhuChiRen(id) {
-      getZhuChiRen(id).then(res => {
+      getZhuChiRen(id).then((res) => {
         this.renYuan = res.data;
       });
     },
@@ -721,7 +721,7 @@ export default {
         this.form.endTime != null
       ) {
         this.form.bdglWeekworkRegisterList = null;
-        exportBdglgetWeekWork(this.form).then(res => {
+        exportBdglgetWeekWork(this.form).then((res) => {
           this.code = res.code;
           if (res.code == 200) {
             this.$modal.msgWarning(res.msg);
@@ -737,7 +737,7 @@ export default {
         this.form.endTime != null
       ) {
         this.form.bdglWeekworkRegisterList = null;
-        exportBdglgetWeekWork(this.form).then(res => {
+        exportBdglgetWeekWork(this.form).then((res) => {
           this.code = res.code;
           if (res.code == 200) {
             this.$modal.msgWarning(res.msg);
@@ -754,7 +754,7 @@ export default {
       ) {
         this.form.unitName = null;
         this.form.bdglWeekworkRegisterList = null;
-        exportBdglgetWeekWork(this.form).then(res => {
+        exportBdglgetWeekWork(this.form).then((res) => {
           console.log(res.code);
           this.code = res.code;
           if (res.code == 200) {
@@ -765,14 +765,14 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      getDept().then(response => {
+      getDept().then((response) => {
         this.deptOptions = response.data;
       });
     },
     /** 查询一周工作安排列表 */
     getList() {
       this.loading = true;
-      listBdglweekwork(this.queryParams).then(response => {
+      listBdglweekwork(this.queryParams).then((response) => {
         this.bdglweekworkList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -810,7 +810,7 @@ export default {
         department: null,
         personnel: null,
         place: null,
-        content: null
+        content: null,
       };
       // 一周工作安排字段
       (this.tomList = [
@@ -824,8 +824,8 @@ export default {
           peopleIds: null,
           address: null,
           contents: null,
-          organizer:null
-        }
+          organizer: null,
+        },
       ]),
         this.resetForm("refform");
     },
@@ -846,7 +846,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;
     },
@@ -865,7 +865,7 @@ export default {
       this.form.unitId = row.unitId;
       this.ZhuChiRen(this.form.unitId);
       const id = row.id || this.ids;
-      getBdglweekwork(id).then(response => {
+      getBdglweekwork(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改一周工作安排";
@@ -878,7 +878,7 @@ export default {
       // 是否隐藏按钮
       this.opens = false;
       const id = row.id || this.ids;
-      getBdglweekwork(id).then(response => {
+      getBdglweekwork(id).then((response) => {
         this.wordInfo = response.data;
         console.log(this.wordInfo);
         this.title = "查看一周工作安排";
@@ -891,11 +891,11 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["refform"].validate(valid => {
+      this.$refs["refform"].validate((valid) => {
         if (valid) {
           this.form.bdglWeekworkRegisterList = this.tomList;
           if (this.form.id != null) {
-            updateBdglweekwork(this.form).then(response => {
+            updateBdglweekwork(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -904,7 +904,7 @@ export default {
             this.form.bdglWeekworkRegisterList = this.tomList;
             if (this.code != 200) {
               if (this.form.unitId) {
-                addBdglweekwork(this.form).then(response => {
+                addBdglweekwork(this.form).then((response) => {
                   this.$modal.msgSuccess("新增成功");
                   this.open = false;
                   this.getList();
@@ -921,7 +921,7 @@ export default {
       this.$modal
         // .confirm('是否确认删除一周工作安排编号为"' + ids + '"的数据项？')
         .confirm("是否确认删除该数据？")
-        .then(function() {
+        .then(function () {
           return delBdglweekwork(ids);
         })
         .then(() => {
@@ -939,7 +939,7 @@ export default {
           this.exportLoading = true;
           return exportBdglweekwork(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -960,8 +960,8 @@ export default {
         this.option.start = "18:00";
         this.option.end = "23:00";
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/views/grassrootsregistration/statistics/index.vue

@@ -44,14 +44,14 @@
         />
       </el-form-item> -->
       <!-- <el-form-item> -->
-        <!-- <el-button
+      <!-- <el-button
           type="primary"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <!-- <el-button size="btr" @click="resetQuery">重置</el-button>
+      <!-- <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item> -->
     </el-form>
 
@@ -117,10 +117,12 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位名称" align="center" prop="id" />
       <el-table-column label="单位" align="center" prop="unitId" />
       <el-table-column label="应到" align="center" prop="shouldBeTo" />
@@ -166,7 +168,13 @@
     />
 
     <!-- 添加或修改军事训练月统计班对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="450px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="450px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <div class="jiben">基本信息</div>
 
       <el-form
@@ -176,7 +184,6 @@
         label-width="80px"
         append-to-body
         :inline="true"
-
       >
         <el-form-item label="单位" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入单位" />
@@ -193,7 +200,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -362,7 +369,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除该数据项？')
+        .confirm("是否确认删除该数据项？")
         .then(function () {
           return delStatistics(ids);
         })
@@ -411,7 +418,7 @@ export default {
   color: #fff;
   width: 100px !important;
 }
-::v-deep .el-dialog  .el-input__inner {
+::v-deep .el-dialog .el-input__inner {
   width: 260px !important;
   height: 36px;
   background: transparent;
@@ -443,7 +450,7 @@ export default {
   padding-top: 20px !important;
   box-sizing: border-box;
 }
-.el-dialog__body .el-form-item{
+.el-dialog__body .el-form-item {
   margin-left: -23px;
 }
 /* 底部确定取消按钮 */
@@ -452,8 +459,8 @@ export default {
   margin-right: 54px;
 }
 ::v-deep .el-input--small .el-input__inner {
-    height: 36px;
-    line-height: 36px;
+  height: 36px;
+  line-height: 36px;
 }
 /* 调整输入框提示文字颜色 */
 ::v-deep .vue-treeselect__placeholder {

src/views/materialManagement/archives/index.vue

@@ -54,24 +54,31 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="" prop="responsibilityUnit">
+      <!-- <el-form-item label="" prop="responsibilityUnit">
         <el-select
           v-model="queryParams.responsibilityUnit"
           placeholder="请选择责任单位"
           clearable
           size="small"
         >
-          <!-- <el-option label="请选择字典生成" value="" /> -->
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="" prop="personLiable">
         <el-select
           v-model="queryParams.personLiable"
           placeholder="请选择责任人"
           clearable
           size="small"
+          @change="handleQuery"
         >
-          <!-- <el-option label="请选择字典生成" value="" /> -->
+          <el-option
+            v-for="item in renYuans"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"
+            class="input_xiala"
+          >
+          </el-option>
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="总数量" prop="materialTotal">
@@ -138,9 +145,9 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery"
+        <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -236,15 +243,15 @@
         prop="responsibilityUnit"
       />
       <el-table-column label="责任人" align="center" prop="personLiable" />
-      <!-- <el-table-column label="总数量" align="center" prop="materialTotal" />
+      <el-table-column label="总数量" align="center" prop="materialTotal" />
       <el-table-column
         label="库存数量"
         align="center"
         prop="materialInventory"
       />
       <el-table-column label="在用数量" align="center" prop="inUseTotal" />
-      <el-table-column label="创建人" align="center" prop="createName" />
-      <el-table-column label="库房" align="center" prop="warehouse" />
+      <el-table-column label="创建人" align="center" prop="userName" />
+      <!-- <el-table-column label="库房" align="center" prop="warehouse" />
       <el-table-column label="单位id" align="center" prop="unitId" />
       <el-table-column label="责任人id" align="center" prop="personLiableId" /> -->
       <el-table-column
@@ -327,9 +334,9 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="责任单位" prop="responsibilityUnit">
+        <el-form-item label="责任单位" prop="unitId">
           <treeselect
-            v-model="form.responsibilityUnit"
+            v-model="form.unitId"
             placeholder="请选择责任单位"
             :options="deptOptions"
             @select="shuxing"
@@ -337,8 +344,8 @@
           <!-- <el-option label="请选择字典生成" value="" /> -->
         </el-form-item>
 
-        <el-form-item label="责任人" prop="personLiable">
-          <el-select v-model="form.personLiable" placeholder="请选择责任人">
+        <el-form-item label="责任人" prop="personLiableId">
+          <el-select v-model="form.personLiableId" placeholder="请选择责任人">
             <el-option
               class="input_xiala"
               v-for="(item, i) in renYuan"
@@ -402,6 +409,7 @@ import {
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Archives",
   components: {
@@ -457,12 +465,21 @@ export default {
       deptOptions: [],
       // 人员列表
       renYuan: [],
+      // 外面的人员
+      renYuans: [],
     };
   },
   created() {
     this.getList();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
     // 点击责任人触发
     xingMing(name) {
       this.form.personLiable = name;
@@ -475,9 +492,8 @@ export default {
     },
     // 点击单位触发
     shuxing(data) {
-      console.log(data);
       this.form.unitId = data.id;
-      this.form.unitName = data.label;
+      this.form.responsibilityUnit = data.label;
       this.getRenYuan(this.form.unitId);
     },
     // 获取人员
@@ -486,10 +502,6 @@ export default {
         this.renYuan = res.data;
       });
     },
-    // 点击人员触发
-    xingMing(name) {
-      this.form.peopleName = name;
-    },
 
     /** 查询物资档案列表 */
     getList() {
@@ -557,6 +569,8 @@ export default {
       const id = row.id || this.ids;
       getArchives(id).then((response) => {
         this.form = response.data;
+        this.form.unitId = response.data.unitId;
+        this.getRenYuan(this.form.unitId);
         this.open = true;
         this.title = "修改物资档案";
       });
@@ -616,7 +630,7 @@ export default {
 <style scoped>
 /* 对话框背景颜色 */
 ::v-deep .el-dialog {
-  width: 1016px !important;
+  width: 800px !important;
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
@@ -655,7 +669,7 @@ export default {
   width: 200px;
 }
 ::v-deep .el-dialog__footer {
-  margin-right: 6px !important;
+  margin-right: 94px !important;
 }
 .contents {
   padding: 0px 40px !important;
@@ -664,12 +678,13 @@ export default {
   width: 115px !important;
 }
 ::v-deep .el-dialog__body {
-  padding: 30px 0px 30px 26px !important;
+  padding: 30px 0px 30px 44px !important;
 }
-::v-deep .vue-treeselect__single-value{
+::v-deep .vue-treeselect__single-value {
   color: #fff !important;
 }
-::v-deep .el-form .el-input__inner{
+::v-deep .el-form .el-input__inner {
   height: 36px !important;
+  color: #fff;
 }
 </style>

src/views/materialManagement/distribution/index.vue

@@ -405,7 +405,7 @@
       append-to-body
       :close-on-click-modal="false"
     >
-     <div class="jiben">基本信息</div>
+      <div class="jiben">基本信息</div>
       <el-form
         ref="form"
         :model="form"
@@ -426,6 +426,15 @@
         <el-form-item label="物品名称" prop="name">
           <el-select v-model="form.name" placeholder="请选择物品名称">
             <!-- <el-option label="请选择字典生成" value="" /> -->
+            <el-option
+              v-for="(item, i) in itemlist"
+              :key="i"
+              :value="item.name"
+              :label="item.name"
+              class="input_xiala"
+              @click.native="wuPing(item)"
+            >
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="物资规格" prop="materialSpecification">
@@ -452,11 +461,11 @@
             v-model="form.storageLocation"
             placeholder="请输入存放位置"
           />
-          </el-form-item>
-          <el-form-item label="现有数量" prop="total">
-            <el-input v-model="form.total" placeholder="请输入现有数量" />
-          </el-form-item>
-        
+        </el-form-item>
+        <el-form-item label="现有数量" prop="total">
+          <el-input v-model="form.total" placeholder="请输入现有数量" />
+        </el-form-item>
+
         <el-form-item label="出库数量" prop="putOut">
           <el-input v-model="form.putOut" placeholder="请输入出库数量" />
         </el-form-item>
@@ -486,9 +495,13 @@
           <el-input v-model="form.price" placeholder="请输入价值" />
         </el-form-item>
         <el-form-item label="发放单位" prop="outUnit">
-          <el-select v-model="form.outUnit" placeholder="请选择发放单位">
-            <!-- <el-option label="请选择字典生成" value="" /> -->
-          </el-select>
+          <!-- <el-select v-model="form.outUnit" placeholder="请选择发放单位"> -->
+          <treeselect
+            v-model="form.outUnit"
+            placeholder="请选择责任单位"
+            :options="deptOptions"
+            @select="shuxing"
+          ></treeselect>
         </el-form-item>
         <el-form-item label="发放对象" prop="outPeople">
           <el-select v-model="form.outPeople" placeholder="请选择发放对象">
@@ -505,7 +518,7 @@
             <!-- <el-option label="请选择字典生成" value="" /> -->
           </el-select>
         </el-form-item>
-         <div class="jiben">备注</div>
+        <div class="jiben">备注</div>
         <el-form-item label="" prop="remark">
           <el-input
             v-model="form.remark"
@@ -564,8 +577,19 @@ import {
   updateDistribution,
   exportDistribution,
 } from "@/api/materialManagement/distribution";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {
+  listArchives,
+  getDept,
+  getZhuChiRen,
+} from "@/api/materialManagement/archives";
 
 export default {
+  components: {
+    Treeselect,
+  },
   name: "Distribution",
   dicts: ["category", "camp_equipment", "storage_room", "distribution_object"],
   data() {
@@ -619,12 +643,48 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 获取物品名称列表
+      itemlist: [],
+      // 树形单位
+      deptOptions: [],
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    // 点击单位触发
+    shuxing(data) {
+      this.form.unitId = data.id;
+      this.form.responsibilityUnit = data.label;
+      this.getRenYuan(this.form.unitId);
+    },
+    // 获取人员
+    getRenYuan(id) {
+      getZhuChiRen(id).then((res) => {
+        this.renYuan = res.data;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      getDept().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 点击物品名称触发
+    wuPing(data) {
+      console.log(data);
+      this.form.archivesId = data.id;
+      this.form.responsibilityUnit = data.responsibilityUnit;
+      this.form.personLiable = data.personLiable;
+      // this.form.yingJuType = data.yingJuType;
+    },
+    // 获取物品名称
+    getMingCheng() {
+      listArchives().then((response) => {
+        this.itemlist = response.rows;
+      });
+    },
     /** 查询物资发放列表 */
     getList() {
       this.loading = true;
@@ -686,6 +746,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.getTreeselect();
+      this.getMingCheng();
       this.reset();
       this.open = true;
       this.title = "添加物资发放";
@@ -805,7 +867,7 @@ export default {
 ::v-deep .el-dialog__body {
   padding: 30px 0px 30px 26px !important;
 }
-::v-deep .el-form .el-input__inner{
+::v-deep .el-form .el-input__inner {
   height: 36px !important;
 }
 </style>

src/views/materialManagement/materialRegistration/index.vue

@@ -60,7 +60,7 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="" prop="responsibilityUnit">
+      <!-- <el-form-item label="" prop="responsibilityUnit">
         <el-input
           v-model="queryParams.responsibilityUnit"
           placeholder="请输入责任单位"
@@ -68,15 +68,24 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="" prop="personLiable">
-        <el-input
+        <el-select
           v-model="queryParams.personLiable"
-          placeholder="请输入责任人"
+          placeholder="请选择责任人"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in renYuans"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"
+            class="input_xiala"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="入库数量" prop="putInt">
         <el-input
@@ -170,9 +179,9 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery"
+        <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -239,14 +248,14 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
-      <el-table-column label="物品类型" align="center" prop="wuPinType">
+      <!-- <el-table-column label="物品类型" align="center" prop="wuPinType">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.category"
             :value="scope.row.wuPinType"
           />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="物品名称" align="center" prop="name" />
       <el-table-column
         label="物资规格"
@@ -254,13 +263,20 @@
         prop="materialSpecification"
       />
       <el-table-column label="物资型号" align="center" prop="materialXh" />
-      <el-table-column label="营具类型" align="center" prop="yingJuType" />
+      <!-- <el-table-column label="营具类型" align="center" prop="yingJuType">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.camp_equipment"
+            :value="scope.row.yingJuType"
+          />
+        </template>
+      </el-table-column> -->
       <!-- <el-table-column
         label="责任单位"
         align="center"
         prop="responsibilityUnit"
       /> -->
-      <!-- <el-table-column label="责任人" align="center" prop="personLiable" /> -->
+      <el-table-column label="责任人" align="center" prop="personLiable" />
       <el-table-column label="入库数量" align="center" prop="putInt" />
       <!-- <el-table-column label="创建人" align="center" prop="createName" /> -->
       <el-table-column
@@ -273,8 +289,8 @@
           <span>{{ parseTime(scope.row.storageTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="入库编号" align="center" prop="inboundNo" />
-      <el-table-column label="存放位置" align="center" prop="storageLocation" />
+      <!-- <el-table-column label="入库编号" align="center" prop="inboundNo" /> -->
+      <!-- <el-table-column label="存放位置" align="center" prop="storageLocation" /> -->
       <el-table-column
         label="购买时间"
         align="center"
@@ -286,17 +302,17 @@
         </template>
       </el-table-column>
       <el-table-column label="价值" align="center" prop="price" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="库房" align="center" prop="warehouse">
+      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+      <!-- <el-table-column label="库房" align="center" prop="warehouse">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.storage_room"
             :value="scope.row.warehouse"
           />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column label="档案id" align="center" prop="archivesId" /> -->
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -318,7 +334,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -358,6 +374,15 @@
         <el-form-item label="物品名称" prop="name">
           <el-select v-model="form.name" placeholder="请选择物品名称">
             <!-- <el-option label="请选择字典生成" value="" /> -->
+            <el-option
+              v-for="(item, i) in itemlist"
+              :key="i"
+              :value="item.name"
+              :label="item.name"
+              class="input_xiala"
+              @click.native="wuPing(item)"
+            >
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="物资规格" prop="materialSpecification">
@@ -465,10 +490,13 @@ import {
   updateMaterialRegistration,
   exportMaterialRegistration,
 } from "@/api/materialManagement/materialRegistration";
+import { listArchives } from "@/api/materialManagement/archives";
+// 所有人员
+import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "MaterialRegistration",
-  dicts: ["category", "storage_room"],
+  dicts: ["category", "storage_room", "camp_equipment"],
   data() {
     return {
       // 遮罩层
@@ -516,12 +544,37 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 获取物品名称列表
+      itemlist: [],
+      // 外面的人员
+      renYuans: [],
     };
   },
   created() {
     this.getList();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
+    // 点击物品名称触发
+    wuPing(data) {
+      console.log(data);
+      this.form.archivesId = data.id;
+      this.form.responsibilityUnit = data.responsibilityUnit;
+      this.form.personLiable = data.personLiable;
+      this.form.yingJuType = data.yingJuType;
+    },
+    // 获取物品名称
+    getMingCheng() {
+      listArchives().then((response) => {
+        this.itemlist = response.rows;
+      });
+    },
     /** 查询物资入库登记列表 */
     getList() {
       this.loading = true;
@@ -579,6 +632,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.getMingCheng();
       this.reset();
       this.open = true;
       this.title = "添加物资入库登记";
@@ -698,7 +752,8 @@ export default {
 ::v-deep .el-dialog__body {
   padding: 30px 0px 30px 26px !important;
 }
-::v-deep .el-form .el-input__inner{
+::v-deep .el-form .el-input__inner {
   height: 36px !important;
+  color: #fff;
 }
 </style>