Browse Source

修改提交

LAPTOP-16IUEB3P\Lenovo 3 years ago
parent
commit
d518e99159

+ 2 - 1
src/enum/dict.js

@@ -17,5 +17,6 @@ export default {
   委外单状态: 'extrinsic_state',
   告警级别: 'warning_level',
   告警方式: 'warning_style',
-  告警触发条件: 'warning_conditions'
+  告警触发条件: 'warning_conditions',
+  报修记录来源类型: 'repair_source'
 };

+ 3 - 2
src/views/maintenance/equipment/work/components/work-search.vue

@@ -12,7 +12,7 @@
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
 				<el-form-item label="保养人员:">
-					<el-input clearable v-model="where.name" placeholder="请输入" />
+					<personSelect v-model="where.userId" />
 				</el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -63,8 +63,9 @@
 <script>
   import equipmentSelect from '@/components/CommomSelect/equipment-select.vue';
   import deptSelect from '@/components/CommomSelect/dept-select.vue';
+	import personSelect from '@/components/CommomSelect/person-select.vue';
   export default {
-		components: { equipmentSelect , deptSelect },
+		components: { equipmentSelect , deptSelect , personSelect },
     data() {
       // 默认表单数据
       const defaultWhere = {

+ 3 - 2
src/views/maintenance/repair/maintenancePlan/components/maintenance-search.vue

@@ -31,7 +31,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="报修人:">
-          <el-input clearable v-model="where.dep" placeholder="请输入" />
+          <personSelect v-model="where.userId" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -60,8 +60,9 @@
 </template>
 
 <script>
-  import { login } from '@/api/login';
+  import personSelect from '@/components/CommomSelect/person-select.vue';
   export default {
+	components: { personSelect },
     data() {
       // 默认表单数据
       const defaultWhere = {

+ 6 - 3
src/views/maintenance/repair/outsourcingOrder/components/order-search.vue

@@ -20,7 +20,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="执行人:" label-width="60px">
-           <el-select
+<!--           <el-select
              v-model="where.approvalUserId"
              size="small"
              clearable
@@ -33,7 +33,8 @@
                :value="item.id"
                :label="item.name"
              ></el-option>
-           </el-select>
+           </el-select> -->
+					 <personSelect v-model="where.approvalUserId" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 7, md: 12 } : { span: 7 }">
@@ -72,8 +73,10 @@
 </template>
 
 <script>
-   import {  getUserPage } from '@/api/system/organization';
+  import {  getUserPage } from '@/api/system/organization';
+  import personSelect from '@/components/CommomSelect/person-select.vue';
   export default {
+		components: { personSelect },
     data() {
       // 默认表单数据
       const defaultWhere = {

+ 4 - 3
src/views/maintenance/repair/repairNotes/components/notes-search.vue

@@ -26,12 +26,12 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="来源类型:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <DictSelection dictName="报修记录来源类型" clearable  v-model="where.type" > </DictSelection>
         </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.dep" placeholder="请输入" />
+          <personSelect v-model="where.userId" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -60,8 +60,9 @@
 </template>
 
 <script>
-  import { login } from '@/api/login';
+  import personSelect from '@/components/CommomSelect/person-select.vue';
   export default {
+	components: { personSelect },  
     data() {
       // 默认表单数据
       const defaultWhere = {

+ 3 - 2
src/views/maintenance/repair/workOrder/components/workorder-search.vue

@@ -20,7 +20,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="执行人:"  label-width="80px">
-          <el-input clearable v-model="where.dep" placeholder="请输入" />
+          <personSelect v-model="where.userId" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 9, md: 12 } : { span: 9 }">
@@ -58,8 +58,9 @@
 </template>
 
 <script>
-  import { login } from '@/api/login';
+  import personSelect from '@/components/CommomSelect/person-select.vue';
   export default {
+	components: { personSelect },
     data() {
       // 默认表单数据
       const defaultWhere = {