From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/RepairOrderList.vue | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue
index 3cae629..764d7a9 100644
--- a/src/views/eam/RepairOrderList.vue
+++ b/src/views/eam/RepairOrderList.vue
@@ -104,11 +104,11 @@
:sm="24"
>
<a-form-item
- label="杞﹂棿"
+ label="宸ュ尯"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨璧勮溅闂�"
+ placeholder="璇烽�夋嫨璧勫伐鍖�"
:triggerChange="true"
dictCode="mom_base_factory_model,name,id,del_flag!='1'"
v-model="queryParam.factoryModelId"
@@ -439,10 +439,21 @@
import EquipmentDocumentList from './RepairOrderEquipmentDocumentList'
import '@/assets/less/TableExpand.less'
import { putAction } from '../../api/manage'
-import RepairOrderAssignTask from './modules/repairorder/RepairOrderAssignTask.vue'
-import RepairOrderExcuteDrawer from './modules/repairorder/repairOrderExcuteDrawer.vue'
+import RepairOrderAssignTask from './modules/repairorder/RepairOrderAssignTask'
+import RepairOrderExcuteDrawer from './modules/repairorder/repairOrderExcuteDrawer'
import FaultDescriptionList from './FaultDescriptionList'
import FaultReportRepair from './modules/repairorder/moudles/select/FaultReportRepair.vue'
+import store from '@/store'
+import {
+ ACCESS_TOKEN,
+ USER_NAME,
+ USER_INFO,
+ USER_AUTH,
+ SYS_BUTTON_AUTH,
+ UI_CACHE_DB_DICT_DATA,
+ TENANT_ID,
+ CACHE_INCLUDED_ROUTES
+} from '@/store/mutation-types'
export default {
name: "RepairOrderList",
mixins: [JeecgListMixin],
@@ -459,7 +470,8 @@
RepairOrderAssignTask,
RepairOrderExcuteDrawer,
FaultDescriptionList,
- FaultReportRepair
+ FaultReportRepair,
+ store
},
data() {
return {
@@ -774,6 +786,7 @@
}
this.onClearSelected()
this.queryParam.repairOrderType = 0;
+ this.queryParam.userId = store.getters.userInfo.id
var params = this.getQueryParams();//鏌ヨ鏉′欢
this.loading = true;
getAction(this.url.list, params).then((res) => {
--
Gitblit v1.9.3