Parcourir la source

更改医疗侧边栏样式

sunyanqiang il y a 3 ans
Parent
commit
b823ff784b

+ 9 - 0
src/api/materialManagement/materialRegistration.js

@@ -50,4 +50,13 @@ export function exportMaterialRegistration(query) {
     method: 'get',
     params: query
   })
+}
+
+// 获取物品名称列表
+export function exportMaterialRegWuPingList(query) {
+  return request({
+    url: '/materialManagement/materialRegistration/export',
+    method: 'get',
+    params: query
+  })
 }

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

@@ -702,6 +702,12 @@ color: #fff;
   background: linear-gradient(180deg, #07162F, #102C57);
 }
 
+.el-submenu__title {
+  padding: 0px 0px;
+  padding-left: 0px !important;
+}
+
+
 #app .has-logo .sidebar-logo-container {
   background: rgba(0, 0, 0, 0) !important;
 }
@@ -908,7 +914,7 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 
 /* 主页左侧导航栏 */
 .nest-menu li {
-  padding-left: 25px !important;
+  padding-left: 0px !important;
 }
 
 /* input下拉背景、字体颜色------input加类名 */
@@ -1082,6 +1088,10 @@ input:-moz-placeholder {
   position: relative;
 }
 
+#app .sidebar-container .svg-icon {
+  margin-left: 28px
+}
+
 /* .el-input__inner {
     border: 1px solid white !important;
 } */
@@ -1191,6 +1201,7 @@ input:-moz-placeholder {
 #fileinfopdf .el-dialog__title {
   color: black !important;
 }
+
 /*定义滚动条宽高及背景,宽高分别对应横竖滚动条的尺寸*/
 #fileinfopdf .el-dialog__body::-webkit-scrollbar {
   width: 14px;

+ 3 - 1
src/views/materialManagement/materialRegistration/index.vue

@@ -497,8 +497,10 @@ import {
   addMaterialRegistration,
   updateMaterialRegistration,
   exportMaterialRegistration,
+  exportMaterialRegWuPingList,
 } from "@/api/materialManagement/materialRegistration";
 import { getDept } from "@/api/materialManagement/archives";
+
 import { listArchives } from "@/api/materialManagement/archives";
 // 所有人员
 import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
@@ -575,7 +577,7 @@ export default {
     // 点击单位触发
     shuxing(data) {
       // this.form.unitId = data.id;
-      // this.form.responsibilityUnit = data.label;
+      this.form.responsibilityUnit = data.label;
       // this.getRenYuan(this.form.unitId);
     },
     /** 查询部门下拉树结构 */

+ 4 - 4
src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -437,25 +437,25 @@
         <el-form-item label="外出事由" prop="cause">
           <el-input v-model="form.cause" placeholder="请输入外出事由" />
         </el-form-item>
-        <el-form-item label="授权开始时间" prop="authStime">
+        <el-form-item label="用车开始时间" prop="authStime">
           <el-date-picker
             clearable
             size="small"
             v-model="form.authStime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="授权开始时间"
+            placeholder="用车开始时间"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="授权结束时间" prop="authEtime">
+        <el-form-item label="用车结束时间" prop="authEtime">
           <el-date-picker
             clearable
             size="small"
             v-model="form.authEtime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="授权结束时间"
+            placeholder="用车结束时间"
           >
           </el-date-picker>
         </el-form-item>

+ 130 - 60
src/views/militaryvehicleManagement/thebusList/index.vue

@@ -1,5 +1,18 @@
 <template>
   <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5" class="isSubmit">
+        <el-radio-group
+          v-model="queryParams.caoZuoType"
+          @change="caoZuoTypefun"
+        >
+          <el-radio-button label="0">所有</el-radio-button>
+          <el-radio-button label="1">今日</el-radio-button>
+          <el-radio-button label="2">明日</el-radio-button>
+        </el-radio-group>
+      </el-col>
+    </el-row>
+    <hr />
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -7,14 +20,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="unitId">
-        <!-- <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        /> -->
+      <el-form-item prop="peopleId">
         <el-select
           v-model="queryParams.peopleId"
           placeholder="请选择用车人姓名"
@@ -40,11 +46,23 @@
           @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>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdds"
+          v-hasPermi="['militaryvehicleManagement:thebusApply:add']"
+          >新增</el-button
+        >
+      </el-col>
+    </el-row>
     <!-- 列表选项 -->
     <el-table
       v-loading="loading"
@@ -97,7 +115,7 @@
             >出车</el-button
           >
           <el-button
-          class="a1"
+            class="a1"
             v-else
             size=""
             type="text"
@@ -118,7 +136,13 @@
     />
 
     <!-- 出车会话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"
@@ -229,8 +253,6 @@
       </div>
     </el-dialog>
 
-
-
     <!-- 查看会话框 -->
     <el-dialog
       title="查看可出车列表"
@@ -262,43 +284,44 @@
           <el-input v-model="forms.cause" />
         </el-form-item>
         <div class="box4">
-          <table border="1"
-          style="
-          border-collapse: collapse;
-          border: none;
-          mso-border-left-alt: 0.5pt solid windowtext;
-          mso-border-top-alt: 0.5pt solid windowtext;
-          mso-border-right-alt: 0.5pt solid windowtext;
-          mso-border-bottom-alt: 0.5pt solid windowtext;
-          mso-border-insideh: 0.5pt solid windowtext;
-          mso-border-insidev: 0.5pt solid windowtext;
-          mso-padding-alt: 0pt 0pt 0pt 0pt;
-        "
-        width="907px"
+          <table
+            border="1"
+            style="
+              border-collapse: collapse;
+              border: none;
+              mso-border-left-alt: 0.5pt solid windowtext;
+              mso-border-top-alt: 0.5pt solid windowtext;
+              mso-border-right-alt: 0.5pt solid windowtext;
+              mso-border-bottom-alt: 0.5pt solid windowtext;
+              mso-border-insideh: 0.5pt solid windowtext;
+              mso-border-insidev: 0.5pt solid windowtext;
+              mso-padding-alt: 0pt 0pt 0pt 0pt;
+            "
+            width="907px"
           >
-           <tbody style="">
-            <tr align="center" class="tr">
-              <td width="220" height="40">车牌型号</td>
-              <td width="220" height="40">号牌号码</td>
-              <td width="220" height="40">司机</td>
-              <td width="220" height="40">司机联系方式</td>
-            </tr>
-            <tr
-              align="center"
-              class="tr"
-              v-for="(item, i) in chaCarLists"
-              :key="i"
-            >
-              <td width="220" height="40">
-                <template>
-                  {{ names }}
-                </template>
-              </td>
-              <td width="220" height="40">{{ item.vehiclenumber }}</td>
-              <td width="220" height="40">{{ item.driverName }}</td>
-              <td width="220" height="40">{{ item.driverPhone }}</td>
-            </tr>
-           </tbody>
+            <tbody style="">
+              <tr align="center" class="tr">
+                <td width="220" height="40">车牌型号</td>
+                <td width="220" height="40">号牌号码</td>
+                <td width="220" height="40">司机</td>
+                <td width="220" height="40">司机联系方式</td>
+              </tr>
+              <tr
+                align="center"
+                class="tr"
+                v-for="(item, i) in chaCarLists"
+                :key="i"
+              >
+                <td width="220" height="40">
+                  <template>
+                    {{ names }}
+                  </template>
+                </td>
+                <td width="220" height="40">{{ item.vehiclenumber }}</td>
+                <td width="220" height="40">{{ item.driverName }}</td>
+                <td width="220" height="40">{{ item.driverPhone }}</td>
+              </tr>
+            </tbody>
           </table>
         </div>
       </el-form>
@@ -349,6 +372,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        caoZuoType: "0",
       },
       // 表单参数
       form: {},
@@ -389,6 +413,10 @@ export default {
     });
   },
   methods: {
+    // 今日,明日按钮触发
+    caoZuoTypefun(data) {
+      console.log(data);
+    },
     // 翻译车牌型号
     car(value) {
       console.log(value, 1);
@@ -490,6 +518,15 @@ export default {
       this.open = true;
       this.title = "选择司机";
     },
+    /** 出车按钮操作 */
+    handleAdds(row) {
+      this.form.id = row.id;
+      this.form = row;
+      this.getCar();
+      this.getSi();
+      this.open = true;
+      this.title = "选择司机";
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -575,7 +612,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
-   border: 1px solid white !important;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -729,15 +766,48 @@ export default {
 ::v-deep .box4 table td {
   border-bottom: 1px solid white !important;
 }
-.a1{
+.a1 {
   width: 46px !important;
-    border: 1px solid transparent;
-    padding: 3px 8px;
-    font-size: 14px;
-    line-height: 1.5;
-    border-radius: 3px;
-    color: #fff;
-    background-color: #1890ff;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1890ff;
+}
+/* 今日明日按钮 */
+.isSubmit {
+  margin-left: 42% !important;
+}
+.el-radio-button {
+  width: 122px !important;
+  height: 30px !important;
+  line-height: 30px !important;
+  border: none !important;
+}
+::v-deep .el-radio-button__inner {
+  width: 120px !important;
+  height: 30px !important;
+  line-height: 8px !important;
+  background: #196299;
+  border: none;
+  color: #fff;
+}
+::v-deep .el-radio-button:first-child .el-radio-button__inner {
+  border-left: none !important;
+}
+::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+  color: #ffffff;
+  background-color: #006cff !important;
+  border-color: #006cff !important;
+  -webkit-box-shadow: -1px 0 0 0 #006cff !important;
+  box-shadow: -1px 0 0 0 #006cff !important;
+}
+hr {
+  border: none;
+  height: 1px;
+  background-color: rgba(204, 204, 204, 0.5);
 }
 </style>