更改军车管理

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -147,7 +147,10 @@
       >
         <template slot-scope="scope">
           <span>{{
-            parseTime(scope.row.authStime, "{y}-{m}-{d} {h}:{m}:{s}")
+            parseTime(scope.row.authStime, "{y}-{m}-{d}")
+          }}<br/>
+          {{
+            parseTime(scope.row.authStime, "{h}:{m}:{s}")
           }}</span>
         </template>
       </el-table-column>
@@ -159,8 +162,12 @@
       >
         <template slot-scope="scope">
           <span>{{
-            parseTime(scope.row.authEtime, "{y}-{m}-{d} {h}:{m}:{s}")
-          }}</span>
+            parseTime(scope.row.authEtime, "{y}-{m}-{d}")
+          }}<br/>
+          {{
+            parseTime(scope.row.authEtime, "{h}:{m}:{s}")
+          }}
+        </span>
         </template>
       </el-table-column>
       <el-table-column
@@ -187,7 +194,7 @@
             v-if="scope.row.unitPeopleState == 3"
             :title="scope.row.unitPeopleRemark"
             style="color: #00eaff"
-            >已驳回</el-col
+            >驳回</el-col
           >
           <el-col
             v-if="scope.row.unitPeopleState == 4"
@@ -209,7 +216,7 @@
             v-if="scope.row.chushenState == 3"
             :title="scope.row.chushenRemark"
             style="color: #00eaff"
-            >已驳回</el-col
+            >驳回</el-col
           >
           <el-col
             v-if="scope.row.chushenState == 4"
@@ -253,7 +260,7 @@
             "
             :title="scope.row.peopleoneRemark"
             style="color: #00eaff"
-            >已驳回</el-col
+            >驳回</el-col
           >
           <el-col
             v-if="
@@ -300,7 +307,7 @@
             "
             :title="scope.row.peopletwoRemark"
             style="color: #00eaff"
-            >已驳回</el-col
+            >驳回</el-col
           >
           <el-col
             v-if="
@@ -347,7 +354,7 @@
             "
             :title="scope.row.peoplethreeRemark"
             style="color: #00eaff"
-            >已驳回</el-col
+            >驳回</el-col
           >
           <el-col
             v-if="
@@ -365,7 +372,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="220"
+        width="280"
         class="shenpis"
       >
         <template slot-scope="scope">
@@ -483,6 +490,19 @@
               >审批</el-button
             >
           </div>
+          <el-button
+            size="btbo"
+            type="text"
+            v-if="
+              scope.row.unitPeopleState == 3 ||
+              scope.row.chushenState == 3 ||
+              scope.row.peopleoneState == 3 ||
+              scope.row.peopletwoState == 3 ||
+              scope.row.peoplethreeState == 3
+            "
+            @click="handleUpdates(scope.row)"
+            >驳回原因</el-button
+          >
           <el-button
             size="btu"
             type="text"
@@ -1060,14 +1080,208 @@
         <el-form-item prop="teShuYuanYing">
           <el-input v-model="form.teShuYuanYing" type="textarea" />
         </el-form-item>
-        <div class="jiben">不通过原因</div>
+        <!-- <div class="jiben">不通过原因</div>
         <el-form-item prop="routes">
           <el-input v-model="form.routes" type="textarea" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFormTeShenPi">通过</el-button>
-        <el-button @click="cancelTeShenPi" size="btn">不通过</el-button>
+        <el-button @click="cancelTeShenPi" size="btn">驳回</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 驳回查看对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open1"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="forms"
+        :model="form"
+        :rules="formRules"
+        label-width="80px"
+        inline
+      >
+        <el-form-item label="单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            :options="treeList"
+            placeholder="选择单位"
+            @select="selectPeo"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="人数" prop="peopleCount">
+          <el-input
+            v-model="form.peopleCount"
+            placeholder="请输入人数"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="申请人员" prop="peopleId">
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请选择申请人员"
+            filterable
+            disabled
+            clearable
+          >
+            <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="pepelonamed">
+          <el-select
+            v-model="form.pepelonamed"
+            placeholder="请选择带车人员"
+            filterable
+            disabled
+            clearable
+          >
+            <el-option
+              v-for="(item, i) in daiList"
+              :key="i"
+              :label="item.name"
+              :value="item.name"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contact">
+          <el-input
+            v-model="form.contact"
+            placeholder="请输入联系方式"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="用车型号" prop="model">
+          <el-input
+            v-model="form.model"
+            placeholder="请输入用车型号"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="出车路线" prop="route">
+          <el-input
+            v-model="form.route"
+            placeholder="请输入出车路线"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="用车开始时间" prop="authStime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authStime"
+            type="datetime"
+            placeholder="用车开始时间"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="用车结束时间" prop="authEtime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authEtime"
+            type="datetime"
+            placeholder="用车结束时间"
+            disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="所在单位审批" prop="unitPeopleId">
+          <el-select
+            v-model="form.unitPeopleId"
+            placeholder="请选择所在单位审批人"
+            filterable
+            disabled
+          >
+            <el-option
+              v-for="(item, i) in userRen"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="yinJi(item.nickName)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批模板" prop="thebusThemplateId">
+          <el-select
+            v-model="form.thebusThemplateId"
+            placeholder="请选择审批模板"
+            filterable
+          disabled
+          >
+            <el-option
+              v-for="(item, i) in shenPi"
+              :key="i"
+              :label="item.shenpiname"
+              :value="item.id"
+              @click.native="shenPiThemplate(item)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="people1Id">
+          <el-input
+            v-model="form.peopleoneName"
+            placeholder="请输入一级审批人"
+            readonly
+          />
+        </el-form-item>
+        <el-form-item label="二级审批人" prop="people2Id">
+          <el-input
+            v-model="form.peopletwoName"
+            placeholder="请输入二级审批人"
+            readonly
+          />
+        </el-form-item>
+        <el-form-item label="三级审批人" prop="people3Id">
+          <el-input
+            v-model="form.peoplethreeName"
+            placeholder="请输入三级审批人"
+            readonly
+          />
+        </el-form-item>
+        <div class="jiben">外出事由</div>
+        <el-form-item label="" prop="cause">
+          <el-input
+            v-model="form.cause"
+            placeholder="请输入外出事由"
+            type="textarea"
+          />
+        </el-form-item>
+        <div class="jiben">不通过原因</div>
+        <el-form-item >
+          <el-input v-model="form.unitPeopleRemark" type="textarea" v-if="form.unitPeopleState==3&&form.unitPeopleRemark"/>
+          <el-input v-model="form.chushenRemark" type="textarea" v-if="form.chushenState==3&&form.chushenRemark"/>
+          <el-input v-model="form.peopleoneRemark" type="textarea"  v-if="form.peopleoneState==3&&form.peopleoneRemark"/>
+          <el-input v-model="form.peopletwoRemark" type="textarea" v-if="form.peopletwoState==3&&form.peopletwoRemark"/>
+          <el-input v-model="form.peoplethreeRemark" type="textarea"  v-if="form.peoplethreeState==3&&form.peoplethreeRemark"/>
+          <el-input v-model="form.ojtsYuanyin" type="textarea" v-if="form.peopleoneState==3&&form.ojtsYuanyin"/>
+          <el-input v-model="form.tjtsYuanyin" type="textarea" v-if="form.peopletwoState==3&&form.tjtsYuanyin"/>
+          <el-input v-model="form.sjtsYuanyin" type="textarea" v-if="form.peoplethreeState==3&&form.sjtsYuanyin"/>
+        </el-form-item>
+        <!-- <div class="jiben" v-if="form.tjtsYuanyin">特殊审批原因</div>
+        <el-form-item prop="routes" v-if="form.tjtsYuanyin">
+          <el-input v-model="form.tjtsYuanyin" type="textarea"/>
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="quxiao" size="btn">取消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -1211,7 +1425,7 @@ export default {
       // 特殊审批表单校验·
       formRulesTe: {
         routes: [
-          { required: true, message: "请输入不通过原因", trigger: "blur" },
+          // { required: true, message: "请输入不通过原因", trigger: "blur" },
         ],
         teShuYuanYing: [
           { required: true, message: "请输入特殊审批原因", trigger: "blur" },
@@ -1226,6 +1440,8 @@ export default {
       examine: [],
       // 带车人员列表
       daiList: [],
+      // 驳回弹出层
+      open1:false
     };
   },
   created() {
@@ -1672,6 +1888,26 @@ export default {
       this.form.authStime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
       this.form.authEtime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
     },
+
+  // 驳回原因按钮操作
+  handleUpdates(row) {
+      this.reset();
+      this.getTreeList();
+      this.getYingJi();
+      this.getShenPi();
+      this.getSuo();
+      this.getDaiAll();
+      const id = row.id || this.ids;
+      getThebusApply(id).then((response) => {
+        this.form = response.data;
+        this.open1 = true;
+        this.title = "驳回查看";
+      });
+    },
+    quxiao(){
+      this.reset();
+      this.open1 = false;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.dislable = false;
@@ -1931,5 +2167,31 @@ export default {
   background-color: transparent;
   color: #fff;
 }
+
+/* 驳回原因按钮 */
+.el-button--btbo.is-active,
+.el-button--btbo:active {
+  background: #1d96ff;
+  border-color: #1d96ff;
+  color: #ffffff;
+}
+
+.el-button--btbo:focus,
+.el-button--btbo:hover {
+  background: #41a4fa;
+  border-color: #41a4fa;
+  color: #ffffff;
+}
+
+.el-button--btbo {
+  width: 82px !important;
+  border: 1px solid transparent;
+  padding: 4px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1d96ff;
+}
 </style>
 

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -541,6 +541,9 @@
         <el-form-item label="外出事由" prop="cause">
           <el-input v-model="forms.cause" disabled />
         </el-form-item>
+        <el-form-item label="出车原因" prop="bdglDepartureYuanyin">
+          <el-input type="textarea" v-model="forms.bdglDepartureYuanyin" disabled />
+        </el-form-item>
         <div class="box4">
           <table
             border="1"
@@ -1301,5 +1304,11 @@ hr {
 ::v-deep .box6 .el-form .el-form-item {
   margin-right: 9px !important ;
 }
+
+::v-deep .is-disabled .el-textarea__inner {
+  width: 820px;
+  height: 104px;
+  margin: auto;
+}
 </style>