更改用车审批，更改公共样式按钮，更改医疗过期的添加

src/api/grassrootsregistration/bdglmeeting.js

@@ -76,7 +76,7 @@ export function getZhuChiRen(data) {
     params: { deptId: data }
   })
 }
-// 查询首长
+// 查询所在单位首长
 export function getUser(data) {
   return request({
     url: '/grassrootsregistration/common/getUsers',
@@ -199,4 +199,3 @@ export function getRenYuanXiangQing(query) {
     params: { deptId: query }
   })
 }
-// 哈哈

src/api/medicalhealth/antiepidemicputin.js

@@ -78,3 +78,12 @@ export function exportAntiepidemiFangYiChuKu(query) {
     params: query
   })
 }
+
+// 新增防疫用品过期入库登记
+export function addAntiepidemicputins(data) {
+  return request({
+    url: '/medicalhealth/antiepidemicputin/insert',
+    method: 'post',
+    data: data
+  })
+}

src/api/medicalhealth/bdgldurgputin.js

@@ -67,3 +67,11 @@ export function exportChuYao(query) {
     params: query
   })
 }
+// 新增药品过期入库登记
+export function addBdgldurgputins(data) {
+  return request({
+    url: '/medicalhealth/bdgldurgputin/insert',
+    method: 'post',
+    data: data
+  })
+}

src/api/medicalhealth/consumeputin.js

@@ -84,4 +84,12 @@ export function exportHaoCaiChu(query) {
     method: 'get',
     params: query
   })
+}
+// 新增耗材过期入库登记
+export function addPutins(data) {
+  return request({
+    url: '/medicalhealth/consumeputin/insert',
+    method: 'post',
+    data: data
+  })
 }

src/assets/styles/global.css

@@ -446,6 +446,7 @@ color: #fff;
   border-radius: 3px;
   color: #fff;
   background-color: #13ce66;
+  height: 29px;
 }
 
 /* 删除 btd */
@@ -472,6 +473,7 @@ color: #fff;
   border-radius: 3px;
   color: #fff;
   background-color: #ff4949;
+  height: 29px;
 }
 
 /* 查看 btk */
@@ -538,6 +540,7 @@ color: #fff;
   color: #fff;
   background-color: #1d96ff;
   margin-bottom: 10px;
+  margin-right: 10px;
 }
 
 .el-button--bts:focus,

src/views/medicalhealth/antiepidemicguoqi/index.vue

@@ -151,7 +151,11 @@
         inline
       >
         <el-form-item label="防疫品名称" prop="durgArchivesId">
-          <el-select v-model="form.durgName" placeholder="请选择防疫品名称">
+          <el-select
+            v-model="form.durgName"
+            placeholder="请选择防疫品名称"
+            filterable
+          >
             <el-option
               v-for="(item, i) in fangYi"
               :key="i"
@@ -171,7 +175,7 @@
         <el-form-item label="存放位置" prop="place">
           <el-input v-model="form.place" placeholder="请输入存放位置" />
         </el-form-item>
-        <el-form-item label="入库时间" prop="putTime">
+        <!-- <el-form-item label="入库时间" prop="putTime">
           <el-date-picker
             clearable
             size="small"
@@ -181,7 +185,7 @@
             placeholder="选择入库时间"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="入库说明" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入入库说明" />
         </el-form-item> -->
@@ -263,6 +267,7 @@ import {
   updateAntiepidemicputin,
   delAntiepidemicputin,
   exportAntiepidemicputin,
+  addAntiepidemicputins,
 } from "@/api/medicalhealth/antiepidemicputin";
 
 export default {
@@ -431,7 +436,7 @@ export default {
             });
           } else {
             this.form.expiredstatus = "1";
-            addAntiepidemicputin(this.form).then((response) => {
+            addAntiepidemicputins(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();

src/views/medicalhealth/bdgldurgguoqi/index.vue

@@ -166,7 +166,11 @@
         inline
       >
         <el-form-item label="药品名称" prop="durgName">
-          <el-select v-model="form.durgName" placeholder="请选择药品名称">
+          <el-select
+            v-model="form.durgName"
+            placeholder="请选择药品名称"
+            filterable
+          >
             <el-option
               v-for="(item, i) in yaoList"
               :key="i"
@@ -186,7 +190,7 @@
         <el-form-item label="存放位置" prop="place">
           <el-input v-model="form.place" placeholder="请输入存放位置" />
         </el-form-item>
-        <el-form-item label="入库时间" prop="putTime">
+        <!-- <el-form-item label="入库时间" prop="putTime">
           <el-date-picker
             clearable
             size="small"
@@ -196,7 +200,7 @@
             placeholder="选择入库时间"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="入库说明" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入入库说明" />
         </el-form-item> -->
@@ -277,6 +281,7 @@ import {
   addBdgldurgputin,
   exportBdgldurgputin,
   exportYao,
+  addBdgldurgputins,
 } from "@/api/medicalhealth/bdgldurgputin";
 import {
   exportYaoPing,
@@ -453,7 +458,7 @@ export default {
             });
           } else {
             this.form.expiredstatus = "1";
-            addBdgldurgputin(this.form).then((response) => {
+            addBdgldurgputins(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();

src/views/medicalhealth/consumeguoqi/index.vue

@@ -172,7 +172,11 @@
         inline
       >
         <el-form-item label="耗材名称" prop="durgName">
-          <el-select v-model="form.durgName" placeholder="请选择耗材名称">
+          <el-select
+            v-model="form.durgName"
+            placeholder="请选择耗材名称"
+            filterable
+          >
             <el-option
               v-for="(item, i) in Consumables"
               :key="i"
@@ -192,7 +196,7 @@
         <el-form-item label="存放位置" prop="place">
           <el-input v-model="form.place" placeholder="请输入存放位置" />
         </el-form-item>
-        <el-form-item label="入库时间" prop="putTime">
+        <!-- <el-form-item label="入库时间" prop="putTime">
           <el-date-picker
             clearable
             size="small"
@@ -202,7 +206,7 @@
             placeholder="选择入库时间"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item label="入库说明" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入入库说明" />
         </el-form-item> -->
@@ -239,6 +243,7 @@ import {
   addPutin,
   updatePutin,
   exportHaoCaiChu,
+  addPutins,
 } from "@/api/medicalhealth/consumeputin";
 import { consumeGuoQi, consumeXiaoHui } from "@/api/medicalhealth/consumeguoqi";
 export default {
@@ -418,7 +423,7 @@ export default {
             });
           } else {
             this.form.expiredstatus = "1";
-            addPutin(this.form).then((response) => {
+            addPutins(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -23,9 +23,7 @@
           @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>
 
@@ -67,7 +65,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-        class="box"
+          class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -143,7 +141,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"
@@ -158,7 +162,7 @@
               :key="i"
               :label="item.vehiclenumber"
               :value="item.id"
-              @click.native="carPaiHao(item.vehiclenumber)"
+              @click.native="carPaiHao(item)"
               class="input_xiala"
             >
             </el-option>
@@ -371,8 +375,9 @@ export default {
       this.getRen(data.id);
     },
     // 车牌号触发
-    carPaiHao(name) {
-      this.form.vehiclenumber = name;
+    carPaiHao(data) {
+      console.log(data);
+      // this.form.vehiclenumber = name;
     },
     // 查询车牌号列表
     getCarPaiList() {
@@ -395,7 +400,7 @@ export default {
       this.open = false;
       this.reset();
     },
-    
+
     // 表单重置
     reset() {
       this.form = {
@@ -537,7 +542,6 @@ export default {
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
-
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -654,7 +658,7 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
-.box{
+.box {
   background-color: #ffba00 !important;
 }
 </style>

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -114,12 +114,12 @@
       />
       <el-table-column label="外出事由" align="center" prop="cause" />
       <el-table-column
-        label="营级审批人"
+        label="所在单位审批人"
         align="center"
         prop="unitPeopleName"
-        width="90"
+        width="120"
       />
-      <el-table-column label="营级审批状态" align="center" width="100">
+      <el-table-column label="所在单位审批状态" align="center" width="130">
         <template slot-scope="scope">
           <el-col v-if="scope.row.unitPeopleState == 1" style="color: #ffba00"
             >未处理</el-col
@@ -252,10 +252,17 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="200"
+        width="220"
       >
         <template slot-scope="scope">
-          <div v-if="scope.row.isTeShu == '1'">
+          <div
+            v-if="
+              scope.row.isTeShu == '1' &&
+              scope.row.peopleoneState != '1' &&
+              scope.row.shenpijiedian != '3' &&
+              scope.row.yingjicaozuoren != 'oneji'
+            "
+          >
             <!-- 1 -->
             <el-button
               size="bts"
@@ -328,7 +335,8 @@
               type="text"
               v-if="
                 scope.row.peopleoneState == '1' &&
-                scope.row.shenpijiedian == '3'
+                scope.row.shenpijiedian == '3' &&
+                scope.row.yingjicaozuoren == 'oneji'
               "
               @click="handleShenPi(scope.row)"
               v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
@@ -340,7 +348,8 @@
               type="text"
               v-if="
                 scope.row.peopletwoState == '1' &&
-                scope.row.shenpijiedian == '4'
+                scope.row.shenpijiedian == '4' &&
+                scope.row.yingjicaozuoren == 'twoji'
               "
               @click="handleShenPi(scope.row)"
               v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
@@ -352,7 +361,8 @@
               type="text"
               v-if="
                 scope.row.peoplethreeState == '1' &&
-                scope.row.shenpijiedian == '5'
+                scope.row.shenpijiedian == '5' &&
+                scope.row.yingjicaozuoren == 'threeji'
               "
               @click="handleShenPi(scope.row)"
               v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
@@ -832,7 +842,7 @@ import {
   listThebusConfig,
   getThebusUser,
 } from "@/api/militaryvehicleManagement/thebusConfig";
-import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
+import { getAll, getUser } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "ThebusApply",
@@ -908,7 +918,7 @@ export default {
       treeList: [],
       // 人员列表
       renYuan: [],
-      // 获取营级审批人
+      // 获取所在单位审批人
       userRen: [],
       // 审批模板
       shenPi: [],
@@ -1232,6 +1242,12 @@ export default {
     selectPeo(data) {
       this.form.unitName = data.label;
       this.getRen(data.id);
+      this.getSuozaiRen(data.id);
+    },
+    getSuozaiRen(id) {
+      getUser(id).then((res) => {
+        this.userRen = res.data;
+      });
     },
     /** 查询用车申请列表 */
     getList() {
@@ -1548,6 +1564,7 @@ export default {
 /* 审批按钮样式 */
 ::v-deep .cell {
   display: flex !important;
+  margin-top: 10px;
 }
 .box {
   background-color: #ffba00 !important;

src/views/thought/thoughtPlan/index.vue

@@ -343,13 +343,33 @@
           />
         </el-form-item>
         <div class="jiben">计划条数</div>
-        <el-form-item prop="remark">
-          <el-input
-            type="textarea"
-            v-model="form.planIntroduction"
-            placeholder="请输入计划详情"
-          />
-        </el-form-item>
+        <div class="jiHua">
+          <el-form v-for="(item1, e) in checkShop" :key="e">
+            <el-form-item prop="remark">
+              <el-input
+                type="textarea"
+                v-model="form.planIntroduction"
+                placeholder="请输入计划详情"
+              />
+              <el-radio v-model="radio" label="1">是否需要响应</el-radio>
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="addForms"
+                v-if="e == checkShop.length - 1"
+              ></el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-delete"
+                size="mini"
+                v-if="e > 0"
+                @click="delForms(e)"
+              ></el-button>
+            </el-form-item>
+            <el-form-item> </el-form-item>
+          </el-form>
+        </div>
         <!-- <el-form-item label="文件路径" prop="filePath">
           <el-input v-model="form.filePath" placeholder="请输入文件路径" />
         </el-form-item>
@@ -470,6 +490,17 @@ export default {
       },
       // 搜索时间的保存
       timeDate: "",
+      radio: null,
+      //添加计划条数表格为空
+      checkShop: [
+        {
+          peopleName: null,
+          foremanName: null,
+          sentryName: null,
+          examineDate: null,
+          dialogue: null,
+        },
+      ],
     };
   },
   created() {
@@ -477,6 +508,21 @@ export default {
     this.treeselect();
   },
   methods: {
+    // 增加对话框
+    addForms() {
+      this.checkShop.push({
+        peopleName: null,
+        foremanName: null,
+        sentryName: null,
+        examineDate: null,
+        dialogue: null,
+      });
+    },
+
+    // 删除对话框
+    delForms(i) {
+      this.checkShop.splice(i, 1);
+    },
     /** 查询月教育计划列表 */
     getList() {
       this.loading = true;
@@ -689,7 +735,7 @@ export default {
 }
 /* 会议文本域样式 */
 ::v-deep .el-form-item__content .el-textarea {
-  width: 1010px;
+  width: 900px;
   /* height: 80px !important; */
 }
 ::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
@@ -966,4 +1012,16 @@ export default {
 /* ::v-deep .el-select-dropdown__item {
   color: white;
 }  */
+/* 计划条数 */
+div.jiHua
+  div.el-form-item
+  div.el-form-item__content
+  div.el-input--medium
+  .el-textarea__inner {
+  width: 600px !important;
+}
+.el-radio {
+  color: #fff;
+  top: -22px;
+}
 </style>