新增单身干部宿舍

src/api/barracksManagement/scadred.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询单身干部宿舍列表
+export function listDorm(query) {
+    return request({
+        url: '/system/dorm/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询单身干部宿舍详细
+export function getDorm(id) {
+    return request({
+        url: '/system/dorm/' + id,
+        method: 'get'
+    })
+}
+
+// 新增单身干部宿舍
+export function addDorm(data) {
+    return request({
+        url: '/system/dorm',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改单身干部宿舍
+export function updateDorm(data) {
+    return request({
+        url: '/system/dorm',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除单身干部宿舍
+export function delDorm(id) {
+    return request({
+        url: '/system/dorm/' + id,
+        method: 'delete'
+    })
+}

src/assets/styles/global.css

@@ -927,13 +927,12 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
   display: none;
 }
 
-.el-tooltip__popper {
+/* .el-tooltip__popper {
   width: 300px !important;
   height: auto !important;
   letter-spacing: .2em;
-  /* text-align: center; */
   text-indent: 2em;
-}
+} */
 
 /* 主页左侧导航栏 */
 .nest-menu li {

src/components/look_word/bdgleven.vue

@@ -11,7 +11,6 @@
           margin-botttom: 30px;
           color: black;
           text-align: center;
-          margin-top: -12px;
         "
       >
         《连务会记录本》
@@ -40,7 +39,7 @@
             <td
               width="70"
               class="JR_left"
-              style="border-right: 1px solid #111; font-family: 'heiti'"
+              style="border-right: 1px dashed #999; font-family: 'heiti'"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;&nbsp;&nbsp;&nbsp;间</p>
             </td>
@@ -210,7 +209,7 @@ export default {
     return {
       title: "连务会记录本",
       style:
-        ".size{width:99%};.JR_tr {height: 40px;};.JR_left{border-right:1px solid black;;width: 80px;font-size: 1.131em; font-family: '楷体_GB2312';font-weight: 500;};.JR_right{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right};",
+        ".size{width:99%};.JR_tr {height: 40px;};.JR_left{border-right:none;width: 80px;font-size: 1.131em; font-family: '楷体_GB2312';font-weight: 500;};.JR_right{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right};",
     };
   },
   methods: {

src/components/look_word/bdglparty.vue

@@ -47,7 +47,7 @@
             <td
               width="110"
               class="JR_left"
-              style="border-right: 1px dashed #999; font-family: 'kaiti'"
+              style="border-right: none; font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;间：</p>
             </td>
@@ -55,7 +55,7 @@
               align="left"
               class="JR_right"
               style="
-                border-left: 1px dashed #999;
+                border-left: none;
                 padding-left: 20px;
                 font-family: 'fangsong';
               "
@@ -67,7 +67,7 @@
             <td
               align="left"
               class="JR_left"
-              style="border-right: 1px dashed #999; font-family: 'kaiti'"
+              style="border-right: none; font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;地 &nbsp;点：</p>
             </td>
@@ -75,7 +75,7 @@
               align="left"
               class="JR_right"
               style="
-                border-left: 1px dashed #999;
+                border-left: none;
                 padding-left: 20px;
                 font-family: 'fangsong';
               "
@@ -86,7 +86,7 @@
           <tr class="JR_tr">
             <td
               class="JR_left"
-              style="border-right: 1px dashed #999; font-family: 'kaiti'"
+              style="border-right: none; font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;主持人：</p>
             </td>
@@ -94,7 +94,7 @@
               align="left"
               class="JR_right"
               style="
-                border-left: 1px dashed #999;
+                border-left: none;
                 padding-left: 20px;
                 font-family: 'fangsong';
               "
@@ -105,7 +105,7 @@
           <tr class="JR_tr">
             <td
               class="JR_left"
-              style="border-right: 1px dashed #999; font-family: 'kaiti'"
+              style="border-right: none; font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;参加人：</p>
             </td>
@@ -113,7 +113,7 @@
               align="left"
               class="JR_right"
               style="
-                border-left: 1px dashed #999;
+                border-left: none;
                 padding-left: 20px;
                 font-family: 'fangsong';
               "
@@ -124,7 +124,7 @@
           <tr class="JR_tr">
             <td
               class="JR_left"
-              style="border-right: 1px dashed #999; font-family: 'kaiti'"
+              style="border-right: none; font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;列席人：</p>
             </td>
@@ -132,7 +132,7 @@
               align="left"
               class="JR_right"
               style="
-                border-left: 1px dashed #999;
+                border-left: none;
                 padding-left: 20px;
                 font-family: 'fangsong';
               "
@@ -143,7 +143,7 @@
           <tr class="JR_tr">
             <td
               class="JR_left"
-              style="border-right: 1px dashed #999; font-family: 'kaiti'"
+              style="border-right: none; font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;缺席人：</p>
             </td>
@@ -151,7 +151,7 @@
               align="left"
               class="JR_right"
               style="
-                border-left: 1px dashed #999;
+                border-left: none;
                 padding-left: 20px;
                 font-family: 'fangsong';
               "
@@ -162,7 +162,7 @@
           <tr class="JR_tr">
             <td
               class="JR_left"
-              style="border-right: 1px dashed #999; font-family: 'kaiti'"
+              style="border-right: none; font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;记录人：</p>
             </td>
@@ -170,7 +170,7 @@
               align="left"
               class="JR_right"
               style="
-                border-left: 1px dashed #999;
+                border-left: none;
                 padding-left: 20px;
                 font-family: 'fangsong';
               "
@@ -183,14 +183,14 @@
             <td
               rowspan="2"
               class="JR_left"
-              style="border-right: 1px dashed #999; font-family: 'kaiti'"
+              style="border-right: none; font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;议 &nbsp;题：</p>
             </td>
             <td
               rowspan="2"
               style="
-                border-left: 1px dashed #999;
+                border-left: none;
                 padding: 0px 20px;
                 font-family: 'fangsong';
               "
@@ -278,7 +278,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black; font-family: 'heiti'"
+              style="border-left: 1px solid black"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">　　　　年　　月　　日</p>-->
               <p style="text-align: right; margin-right: 20px">

src/components/look_word/bdglpublicproperty.vue

@@ -1,21 +1,19 @@
 <template>
   <div>
     <el-button class="box1" @click="daochu">导出</el-button>
+    <!-- <div class="word" id="contents" style="margin-top: 61px"> -->
     <div class="word" id="contents">
-      <p
+      <!-- <p
         style="
           font-size: 16pt;
           font-weight: 600;
           color: black;
           font-family: 'heiti';
-          text-align: center;
-        "
-      >
-        《营产、公物管理登记簿》
-      </p>
-      <!-- <el-button @click="daochu">导出word</el-button> -->
-      <!-- <div class="fTitle">大队连务会记录本</div> -->
-      <!-- <div class="fTitle">营产、公物管理登记簿</div> -->
+          float: right;
+          writing-mode: vertical-rl;
+          padding-top: 51px;
+        " -->
+
       <table
         class="b1"
         border="1"
@@ -151,7 +149,18 @@
               <p align="center">{{ item.remark }}</p>
             </td>
           </tr>
-
+          <span
+        style="
+          font-size: 16pt;
+          font-weight: 600;
+          color: black;
+          font-family: 'heiti';
+          display: inline-block;
+        "
+      >
+        <!-- 营产、公物管理登记簿 -->
+       营<br/>产</br>、</br>公</br>物</br>管</br>理</br>登</br>记</br>簿
+      </span>
           <tr class="JR_tr" v-for="(item1, i1) in num" :key="i1 + ''">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">

src/views/PrintsLog/printlog/index.vue

@@ -66,7 +66,7 @@
           v-hasPermi="['PrintsLog:printlog:add']"
           >归还</el-button
         >
-      </el-col> 
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="danger"
@@ -105,7 +105,12 @@
       <el-table-column label="序号" align="center" type="index" />
       <!-- <el-table-column label="现文件路径" align="center" prop="id" />
       <el-table-column label="打印id" align="center" prop="printId" />-->
-      <el-table-column label="打印文件名称" align="center" prop="printName" />
+      <el-table-column
+        label="打印文件名称"
+        align="center"
+        prop="printName"
+        show-overflow-tooltip
+      />
       <el-table-column label="打印份数" align="center" prop="printNumber" />
       <!-- <el-table-column
         label="是否需要归还(0否1是)"
@@ -512,7 +517,7 @@ export default {
       this.flg = null;
     },
     cancels() {
-      this.queryParams.levelM ='';
+      this.queryParams.levelM = "";
       this.queryParams.unitId = null;
       this.queryParams.startt = null;
       this.queryParams.endt = null;
@@ -891,4 +896,14 @@ export default {
 ::v-deep .el-form-item__content {
   width: 200px;
 }
+::v-deep .el-tooltip__popper {
+  width: 600px;
+  word-break: break-all;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; /* 这里是超出几行省略 */
+  overflow: hidden;
+  background: red !important;
+}
 </style>

src/views/PrintsManage/manage/index.vue

@@ -93,7 +93,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="打印回复信息" align="center" prop="id" /> -->
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="文件名称" align="center" prop="name" />
+      <el-table-column
+        label="文件名称"
+        align="center"
+        prop="name"
+        show-overflow-tooltip
+      />
       <!-- <el-table-column label="路径" align="center" prop="file" /> -->
       <el-table-column label="类型" align="center" prop="type" />
       <el-table-column label="是否彩打" align="center" prop="isPrintColor">

src/views/barracksManagement/scadred/index.vue

@@ -0,0 +1,508 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item prop="xingMing">
+        <el-input
+          v-model.number="queryParams.xingMing"
+          clearable
+          size="small"
+          placeholder="请输入姓名"
+          @input="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <!-- <el-button size="btn" @click="handleQuery">搜索</el-button> -->
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['barracksManagement:flat:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['barracksManagement:flat:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['barracksManagement:flat:remove']"
+          >删除</el-button
+        >
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['barracksManagement:flat:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="flatList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" type="index" width="50"> </el-table-column>
+      <el-table-column label="姓名" align="center" prop="xingMing" />
+      <el-table-column label="房间号" align="center" prop="roomNumber" />
+      <el-table-column label="建筑面积" align="center" prop="area" />
+      <el-table-column
+        label="物业费标准"
+        align="center"
+        prop="propertyFeeStandard"
+      />
+      <el-table-column label="房租标准" align="center" prop="rentStandard" />
+      <el-table-column label="月水费" align="center" prop="waterBil" />
+      <el-table-column label="月房租" align="center" prop="monthlyRent" />
+      <el-table-column
+        label="月物业费"
+        align="center"
+        prop="monthlyPropertyFee"
+      />
+      <el-table-column label="总金额" align="center" prop="totalAmount" />
+
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="录入时间"
+        align="center"
+        prop="createtime"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          <!-- <span>{{ parseTime(scope.row.arriveTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>     -->
+          <span>{{
+            dateFormat("YYYY-mm-dd HH:MM:SS", scope.row.createtime)
+          }}</span>
+          <!-- rTime -->
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="楼房层数" align="center" prop="tier" />
+      <el-table-column label="单元号" align="center" prop="element" /> -->
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['barracksManagement:flat:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['barracksManagement:flat:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改单身干部宿舍对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="800px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="90px"
+        :inline="true"
+      >
+        <el-form-item label="姓名" prop="xingMing">
+          <el-input v-model="form.xingMing" />
+        </el-form-item>
+        <el-form-item label="房间号" prop="roomNumber">
+          <el-input v-model="form.roomNumber" />
+        </el-form-item>
+        <el-form-item label="建筑面积" prop="area">
+          <el-input v-model="form.area" />
+        </el-form-item>
+        <el-form-item label="使用面积" prop="usageArea">
+          <el-input v-model="form.usageArea" />
+        </el-form-item>
+        <el-form-item label="物业标准" prop="propertyFeeStandard">
+          <el-input v-model="form.propertyFeeStandard" />
+        </el-form-item>
+        <el-form-item label="房租标准" prop="rentStandard">
+          <el-input v-model="form.rentStandard" />
+        </el-form-item>
+        <el-form-item label="水电费" prop="waterBil">
+          <el-input v-model="form.waterBil" />
+        </el-form-item>
+        <el-form-item label="月房租" prop="monthlyRent">
+          <el-input v-model="form.monthlyRent" />
+        </el-form-item>
+        <el-form-item label="月物业费" prop="monthlyPropertyFee">
+          <el-input v-model="form.monthlyPropertyFee" />
+        </el-form-item>
+
+        <el-form-item label="总金额" prop="totalAmount">
+          <el-input v-model="form.totalAmount" />
+        </el-form-item>
+        <div class="jibens">备注</div>
+        <el-form-item prop="remark">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            autosize
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDorm,
+  getDorm,
+  delDorm,
+  addDorm,
+  updateDorm,
+} from "@/api/barracksManagement/scadred";
+
+export default {
+  name: "Dorm",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公寓房档案表格数据
+      flatList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        number: null,
+        number1: null,
+        name: null,
+        behoof: null,
+        statusQuo: null,
+        period: null,
+        area: null,
+        createtime: null,
+        updatetime: null,
+        tier: null,
+        roomNumber: null,
+        element: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        xingMing: [
+          { required: true, message: "姓名不能为空", trigger: "blur" },
+        ],
+        area: [
+          { required: true, message: "建筑面积不能为空", trigger: "blur" },
+        ],
+        usageArea: [
+          { required: true, message: "使用面积不能为空", trigger: "blur" },
+        ],
+        propertyFeeStandard: [
+          { required: true, message: "物业标准不能为空", trigger: "blur" },
+        ],
+        rentStandard: [
+          { required: true, message: "房租标准不能为空", trigger: "blur" },
+        ],
+        waterBil: [
+          { required: true, message: "水电费不能为空", trigger: "blur" },
+        ],
+        monthlyRent: [
+          { required: true, message: "月房租不能为空", trigger: "blur" },
+        ],
+        monthlyPropertyFee: [
+          { required: true, message: "月物业费不能为空", trigger: "blur" },
+        ],
+        totalAmounnt: [
+          { required: true, message: "总金额不能为空", trigger: "blur" },
+        ],
+        roomNumber: [
+          { required: true, message: "房间号不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询单身干部宿舍列表 */
+    getList() {
+      this.loading = true;
+      listDorm(this.queryParams).then((response) => {
+        this.dormList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        number: null,
+        number1: null,
+        name: null,
+        behoof: null,
+        statusQuo: null,
+        period: null,
+        area: null,
+        remark: null,
+        createtime: null,
+        updatetime: null,
+        tier: null,
+        roomNumber: null,
+        element: null,
+        xingMing: null,
+        usageArea: null,
+        propertyFeeStandard: null,
+        rentStandard: null,
+        waterBil: null,
+        monthlyRent: null,
+        monthlyPropertyFee: null,
+        totalAmount: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加单身干部宿舍";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getDorm(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改单身干部宿舍";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDorm(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDorm(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认删除单身干部宿舍的数据项？")
+        .then(function () {
+          return delDorm(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/dorm/export",
+        {
+          ...this.queryParams,
+        },
+        `dorm_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style scoped>
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner {
+  background-color: #004d86 !important;
+  color: white;
+  margin-right: 20px;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title {
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+::v-deep .el-input__inner {
+  border: 1px solid white !important;
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid white;
+}
+/* 文本域 */
+::v-deep .el-textarea__inner {
+  width: 610px;
+  height: 80px;
+}
+::v-deep .el-form-item__label {
+  text-align: end;
+}
+::v-deep .el-dialog__body {
+  padding: 0px;
+  margin-left: 96px;
+  margin-top: 20px;
+}
+::v-deep .el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+  background-color: rgb(0, 60, 105);
+  color: white;
+}
+::v-deep .el-input--small .el-input__inner {
+  color: white;
+}
+::v-deep .el-table__cell .cell {
+  text-align: center;
+}
+/* 文字多余部分省略 */
+::v-deep .el-table__cell .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.jibens {
+  width: 650px;
+  height: 32px;
+  background-image: url("/static/img/小标题底.b7c6f45a.png");
+  background-size: 100%;
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+::v-deep .el-dialog__footer {
+  margin-right: 74px;
+}
+::v-deep .el-form-item__content .el-input__inner {
+  width: 200px;
+  height: 36px;
+}
+::v-deep .el-textarea__inner {
+  min-height: 120px !important;
+}
+</style>

src/views/grassrootsregistration/bdglfood/index.vue

@@ -7,8 +7,12 @@
       v-show="showSearch"
       label-width="68px"
     >
-       <el-form-item prop="unitName">
-      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      <el-form-item prop="unitName">
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.unitName"
+          @input="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="" prop="peopleId">
         <el-select
@@ -720,7 +724,23 @@
           <div class="box3">
             <el-form v-for="(item, i) in acceptance" :key="i">
               <el-form-item label="" prop="">
-                <el-select v-model="item.distinctions" placeholder="请选择">
+                <el-select
+                  v-model="item.distinctions"
+                  placeholder="区分"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in pingMing"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.name"
+                    class="input_xiala"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="" prop="">
+                <el-select v-model="item.name" placeholder="品名" clearable>
                   <el-option
                     v-for="item in ziDian"
                     :key="item.dictCode"
@@ -732,35 +752,30 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="" prop="">
-                <el-date-picker
-                  v-model="item.time"
-                  type="date"
-                  :editable="false"
-                  size="mini"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd"
-                >
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-input v-model="item.name" placeholder="品名"></el-input>
+                <el-input v-model="item.weight" placeholder="重量"></el-input>
               </el-form-item>
               <el-form-item label="" prop="">
                 <el-input
-                  v-model.number="item.weight"
-                  placeholder="数量"
+                  v-model.number="item.unitPrice"
+                  placeholder="单价"
                   oninput="value=value.replace(/[^\d]/g,'')"
                 ></el-input>
               </el-form-item>
               <el-form-item label="" prop="">
                 <el-input
                   v-model.number="item.money"
-                  placeholder="价格"
+                  placeholder="金额"
                   oninput="value=value.replace(/[^\d]/g,'')"
                 ></el-input>
               </el-form-item>
               <el-form-item label="" prop="">
-                <el-input v-model="item.types" placeholder="消耗品"></el-input>
+                <el-input
+                  v-model="item.types"
+                  placeholder="购买或自产"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="" prop="">
+                <el-input v-model="item.remark" placeholder="备注"></el-input>
               </el-form-item>
               <el-form-item>
                 <el-button
@@ -771,7 +786,7 @@
                   @click="tianJia"
                 ></el-button>
                 <el-button
-                  type="primary"
+                  type="danger"
                   icon="el-icon-delete"
                   size="mini"
                   @click="jtDelete(i)"
@@ -782,10 +797,14 @@
           </div>
 
           <div class="jiben">采购食材</div>
-          <div class="box3">
+          <div class="box5">
             <el-form v-for="(item1, i) in caiGou" :key="i + ' '">
               <el-form-item label="" prop="">
-                <el-select v-model="item1.distinction" placeholder="请选择">
+                <el-select
+                  v-model="item1.distinction"
+                  placeholder="品名"
+                  clearable
+                >
                   <el-option
                     v-for="item in ziDian"
                     :key="item.dictCode"
@@ -839,7 +858,7 @@
                   size="mini"
                 ></el-button>
                 <el-button
-                  type="primary"
+                  type="danger"
                   icon="el-icon-delete"
                   size="mini"
                   @click="jtDelete1(i)"
@@ -850,7 +869,7 @@
           </div>
 
           <div class="jiben">交/退伙食费</div>
-          <div class="box3">
+          <div class="box5">
             <el-form v-for="(item2, i) in expenses" :key="i + 's'">
               <el-form-item label="" prop="">
                 <el-select v-model="item2.peopleId" placeholder="姓名">
@@ -905,7 +924,7 @@
                   @click="tianJia2"
                 ></el-button>
                 <el-button
-                  type="primary"
+                  type="danger"
                   icon="el-icon-delete"
                   size="mini"
                   @click="jtDelete2(i)"
@@ -916,7 +935,7 @@
           </div>
 
           <div class="jiben">在食堂购物</div>
-          <div class="box3">
+          <div class="box5">
             <el-form v-for="(item3, i) in canteen" :key="i + 'p'">
               <el-form-item label="" prop="">
                 <el-select v-model="item3.peopleId" placeholder="姓名">
@@ -986,7 +1005,7 @@
               <el-form-item label="" prop="">
                 <el-input
                   v-model="item3.qMoney"
-                  placeholder="其他物品"
+                  placeholder="其他物品金额"
                 ></el-input>
               </el-form-item>
               <el-form-item label="" prop="">
@@ -1005,7 +1024,7 @@
                   @click="tianJia3"
                 ></el-button>
                 <el-button
-                  type="primary"
+                  type="danger"
                   icon="el-icon-delete"
                   size="mini"
                   @click="jtDelete3(i)"
@@ -1075,6 +1094,7 @@
         <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
+
     <el-dialog
       :visible.sync="menuRoleVisible"
       :title="title"
@@ -1325,6 +1345,21 @@ export default {
       deptOptionss: [],
       // 外面的人员
       renYuans: [],
+      // 试验检查验收品名
+      pingMing: [
+        {
+          name: "主食",
+          id: 1,
+        },
+        {
+          name: "副食",
+          id: 2,
+        },
+        {
+          name: "其他",
+          id: 3,
+        },
+      ],
     };
   },
   created() {
@@ -1955,9 +1990,9 @@ table td {
   width: 32px;
   height: 32px;
   text-align: center;
-  margin-left: -6px;
-  margin-right: 3px;
-  margin-left: 8px;
+  position: relative;
+  top: 0;
+  left: 798px;
 }
 ::v-deep .box3 .el-button .el-icon-plus {
   margin-left: -6px;
@@ -1965,6 +2000,38 @@ table td {
 ::v-deep .box3 .el-button .el-icon-delete {
   margin-left: -6px;
 }
+
+/* 实物检查验收表格 */
+.box5 {
+  width: 920px;
+  min-height: 70px;
+  border: 1px solid white;
+  border-radius: 5px;
+  /* background: #409eff; */
+  margin-bottom: 30px;
+  padding-top: 15px;
+  padding-left: 15px;
+}
+/* 表单长度 */
+::v-deep .box5 .el-form-item__content {
+  width: 116px;
+}
+::v-deep .box5 .el-input__inner {
+  width: 116px;
+}
+/* 添加删除按钮 */
+::v-deep .box5 .el-button {
+  width: 32px;
+  height: 32px;
+  text-align: center;
+}
+::v-deep .box5 .el-button .el-icon-plus {
+  margin-left: -6px;
+}
+::v-deep .box5 .el-button .el-icon-delete {
+  margin-left: -6px;
+}
+
 ::v-deep .el-input__prefix {
   display: none;
 }

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -7,8 +7,12 @@
       v-show="showSearch"
       label-width="68px"
     >
-       <el-form-item prop="unitName">
-      <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery"/>
+      <el-form-item prop="unitName">
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.unitName"
+          @input="handleQuery"
+        />
       </el-form-item>
       <el-form-item prop="name">
         <el-input
@@ -159,7 +163,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1016px"
+      width="1060px"
       append-to-body
       :close-on-click-modal="false"
     >
@@ -268,6 +272,7 @@
       append-to-body
       id="chakan"
       :close-on-click-modal="false"
+      width="1107px"
     >
       <bdglpublicproperty
         v-if="menuRoleVisible"
@@ -288,7 +293,7 @@ import {
   addBdglpublicproperty,
   updateBdglpublicproperty,
   exportBdglpublicproperty,
-  publiccpropertyunits
+  publiccpropertyunits,
 } from "@/api/grassrootsregistration/bdglpublicproperty";
 import {
   getZhuChiRen,
@@ -504,7 +509,7 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-    const unitId =row.unitId
+      const unitId = row.unitId;
       // 是否隐藏按钮
       this.opens = false;
       publiccpropertyunits(unitId).then((response) => {
@@ -715,7 +720,7 @@ export default {
 }
 /* 增加按钮弹框 */
 ::v-deep .el-dialog {
-  width: 1060px !important;
+  width: 1060px;
 }
 ::v-deep .el-dialog__body {
   padding: none !important;

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -87,9 +87,16 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="出车时间" align="center" prop="authStime" width="200">
+      <el-table-column
+        label="出车时间"
+        align="center"
+        prop="authStime"
+        width="200"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.authStime, "{y}-{m}-{d} {h}:{m}:{s}") }}</span>
+          <span>{{
+            parseTime(scope.row.authStime, "{y}-{m}-{d} {h}:{m}:{s}")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column label="流程" align="center" prop="outtime">
@@ -218,15 +225,6 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="用车结束时间" prop="authEtime">
-          <!-- <el-date-picker
-            clearable
-            size="small"
-            v-model="fomr1.authEtime"
-            type="datetime"
-            placeholder="用车结束时间"
-            value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker> -->
           <el-date-picker
             clearable
             size="small"
@@ -362,11 +360,73 @@
             readonly
           />
         </el-form-item>
+
+        <div class="box6">
+          <el-form v-for="(item1, e) in chuchEList" :key="e">
+            <el-form-item label="指定出车" prop="carUnitId">
+              <treeselect
+                :options="treeList"
+                placeholder="选择出车单位"
+                v-model="item1.carUnitId"
+                disabled
+              />
+            </el-form-item>
+            <el-form-item label="" prop="bdglThebusId">
+              <el-select
+                placeholder="请选择车辆车牌"
+                filterable
+                v-model="item1.vehiclemodel"
+                disabled
+              >
+                <el-option
+                  v-for="(item, i) in chePaiList"
+                  :key="i"
+                  :label="item.vehiclenumber"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="" prop="twoshenpirenid">
+              <el-select
+                placeholder="请选择司机"
+                filterable
+                v-model="item1.driverId"
+                disabled
+              >
+                <el-option
+                  v-for="(item, i) in driverLists"
+                  :key="i"
+                  :label="item.peopleName"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-delete"
+                size="btd"
+                @click="delForms(e)"
+              ></el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
         <div class="box3">
           <el-form v-for="(item1, e) in checkShop" :key="e">
-            <el-form-item label="" prop="bdglThebusId">
+            <el-form-item label="" prop="carUnitId">
+              <treeselect
+                v-model="item1.carUnitId"
+                :options="treeList"
+                placeholder="选择出车单位"
+                @input="treeselectss"
+              />
+            </el-form-item>
+            <el-form-item label="" prop="vehiclemodel">
               <el-select
-                v-model="item1.bdglThebusId"
+                v-model="item1.vehiclemodel"
                 placeholder="请选择车辆车牌"
                 filterable
               >
@@ -397,21 +457,15 @@
             <el-form-item>
               <el-button
                 type="primary"
-                icon="el-icon-plus"
+                icon="el-icon-check"
                 size="btc"
                 @click="addForms"
                 v-if="e == checkShop.length - 1"
               ></el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-delete"
-                size="btd"
-                v-if="e > 0"
-                @click="delForms(e)"
-              ></el-button>
             </el-form-item>
           </el-form>
         </div>
+
         <div class="jiben">出车路线</div>
         <el-form-item prop="route">
           <el-input
@@ -421,6 +475,10 @@
             disabled
           />
         </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="route">
+          <el-input v-model="form.remarkInfo" type="textarea" placeholder="" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -536,7 +594,12 @@ import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-import { getZhuChiRen, getDept } from "@/api/militaryvehicleManagement/thebus";
+import {
+  getZhuChiRen,
+  getDept,
+  listThebus,
+} from "@/api/militaryvehicleManagement/thebus";
+
 export default {
   name: "ThebusList",
   dicts: ["brand"],
@@ -582,6 +645,7 @@ export default {
         {
           vehiclemodel: null,
           driverId: null,
+          carUnitId: null,
         },
       ],
       // 车牌型号
@@ -612,6 +676,12 @@ export default {
           { required: true, message: "请填写原因", trigger: "blur" },
         ],
       },
+      // 出车数据
+      chuchEList: [],
+      // 出车获取车辆列表
+      driverLists: [],
+      // 出车获取车辆列表
+      chePaiList: [],
     };
   },
   created() {
@@ -620,8 +690,28 @@ export default {
     getDicts("brand").then((response) => {
       this.brand = response.data;
     });
+    this.getCar;
+    this.siJI();
+    this.chePai();
   },
   methods: {
+    // 获取车牌号翻译
+    chePai() {
+      listThebus().then((res) => {
+        this.chePaiList = res.rows;
+      });
+    },
+    // 获取司机翻译
+    siJI() {
+      listDriver().then((res) => {
+        this.driverLists = res.rows;
+      });
+    },
+    // 选择出车单位触发
+    treeselectss(i) {
+      this.getSi(i);
+      this.getCar(i);
+    },
     // 归队按钮触发
     returnCar(row) {
       this.form = row;
@@ -705,29 +795,33 @@ export default {
       });
     },
     // 获取司机
-    getSi() {
-      listDriver().then((response) => {
+    getSi(id) {
+      listDriver({ unitId: id }).then((response) => {
         this.driverList = response.rows;
       });
     },
     // 获取在位车辆型号
-    getCar() {
-      zaiweiCar().then((res) => {
+    getCar(id) {
+      zaiweiCar({ unitId: id }).then((res) => {
         this.chucarlist = res.rows;
       });
     },
 
     // 删除对话框选择司机
     delForms(i) {
-      this.checkShop.splice(i, 1);
+      this.chuchEList.splice(i, 1);
     },
 
     // 增加对话框选择司机
     addForms() {
-      this.checkShop.push({
-        driverId: null,
-        vehiclemodel: null,
-      });
+      this.chuchEList.push(this.checkShop[0]);
+      this.checkShop = [
+        {
+          driverId: null,
+          vehiclemodel: null,
+          carUnitId: null,
+        },
+      ];
     },
     /** 查询出车申请列表 */
     getList() {
@@ -752,11 +846,14 @@ export default {
         {
           vehiclemodel: null,
           driverId: null,
+          carUnitId: null,
         },
       ];
+      this.chuchEList = [];
       this.resetForm("form");
       this.resetForm("form1");
       this.resetForm("checkShop");
+      this.resetForm("chuchEList");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -781,6 +878,7 @@ export default {
       this.form = row;
       this.getCar();
       this.getSi();
+      this.getTreeList();
       this.open = true;
       this.title = "选择司机";
     },
@@ -832,9 +930,9 @@ export default {
     },
     /** 出车提交按钮 */
     submitForm() {
-      if (this.checkShop.length) {
-        this.form.bdglDepartureInfos = this.checkShop;
-        this.checkShop.forEach((item) => {
+      if (this.chuchEList.length) {
+        this.form.bdglDepartureInfos = this.chuchEList;
+        this.chuchEList.forEach((item) => {
           this.arr.push(item.bdglThebusId);
         });
       }
@@ -1139,5 +1237,8 @@ hr {
   background: transparent;
   color: #fff;
 }
+::v-deep .box6 .el-form .el-form-item {
+  margin-right: 9px !important ;
+}
 </style>