Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/device/maintenance/index.vue

@@ -122,6 +122,7 @@
                   v-model="maintenanceInfo.userName"
                   placeholder="维护人"
                   size="large"
+                  filterable
                   style="width: 240px"
                 >
                   <el-option
@@ -137,6 +138,7 @@
                   v-model="maintenanceInfo.confirmUser"
                   placeholder="确认人"
                   size="large"
+                  filterable
                   style="width: 240px"
                 >
                   <el-option

src/views/pro/traceability/components/checkCom.vue

@@ -57,7 +57,7 @@ const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等
 const crudRef2 = ref(null); //crudRef.value 获取avue-crud对象
 
 const refreshTra = (row) => {
-  commonConfig.value.params = { seqNo: row.seqNo };
+  commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
   dataList();
 };
 defineExpose({ refreshTra });

src/views/pro/traceability/components/equitCom.vue

@@ -70,7 +70,7 @@ const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等
 const crudRef2 = ref(null); //crudRef.value 获取avue-crud对象
 const userStore = useUserStoreHook();
 const refreshTra = (row) => {
-  commonConfig.value.params = { seqNo: row.seqNo };
+  commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
   dataList();
 };
 const deviceDetail = ref({});

src/views/pro/traceability/components/excelCom.vue

@@ -109,7 +109,7 @@ const doEdit = (row, index) => {
   crudRef2.value && crudRef2.value.rowEdit(row, index);
 };
 const refreshTra = (row) => {
-  commonConfig.value.params = { seqNo: row.seqNo };
+  commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode}
   dataList();
 };
 const refreshDatalist = () => {

src/views/pro/traceability/components/faultCom.vue

@@ -54,7 +54,7 @@ const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 
 const refreshTra = (row) => {
-  commonConfig.value.params = { seqNo: row.seqNo };
+  commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
   dataList();
 };
 const userStore = useUserStoreHook();
@@ -105,7 +105,7 @@ option.value = Object.assign(option.value, {
           ctableRef.value.startSelect();
         }
       },
-      
+
       rules: [
         {
           required: true,

src/views/pro/traceability/components/materialsCom.vue

@@ -68,7 +68,7 @@ const doEdit = (row, index) => {
   crudRef2.value && crudRef2.value.rowEdit(row, index);
 };
 const refreshTra = (row) => {
-  commonConfig.value.params = { seqNo: row.seqNo };
+  commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
   dataList();
 };
 defineExpose({ refreshTra });

src/views/pro/traceability/components/mediaCom.vue

@@ -83,7 +83,7 @@ const openDialog = (row) => {
   url.value = import.meta.env.VITE_APP_UPLOAD_URL + row.filePath;
 };
 const refreshTra = (row) => {
-  commonConfig.value.params = { seqNo: row.seqNo };
+  commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
   dataList();
 };
 const userStore = useUserStoreHook();

src/views/pro/traceability/components/recordCom.vue

@@ -59,7 +59,7 @@ const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 
 const refreshTra = (row) => {
-  commonConfig.value.params = { seqNo: row.seqNo };
+  commonConfig.value.params = { seqNo: row.seqNo,workOrderCode: row.workOrderCode};
   dataList();
 };
 defineExpose({ refreshTra });

src/views/system/user/components/dept-tree.vue

@@ -14,6 +14,7 @@
       :props="{ children: 'children', label: 'deptName', disabled: '' }"
       :expand-on-click-node="false"
       :filter-node-method="handleFilter"
+      highlight-current
       default-expand-all
       @node-click="handleNodeClick"
     />

src/views/system/user/index.vue

@@ -465,6 +465,7 @@ const rules = reactive({
 /** 查询 */
 function handleQuery() {
   loading.value = true;
+  queryParams.deptQuery = queryParams.deptId
   getUserPage(queryParams)
     .then(({ data }) => {
       pageData.value = data.records;