提交代码

src/views/gas/emergencyRepair/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="报修人名称" prop="repairName">
+      <el-form-item label="工程名称" prop="repairName">
         <el-input
           v-model="queryParams.repairName"
-          placeholder="请输入报修人名称"
+          placeholder="请输入工程名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -108,7 +108,7 @@
       <!--      <el-table-column label="所属小区" align="center" prop="areaName"/>-->
       <!--      <el-table-column label="所属楼宇" align="center" prop="buildingName"/>-->
       <!--      <el-table-column label="所属单元" align="center" prop="unitName"/>-->
-      <el-table-column label="报修人名称" align="center" prop="repairName"/>
+      <el-table-column label="工程名称" align="center" prop="repairName"/>
       <el-table-column label="报修人电话" align="center" prop="repairPhone"/>
       <el-table-column label="报修类型" align="center" prop="repairType">
         <template slot-scope="scope">
@@ -122,21 +122,21 @@
         </template>
       </el-table-column>
       <el-table-column label="维修人" align="center" prop="maintenanceName"/>
-      <el-table-column label="维修时间" align="center" prop="maintenanceTime" width="180">
+      <el-table-column label="完成时间" align="center" prop="maintenanceTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.maintenanceTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.maintenanceTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.processList.length == 0">未审核</span>
           <span v-else-if="scope.row.processList[0].processStatus == '0'">
-            <span v-if="scope.row.processList[0].userPost == 'admin'">管理员</span>
+<!--            <span v-if="scope.row.processList[0].userPost == 'admin'">管理员</span>-->
             <span v-if="scope.row.processList[0].userPost == 'deputyDirector'">副处长</span>
             <span v-if="scope.row.processList[0].userPost == 'director'">处长</span>
             通过</span>
           <span v-else>
-            <span v-if="scope.row.processList[0].userPost == 'admin'">管理员</span>
+<!--            <span v-if="scope.row.processList[0].userPost == 'admin'">管理员</span>-->
             <span v-if="scope.row.processList[0].userPost == 'deputyDirector'">副处长</span>
             <span v-if="scope.row.processList[0].userPost == 'director'">处长</span>
             拒绝</span>
@@ -169,23 +169,22 @@
             v-hasPermi="['gas:emergencyRepair:remove']"
           >审核记录
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-show="postName == 'admin' && (scope.row.processList.length == 0
-            || scope.row.processList.filter(item => item.userPost == 'admin').length == 0
-            || scope.row.processList.filter(item => item.userPost == 'admin' && item.processStatus == '0').length == 0)"
-            @click="openshShow(scope.row,'admin',true)"
-            v-hasPermi="['gas:emergencyRepair:remove']"
-          >工程审核
-          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            v-show="postName == 'admin' && (scope.row.processList.length == 0-->
+<!--            || scope.row.processList.filter(item => item.userPost == 'admin').length == 0-->
+<!--            || scope.row.processList.filter(item => item.userPost == 'admin' && item.processStatus == '0').length == 0)"-->
+<!--            @click="openshShow(scope.row,'admin',true)"-->
+<!--            v-hasPermi="['gas:emergencyRepair:remove']"-->
+<!--          >工程审核-->
+<!--          </el-button>-->
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             v-show="postName == 'deputyDirector'
-            && scope.row.processList.filter(item => item.userPost == 'admin' && item.processStatus == '0').length > 0
             && (scope.row.processList.length == 0
             || scope.row.processList.filter(item => item.userPost == 'deputyDirector').length == 0
             || scope.row.processList.filter(item => item.userPost == 'deputyDirector' && item.processStatus == '0').length == 0)"
@@ -198,7 +197,6 @@
             type="text"
             icon="el-icon-edit"
             v-show="postName == 'director'
-            && scope.row.processList.filter(item => item.userPost == 'admin' && item.processStatus == '0').length > 0
             && scope.row.processList.filter(item => item.userPost == 'deputyDirector' && item.processStatus == '0').length > 0
             && (scope.row.processList.length == 0
             || scope.row.processList.filter(item => item.userPost == 'director').length == 0
@@ -244,7 +242,7 @@
             label="岗位"
             width="65">
             <template slot-scope="scope">
-              <span v-if="scope.row.userPost == 'admin'">管理员</span>
+<!--              <span v-if="scope.row.userPost == 'admin'">管理员</span>-->
               <span v-if="scope.row.userPost == 'deputyDirector'">副处长</span>
               <span v-if="scope.row.userPost == 'director'">处长</span>
             </template>
@@ -347,8 +345,8 @@
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="报修人名称" prop="repairName">
-              <el-input v-model="form.repairName" placeholder="请输入报修人名称"/>
+            <el-form-item label="工程名称" prop="repairName">
+              <el-input v-model="form.repairName" placeholder="请输入工程名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -419,13 +417,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="维修时间" prop="maintenanceTime">
+            <el-form-item label="完成时间" prop="maintenanceTime">
               <el-date-picker clearable size="small"
                               :style="{width: '100%'}"
                               v-model="form.maintenanceTime"
                               type="datetime"
                               value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="选择维修时间">
+                              placeholder="选择完成时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -529,7 +527,7 @@ export default {
         //   {required: true, message: "单元id不能为空", trigger: "blur"}
         // ],
         repairName: [
-          {required: true, message: "报修人名称不能为空", trigger: "blur"}
+          {required: true, message: "工程名称不能为空", trigger: "blur"}
         ],
         repairPhone: [
           {required: true, message: "报修人电话不能为空", trigger: "blur"},
@@ -562,7 +560,7 @@ export default {
           {required: true, message: "维修人不能为空", trigger: "blur"}
         ],
         maintenanceTime: [
-          {required: true, message: "维修时间不能为空", trigger: "blur"}
+          {required: true, message: "完成时间不能为空", trigger: "blur"}
         ],
       }
     };

src/views/system/user/index.vue

@@ -290,13 +290,14 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="岗位">
-              <el-select v-model="form.postIds" clearable placeholder="请选择">
+              <el-select v-model="form.postId" clearable placeholder="请选择" @change="$forceUpdate()">
                 <el-option
                   v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
+                  :key="item.key"
+                  :label="item.label"
+                  :value="item.value"
                   :disabled="item.status == 1"
+
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -589,7 +590,16 @@ export default {
       this.reset();
       this.getTreeselect();
       getUser().then(response => {
-        this.postOptions = response.data.posts;
+        let datra = [];
+        response.data.posts.forEach( item =>{
+          datra.push({
+            label: item.postName,
+            value: item.postId,
+            key: item.postId
+          })
+        })
+        console.log(datra)
+        this.postOptions = datra
         this.roleOptions = response.data.roles;
         this.open = true;
         this.title = "添加用户";
@@ -603,7 +613,16 @@ export default {
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
         this.form = response.data.user;
-        this.postOptions = response.data.posts;
+        let datra = [];
+        response.data.posts.forEach( item =>{
+          datra.push({
+            label: item.postName,
+            value: item.postId,
+            key: item.postId
+          })
+        })
+        console.log(datra)
+        this.postOptions = datra
         this.roleOptions = response.data.roles;
         this.form.postIds = response.data.postIds.join() !== '' ? response.data.postIds.join() * 1 : response.data.postIds.join();
         console.log(this.form.postIds)