From 801110448c9e1e53de49d5368f911b5fd0fe187a Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Thu, 6 Nov 2025 16:24:26 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=94=B3=E8=AF=B7=E4=BA=BA=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D=E3=80=81=E8=AD=A6=E5=8F=B7=E3=80=81=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=EF=BC=88=E4=BA=8C=E7=BA=A7+=E4=B8=89=E7=BA=A7?=
 =?UTF-8?q?=EF=BC=89=202=E3=80=81=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=E5=8F=B7=E7=A0=81=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E3=80=81=E5=87=BA=E7=94=9F=E5=B9=B4=E6=9C=88?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=8D=95=E4=BD=8D=E5=A1=AB=E5=85=85=E4=B8=AA?=
 =?UTF-8?q?=EF=BC=9B=203=E3=80=81=E5=BC=80=E6=88=B7=E8=A1=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E6=8B=A9=E2=80=9C=E9=95=BF=E6=B2=99=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=E2=80=9D=20=E6=94=AF=E6=8C=81=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rightsComfort/MyComfort.vue         | 16 ++++++++++++++--
 src/views/superviseReport/superviseReport.vue |  9 +++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/views/rightsComfort/MyComfort.vue b/src/views/rightsComfort/MyComfort.vue
index 819dd33..22804ad 100644
--- a/src/views/rightsComfort/MyComfort.vue
+++ b/src/views/rightsComfort/MyComfort.vue
@@ -353,6 +353,9 @@
                                     <span class="text-primary">{{
                                         item.empNo
                                     }}</span>
+                                    <span class="text-primary">
+                                       &nbsp; {{item.parentDepartShortName}}  &nbsp; {{item.departShortName}}
+                                    </span>
                                 </template>
                             </el-autocomplete>
                         </el-form-item>
@@ -826,7 +829,7 @@ import { listPolice } from "@/api/system/police";
 import { listRightPersonByDepartId } from "@/api/system/rightPerson";
 import { secondList } from "@/api/system/depart";
 
-import { getDictLable, getGenderFromIdCode } from "@/utils/util";
+import { getDictLable, getGenderFromIdCode,extractInfoFromID } from "@/utils/util";
 import feedback from "@/utils/feedback";
 
 import useCatchStore from "@/stores/modules/catch";
@@ -887,7 +890,7 @@ function reset() {
     getTodos();
     getDones();
 }
-
+console.log('dict.bank',dict.bank)
 function search() {
     getTodos();
     getDones();
@@ -904,6 +907,7 @@ onMounted(() => {
 
 const show = ref(false);
 const formData = ref({
+    bankCard:'长沙银行',
     applyDate: moment().format("YYYY-MM-DD"),
 });
 const formRef = ref(null);
@@ -997,6 +1001,7 @@ async function querySearch(queryString, cb) {
         current: 1,
         name: queryString,
     });
+    console.log('data',data.records)
     cb(data.records);
 }
 
@@ -1004,6 +1009,13 @@ function handleSelect(item) {
     formData.value.empNo = item.empNo;
     formData.value.idCode = item.idCode;
     formData.value.mobile = item.mobile;
+    formData.value.departId=item.orgId;
+    if(formData.value?.idCode){
+      console.log('formData.value.idCode,',formData.value.idCode )
+      let {birthDate,gender,age}=  extractInfoFromID(formData.value.idCode);
+      formData.value.sex=gender;
+      formData.value.birthday = birthDate;
+    }
 }
 
 watch(
diff --git a/src/views/superviseReport/superviseReport.vue b/src/views/superviseReport/superviseReport.vue
index 0478192..515e20a 100644
--- a/src/views/superviseReport/superviseReport.vue
+++ b/src/views/superviseReport/superviseReport.vue
@@ -149,6 +149,15 @@ function onUploadSuccess(file) {
               <el-input  v-model="query.crtUser" placeholder="请输入督察报告名称"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建单位名称">
+              <depart-tree-select
+                  v-model="query.deptId"
+                  placeholder="创建单位名称"
+
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
         <div class="flex between mt-20 mb-26">
           <div>