同步

src/views/militaryvehicleManagement/driver/index.vue

@@ -441,6 +441,13 @@ export default {
     });
   },
   methods: {
+    // 重置人员联系
+    ChongZhi() {
+      this.form.peopleId = null;
+      this.form.contact = null;
+      this.form.enlistDate = null;
+      this.form.birthDate = null;
+    },
     // 字典翻译sex
     sexLian(row) {
       var sex = "";
@@ -487,6 +494,7 @@ export default {
     // 选择部门单位触发
     selectPeo(data) {
       this.form.unitName = data.label;
+      this.ChongZhi();
       this.getRen(data.id);
     },
     //  获取单位列表
@@ -553,6 +561,7 @@ export default {
     handleAdd() {
       this.getTreeList();
       this.reset();
+      this.renYuan = [];
       this.open = true;
       this.title = "添加军车司机设置";
     },

src/views/militaryvehicleManagement/thebus/index.vue

@@ -598,6 +598,10 @@ export default {
     });
   },
   methods: {
+    // 重置人员
+    ChongZhi() {
+      (this.form.peopleId = null), (this.form.contactnumber = null);
+    },
     // 翻译车辆型号
     vehicleModel(row, column) {
       var vehiclemodel = "";
@@ -636,6 +640,7 @@ export default {
     // 选择部门单位触发
     selectPeo(data) {
       this.form.unitName = data.label;
+      this.ChongZhi();
       this.getRen(data.id);
     },
     // 获取人员列表
@@ -713,6 +718,7 @@ export default {
     handleAdd() {
       this.reset();
       this.getTreeList();
+      this.renYuan = [];
       this.open = true;
       this.title = "添加军车管理";
     },

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -235,7 +235,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">重置</el-button>
       </div>
     </el-dialog>
   </div>
@@ -331,6 +331,10 @@ export default {
     });
   },
   methods: {
+    // 重置人员
+    ChongZhi() {
+      this.form.driverId = null;
+    },
     // 字典翻译车辆类型
     carXingHao(row) {
       var carXingHao = "";
@@ -360,6 +364,7 @@ export default {
     // 选择部门单位触发
     selectPeo(data) {
       this.form.unitName = data.label;
+      this.ChongZhi();
       this.getRen(data.id);
     },
     // 车牌号触发
@@ -382,9 +387,9 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
+    // 重置按钮
     cancel() {
-      this.open = false;
+      // this.open = false;
       this.reset();
     },
     // 表单重置

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -522,13 +522,31 @@
         inline
       >
         <el-form-item label="单位" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位" />
+          <treeselect
+            v-model="form.unitId"
+            :options="treeList"
+            placeholder="选择单位"
+            @select="selectPeo"
+          />
         </el-form-item>
         <el-form-item label="人数" prop="peopleCount">
           <el-input v-model="form.peopleCount" placeholder="请输入人数" />
         </el-form-item>
         <el-form-item label="人员名称" prop="peopleId">
-          <el-input v-model="form.peopleId" placeholder="请输入人员名称" />
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请选择人员名称"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="cheRen(item.name)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="联系方式" prop="contact">
           <el-input v-model="form.contact" placeholder="请输入联系方式" />
@@ -537,10 +555,26 @@
           <el-input v-model="form.cause" placeholder="请输入外出事由" />
         </el-form-item>
         <el-form-item label="授权开始时间" prop="authStime">
-          <el-input v-model="form.authStime" placeholder="请输入授权开始时间" />
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authStime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权开始时间"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="授权结束时间" prop="authEtime">
-          <el-input v-model="form.authEtime" placeholder="请输入授权结束时间" />
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authEtime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权结束时间"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="营级审批人" prop="unitPeopleId">
           <el-input
@@ -568,119 +602,6 @@
             placeholder="请输入出车路线"
           />
         </el-form-item>
-        <!-- <el-form-item label="人员名称" prop="thebusId">
-          <el-input v-model="form.thebusId" placeholder="请输入人员名称" />
-        </el-form-item>
-
-        <el-form-item label="审批模板" prop="thebusThemplateId">
-          <el-input
-            v-model="form.thebusThemplateId"
-            placeholder="请输入审批模板"
-          />
-        </el-form-item>
-
-        <el-form-item label="一级审批状态" prop="people1State">
-          <el-input
-            v-model="form.people1State"
-            placeholder="请输入一级审批状态"
-          />
-        </el-form-item>
-        <el-form-item label="一级审批备注" prop="people1Remark">
-          <el-input
-            v-model="form.people1Remark"
-            placeholder="请输入一级审批备注"
-          />
-        </el-form-item>
-        <el-form-item label="一级审批时间" prop="people1Authtime">
-          <el-input
-            v-model="form.people1Authtime"
-            placeholder="请输入一级审批时间"
-          />
-        </el-form-item>
-
-        <el-form-item label="二级审批状态" prop="people2State">
-          <el-input
-            v-model="form.people2State"
-            placeholder="请输入二级审批状态"
-          />
-        </el-form-item>
-        <el-form-item label="二级审批备注" prop="people2Remark">
-          <el-input
-            v-model="form.people2Remark"
-            placeholder="请输入二级审批备注"
-          />
-        </el-form-item>
-        <el-form-item label="二级审批时间" prop="people2Authtime">
-          <el-input
-            v-model="form.people2Authtime"
-            placeholder="请输入二级审批时间"
-          />
-        </el-form-item>
-
-        <el-form-item label="三级审批状态" prop="people3State">
-          <el-input
-            v-model="form.people3State"
-            placeholder="请输入三级审批状态"
-          />
-        </el-form-item>
-        <el-form-item label="三级审批备注" prop="people3Remark">
-          <el-input
-            v-model="form.people3Remark"
-            placeholder="请输入三级审批备注"
-          />
-        </el-form-item>
-        <el-form-item label="三级审批时间" prop="people3Authtime">
-          <el-input
-            v-model="form.people3Authtime"
-            placeholder="请输入三级审批时间"
-          />
-        </el-form-item>
-        <el-form-item label="整体审批状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="出车状态">
-          <el-radio-group v-model="form.outstatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="操作人" prop="adminId">
-          <el-input v-model="form.adminId" placeholder="请输入操作人" />
-        </el-form-item>
-        <el-form-item label="车辆司机" prop="driver">
-          <el-input v-model="form.driver" placeholder="请输入车辆司机" />
-        </el-form-item>
-        <el-form-item label="车辆联系方式" prop="driverContact">
-          <el-input
-            v-model="form.driverContact"
-            placeholder="请输入车辆联系方式"
-          />
-        </el-form-item>
-        <el-form-item label="营级审批状态" prop="unitPeopleState">
-          <el-input
-            v-model="form.unitPeopleState"
-            placeholder="请输入营级审批状态"
-          />
-        </el-form-item>
-        <el-form-item label="营级审批备注" prop="unitPeopleRemark">
-          <el-input
-            v-model="form.unitPeopleRemark"
-            placeholder="请输入营级审批备注"
-          />
-        </el-form-item>
-        <el-form-item label="初审审批状态" prop="chushenState">
-          <el-input
-            v-model="form.chushenState"
-            placeholder="请输入初审审批状态"
-          />
-        </el-form-item>
-        <el-form-item label="初审审批备注" prop="chushenRemark">
-          <el-input
-            v-model="form.chushenRemark"
-            placeholder="请输入初审审批备注"
-          />
-        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -699,9 +620,16 @@ import {
   updateThebusApply,
   exportThebusApply,
 } from "@/api/militaryvehicleManagement/thebusApply";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getZhuChiRen, getDept } from "@/api/militaryvehicleManagement/thebus";
 
 export default {
   name: "ThebusApply",
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -767,12 +695,37 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 树形列表
+      treeList: [],
+      // 人员列表
+      renYuan: [],
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    // 选择车辆人员触发
+    cheRen(name) {
+      this.form.driverName = name;
+    },
+    // 获取人员列表
+    getRen(id) {
+      getZhuChiRen(id).then((res) => {
+        this.renYuan = res.data;
+      });
+    },
+    //  获取单位列表
+    getTreeList() {
+      getDept().then((res) => {
+        this.treeList = res.data;
+      });
+    },
+    // 选择部门单位触发
+    selectPeo(data) {
+      this.form.unitName = data.label;
+      this.getRen(data.id);
+    },
     /** 查询用车申请列表 */
     getList() {
       this.loading = true;
@@ -847,6 +800,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getTreeList();
       this.open = true;
       this.title = "添加用车申请";
     },

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -136,62 +136,65 @@
         label-width="80px"
         inline
       >
+        <el-form-item label="" prop="">
+          <el-input
+            v-model="form.shenpiname"
+            placeholder="审批模板名称"
+          ></el-input>
+        </el-form-item>
         <div class="box3">
           <el-form v-for="(item1, e) in checkShop" :key="e">
-            <div>
-              <el-form-item label="" prop="">
-                <el-input
-                  v-model="item1.peopleName"
-                  placeholder="检查人"
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-input
-                  v-model="item1.foremanName"
-                  placeholder="领班员"
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-input
-                  v-model="item1.sentryName"
-                  placeholder="哨兵姓名"
-                ></el-input>
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-date-picker
-                  v-model="item1.examineDate"
-                  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="item1.dialogue"
-                  placeholder="检查情况"
-                ></el-input>
-              </el-form-item>
-              <el-form-item>
-                <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>
-            </div>
+            <el-form-item label="" prop="">
+              <el-input
+                v-model="item1.oneshenpirenid"
+                placeholder="一级审批人"
+              ></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                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>
+          <el-form-item label="" prop="">
+            <el-input
+              v-model="twoshenpirenid"
+              placeholder="二级审批人"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="" prop="">
+            <el-input
+              v-model="threeshenpirenid"
+              placeholder="三级审批人"
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              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>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -256,11 +259,10 @@ export default {
       //添加对话框查铺表格为空
       checkShop: [
         {
-          peopleName: null,
-          foremanName: null,
-          sentryName: null,
-          examineDate: null,
-          dialogue: null,
+          shenpiname: null,
+          oneshenpirenid: null,
+          twoshenpirenid: null,
+          threeshenpirenid: null,
         },
       ],
     };
@@ -277,11 +279,10 @@ export default {
     // 增加对话框查铺
     addForms() {
       this.checkShop.push({
-        peopleName: null,
-        foremanName: null,
-        sentryName: null,
-        examineDate: null,
-        dialogue: null,
+        shenpiname: null,
+        oneshenpirenid: null,
+        twoshenpirenid: null,
+        threeshenpirenid: null,
       });
     },
     /** 查询军车管理设置列表 */
@@ -518,7 +519,7 @@ export default {
   margin-right: 76px;
 }
 ::v-deep .el-dialog__body {
-  padding: 30px 60px;
+  padding: 30px 0px;
 }
 /* 小手样式 */
 ::v-deep .el-table__cell {
@@ -534,4 +535,40 @@ export default {
   color: #fff;
   background-color: #1890ff;
 }
+/* 查铺查哨-临时来对亲属 */
+.box3 {
+  width: 680px;
+  min-height: 70px;
+  border-radius: 5px;
+  /* background: #409eff; */
+  margin-bottom: 30px;
+  padding-top: 15px;
+  padding-left: 15px;
+}
+/* 表单长度 */
+::v-deep .box3 .el-form-item__content {
+  width: 116px;
+}
+::v-deep .box3 .el-input__inner {
+  width: 116px;
+  height: 37px;
+}
+/* 添加删除按钮 */
+::v-deep .box3 .el-button {
+  width: 32px;
+  height: 32px;
+  text-align: center;
+  margin-left: -6px;
+  margin-right: 3px;
+  margin-left: 8px;
+}
+::v-deep .box3 .el-button .el-icon-plus {
+  margin-left: -6px;
+}
+::v-deep .box3 .el-button .el-icon-delete {
+  margin-left: -6px;
+}
+.box3 > .box4 {
+  width: 100px;
+}
 </style>