提交

src/enum/dict.js

@@ -22,7 +22,8 @@ export default {
   告警触发条件: 'warning_conditions',
   计划性质: 'nature_plan',
   巡点检工单状态: 'patrolwork_status',
-  巡点检周期: 'patrol_cycle'
+  巡点检周期: 'patrol_cycle',
+  维修计划状态: 'repairplan_status'
 };
 
 export const numberList = ['patrol_cycle'];

src/views/maintenance/repair/maintenancePlan/add.vue

@@ -27,19 +27,18 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="审批部门：" prop="verifyDeptCode">					
-				<deptSelect
-				  v-model="addForm.verifyDeptCode"
-				  @change="searchDeptNodeClick"
-				/>
-            </el-select>
+			<deptSelect
+				v-model="addForm.verifyDeptCode"
+				@change="searchDeptNodeClick"
+			/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="审批人：" prop="executorId">
 			 <personSelect
-			   ref="executorRef"
-			   v-model="addForm.executorId"
-			   :init="false"
+				 ref="executorRef"
+				 v-model="addForm.executorId"
+				 :init="false"
 			 />
           </el-form-item>
         </el-col>
@@ -142,13 +141,13 @@
     >
       <div class="search_msg">
         <el-input
-          v-model="searchMsg"
-          style="width: 30%"
+          v-model="code"
+          style="width: 30%;margin-right: 20px;"
           clearable
-          placeholder="输入编码或名称按回车搜索"
-          size="small"
-          @keyup.enter.native="searchByKeyWords"
+          placeholder="请输入编码"
         ></el-input>
+		<el-button type="primary" @click="searchByKeyWords">确定</el-button>
+		<el-button type="primary" @click="resetSearch">重置</el-button>
       </div>
       <el-table
         :data="notesData"
@@ -203,9 +202,9 @@
           background
           layout="total, sizes, prev, pager, next, jumper"
           :page-sizes="[10, 15, 20, 30, 50]"
-          :current-page.sync="pagination.page"
+          :current-page.sync="pagination.pageNum"
           :page-size.sync="pagination.size"
-          :total="pagination.total"
+          :total="total"
           @current-change="handleCurrentChange"
           @size-change="handleSizeChange"
         >
@@ -378,7 +377,8 @@
 
 <script>
   import personSelect from '@/components/CommomSelect/person-select.vue';
-	import deptSelect from '@/components/CommomSelect/dept-select.vue';
+  import deptSelect from '@/components/CommomSelect/dept-select.vue';
+  import { getPage  } from '@/api/maintenance/repair_report';
 export default {
   components: {
     personSelect,
@@ -393,7 +393,7 @@ export default {
       selectNotesVisible: false, // 弹窗
       notesData: [], // 弹窗- 报修记录表格
       notesSelection: [], // 弹窗 - 表格多选
-      searchMsg: '', // 弹窗 - 关键字搜索
+      code: '', // 弹窗 - 关键字搜索
       addForm: {
         // planCode: getRuleNo('PL'), // 计划单号
         planName: '', // 计划名称
@@ -404,19 +404,15 @@ export default {
         verifyUserName: '' // 审批人名称
       },
       pagination: {
-        page: 1,
+        pageNum: 1,
         size: 10,
-        total: 0
-      },
+      }, 
+	  total: 0,
       rules: {
-        // planCode: [{ required: true }],
         planName: [{ required: true, message: '请输入计划名称' }],
         urgent: [{ required: true, message: '请选择紧急程度' }],
         verifyDeptCode: [{ required: true, message: '请选择审批部门' }],
-        // verifyDeptName: [
-        //   { required: true, message: '请选择审批部门' }
-        // ],
-        verifyUserName: [{ required: true, message: '请选择审批人' }]
+        executorId: [{ required: true, message: '请选择审批人' }]
       },
       settingIndex: null, // 保存的设备明细表格行index
       settingExecutorVisible: false, // 设置执行人弹窗
@@ -669,36 +665,36 @@ export default {
     },
 
     // 弹窗 - 报修记录表格数据
-    async _getNotesData (data = { searchMsg: '', statusList: [0, 6] }) {
-      let params = {
-        page: this.pagination.page,
-        size: this.pagination.size
+    async _getNotesData () {
+	  let params = {
+        ...this.pagination,
+        code:this.code
       }
-      const res = await repair.getPage(params, data)
-      this.notesData = res.data.records
-      this.pagination.total = res.data.total
+      const res = await getPage(params)
+      this.notesData = res.list
+      this.total = res.count
     },
 
     // 弹窗 - 分页器方法
     handleCurrentChange (page) {
-      this.pagination.page = page
+      this.pagination.pageNum = page
       this._getNotesData()
     },
     handleSizeChange (size) {
-      this.pagination.page = 1
+      this.pagination.pageNum = 1
       this.pagination.size = size
       this._getNotesData()
     },
 
     // 弹窗 - 按关键字搜索
     searchByKeyWords () {
-      // console.log(this.searchMsg)
-      const data = {
-        searchMsg: this.searchMsg,
-        statusList: [0, 6]
-      }
-      this._getNotesData(data)
+      this._getNotesData()
     },
+	resetSearch(){
+		this.code = ''
+		this._getNotesData()
+	},
+	
     // 弹窗 - 表格多选
     notesMultipleSelectChange (val) {
       this.notesSelection = val

src/views/maintenance/repair/maintenancePlan/components/maintenance-search.vue

@@ -31,12 +31,15 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="报修人:">
-          <el-input clearable v-model="where.userId" placeholder="请输入" />
+          <personSelect
+			 ref="executorRef"
+			 v-model="where.executorId"
+          />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="状态:">
-          <el-input clearable v-model="where.texture" placeholder="请输入" />
+          <DictSelection dictName="维修计划状态" v-model="where.status" />
         </el-form-item>
         <div class="ele-form-actions">
           <el-button

src/views/maintenance/repair/maintenancePlan/index.vue

@@ -21,14 +21,14 @@
 	       >
 	         新增维修计划
 	       </el-button>
-		   <el-button
+<!-- 		   <el-button
 		     size="small"
 		     type="primary"
 		     class="ele-btn-icon"
 		     @click="goDetail({id:12})"
 		   >
 		     详情
-		   </el-button>
+		   </el-button> -->
 	     </template>
 <!-- 	     <template v-slot:enable="{ row }">
 	       <el-switch

vue.config.js

@@ -33,11 +33,11 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.3.51:86', // 测试
         // target: 'http://192.168.3.34:8080', // 刘毅
-        target: 'http://192.168.3.35:8080', // kang杨威
+        // target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平
-        // target: 'http://192.168.3.34:8080', // 刘毅
+        target: 'http://192.168.3.34:8080', // 刘毅
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {