Merge branch 'master' into master-zzby

src/views/main/system/dict/data.vue

@@ -163,9 +163,9 @@
     <el-pagination
       v-show="total > 0"
       :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+      :page-size="queryParams.pageSize"
+      v-model:current-page="queryParams.pageNum"
+      @current-change="changePage"
     />
 
     <!-- 添加或修改参数配置对话框 -->
@@ -307,7 +307,7 @@ function getTypeList() {
 /** 查询字典数据列表 */
 function getList() {
   loading.value = true
-  console.log(queryParams.value)
+  console.log(queryParams.value, '123123')
   listData(queryParams.value).then((response) => {
     dataList.value = response.data
     total.value = response.total
@@ -420,6 +420,11 @@ function handleExport() {
   )
 }
 
+function changePage(val) {
+  queryParams.value.pageNum = val
+  getList()
+}
+
 getTypes(route.params && route.params.dictId)
 getTypeList()
 </script>

src/views/main/workOrderManagement/workHandle.vue

@@ -291,11 +291,11 @@
         <div class="listCss">
           <div>
             <div>姓名</div>
-            <div>{{ kehuData.customerName || '-' }}</div>
+            <div>{{ kehuData.name || '-' }}</div>
           </div>
           <div>
             <div>电话</div>
-            <div>{{ kehuData.customerPhone || '-' }}</div>
+            <div>{{ kehuData.phoneNumber && userDecryptToAsterisk(kehuData.phoneNumber) }}</div>
           </div>
           <!-- <div>
             <div>公司</div>
@@ -306,14 +306,14 @@
             <div>
               <el-tag
                 style="margin-left: 1px"
-                v-for="(item, index) in kehuData.labelName"
+                v-for="(item, index) in kehuData.labellist"
                 :key="index"
-              >{{ item || '-' }}</el-tag>
+              >{{ item.labelName || '-' }}</el-tag>
             </div>
           </div>
           <div>
             <div>性别</div>
-            <div>{{ kehuData.customerSex || '-' }}</div>
+            <div>{{ kehuData.sex || '-' }}</div>
           </div>
           <!-- <div>
             <div>类型</div>
@@ -367,6 +367,7 @@
   import miniAudio from '@/components/audio/audio';
   import useTagsViewStore from '@/store/modules/tagsView'
   import useSystemStore from '@/store/main/system/system';
+  import { userDecryptToAsterisk } from '@/utils/aes'
 
   import { checkPermi } from "@/utils/permission";
 
@@ -574,7 +575,7 @@
 
   // 获取客户信息
   function getKehuData(data) {
-    getPageListData(`/system/customer/CodeInfo/${data}`).then(({ data }) => {
+    getPageListData(`/patient/getdetailbyphone/${data}`).then(({ data }) => {
       if (data) {
         kehuData.value = data;
       }