Merge branch 'master' of http://192.168.1.222:3000/miaofuhao/vueCMS3.0

src/components/main/drawer-phone/cpns/page-phone.vue

@@ -7,7 +7,7 @@
     <div class="phoneList">
       <div style="width: 100%; height: 38px;"></div>
       <div class="tabBox">
-        <el-radio-group v-model="radio2" @change="aaaa">
+        <el-radio-group v-model="radio2">
           <el-radio-button label="通话记录" />
           <el-radio-button label="通讯录" />
         </el-radio-group>
@@ -19,17 +19,17 @@
           v-model="addressBookSearch"
           @change="changeBookSearch"
           style="width: 240px;margin: 8px 0px 0px 8px;"
-          placeholder="请输入姓名"
+          placeholder="请输入名称或手机号"
           :suffix-icon="Search"
         />
-        <div class="contentList" v-for="item in addressBookData">
+        <div class="contentList" v-for="(item, index) in addressBookData" :key="index">
           
           <div class="leftBox">
             <div class="telPhoneBox">
               
-              <span v-if="!item.bookName">{{item.dept.deptName}} -- </span>
-              <span v-if="!item.bookName">{{item.nickName}}</span>
-              <span v-if="item.bookName">{{item.bookName}}</span>
+              <span>{{item.name}}</span>
+              <span v-if="item.notes"> -- {{item.notes}}</span>
+              <!-- <span v-if="item.mobile">{{item.mobile}}</span> -->
               <!-- <span>({{item.nickName}})</span> -->
               <!-- {{
                 item.callType
@@ -38,7 +38,7 @@
               }} -->
             </div>
             <div class="remarkBox">
-              <span style="margin-right: 15px">{{ item.phonenumber }}</span>
+              <span style="margin-right: 15px">{{ item.mobile }}</span>
               <!-- <span>{{ getCallSate(item.callType, item.endTime) }}</span> -->
             </div>
           </div>
@@ -55,7 +55,7 @@
       </div>
       
       <div class="contentBox" ref="scrollDivCall" v-if="radio2==='通话记录'" @scroll="handleScrollCall">
-        <div class="contentList" v-for="item in tableData" v-if="radio2==='通话记录'">
+        <div class="contentList" v-for="(item, index) in tableData"  :key="index">
           <div class="leftBox">
             <div class="telPhoneBox">
               {{
@@ -79,15 +79,15 @@
             </el-icon>
           </div>
         </div>
-        <div class="contentList" v-for="item in addressBookData" v-if="radio2==='通讯录'">
+        <div class="contentList" v-for="(item, index) in addressBookData" v-if="radio2==='通讯录'" :key="index">
           
           <div class="leftBox">
             <div class="telPhoneBox">
-              <span>{{item.dept.deptName}} -- </span>
-              <span>{{item.nickName}}</span>
+              <span>{{item.name}} -- </span>
+              <span>{{item.notes}}</span>
             </div>
             <div class="remarkBox">
-              <span style="margin-right: 15px">{{ item.phonenumber }}</span>
+              <span style="margin-right: 15px">{{ item.mobile }}</span>
             </div>
           </div>
           <div class="rightBox">
@@ -384,15 +384,6 @@ const props = defineProps({
   }
 })
 
-function aaaa(e) {
-  // if (e == '通话记录') {
-  //   paramsSearch.value.pageNum = 1
-  //   getUserData()
-  // } else if(e == '通讯录'){
-  //   paramsSearch.value.pageNum = 1
-        // getCustomeData()
-  // }
-}
 watch(
   () => props.callData,
   (newValue) => {
@@ -597,7 +588,7 @@ function phoneIconHandle(item) {
     ? getOfffixNuber(item.callee)
     : getOfffixNuber(item.caller)
   }else if(radio2.value === '通讯录'){
-    telNumber.value = item.phonenumber
+    telNumber.value = item.mobile
   }
   btnCallType()
 }
@@ -707,20 +698,22 @@ function changeBookSearch(val) {
   
 }
 function getSearchUser(name) {
+  addressBookData.value = []
   const params = {
-    name
+    key: name
   }
-  getPageListData('/system/user/getnametelbyname', params).then(
+  getPageListData('/system/addressbook', params).then(
     ({ data, total }) => {
       if (data.toString()!== "{}") {
-        Object.keys(data).forEach(function(key){
-          if (key && data[key]) {
-            const obj = {}
-            obj.bookName = key
-            obj.phonenumber = data[key]
-            addressBookData.value.push(obj)
-          }
-        })
+        // Object.keys(data).forEach(function(key){
+        //   if (key && data[key]) {
+        //     const obj = {}
+        //     obj.bookName = key
+        //     obj.phonenumber = data[key]
+        //     addressBookData.value.push(obj)
+        //   }
+        // })
+        addressBookData.value = data
       }
       // const newArray = data
       // addressBookData.value =  addressBookData.value.concat(newArray)
@@ -729,7 +722,15 @@ function getSearchUser(name) {
   )
 }
 function getUserData() {
-  getPageListData('/common/user', paramsSearch.value).then(
+  // getPageListData('/common/user', paramsSearch.value).then(
+  //   ({ data, total }) => {
+  //     const newArray = data
+  //     addressBookData.value =  addressBookData.value.concat(newArray)
+  //     addressBookCount.value = total
+      
+  //   }
+  // )
+  getPageListData('/system/addressbook', paramsSearch.value).then(
     ({ data, total }) => {
       const newArray = data
       addressBookData.value =  addressBookData.value.concat(newArray)

src/utils/index.js

@@ -41,9 +41,9 @@ export function getCallSate(type, state) {
   let typeStr = ''
   let stateStr = ''
   if (type == 1) {
-    typeStr = '呼出'
-  } else {
     typeStr = '呼入'
+  } else {
+    typeStr = '呼出'
   }
   if (state) {
     stateStr = '已接通'

src/views/main/patientFile/patientFileList/cpns/callRecord/cpns/audioPlayer.vue

@@ -2,9 +2,9 @@
   <div class="audio_player">
     <audio style="width: 100%" :src="filePath" controls="controls"></audio>
     <!-- <aplayer :music="musicList" autoplay theme="#41b883" /> -->
-    <el-button class="audio_btn" size="mini" plain type="primary" @click="btn_downlaod()"
+    <!-- <el-button class="audio_btn" size="mini" plain type="primary" @click="btn_downlaod()"
       >下载</el-button
-    >
+    > -->
   </div>
 </template>
 

src/views/main/system/addressBook/addressBook.vue

@@ -0,0 +1,100 @@
+<template>
+    <div class="app-container">
+        <page-search :searchFormConfig="searchFormConfig" @resetBtnClick="handleResetClick"
+            @queryBtnClick="handleQueryClick" />
+
+        <page-content ref="pageContentRef" :contentTableConfig="contentTableConfig" pageName="/system/addressbook" rowKey="id"
+            :isExport="false" @newBtnClick="addClick"
+            @editBtnClick="edit"></page-content>
+        <page-modal :defaultInfo="defaultInfo" :title="'编辑'" ref="pageModalRef" :mainKey="'id'" pageName="/system/addressbook"
+            :modalConfig="newModelConfig"></page-modal>
+    </div>
+</template>
+  
+<script>
+import { defineComponent, ref, computed, watch, getCurrentInstance } from 'vue'
+
+import PageSearch from '@/components/page-search'
+import PageContent from '@/components/page-content'
+import PageModal from '@/components/page-modal'
+
+import { searchFormConfig } from './config/search.config'
+import { contentTableConfig } from './config/content.config'
+import { usePageSearch } from '@/hooks/use-page-search'
+import { usePageModal } from '@/hooks/use-page-modal'
+import { modalConfig } from './config/modal.config'
+
+export default defineComponent({
+    name: 'AddressBook',
+    components: {
+        PageSearch,
+        PageContent,
+        PageModal,
+    },
+    setup () {
+
+        let newModelConfig = modalConfig;
+        
+        // 1.处理逻辑
+        const newCallback = () => { }
+        const editCallback = () => { }
+
+        const [pageContentRef, handleResetClick, handleQueryClick] = usePageSearch()
+        const { proxy } = getCurrentInstance()
+
+        const recordData = ref({})
+        const open = ref(false)
+
+        const clRowData = ref({})
+
+        // 3.调用hook获取公共变量和函数
+        const [pageModalRef, defaultInfo, handleNewData, handleEditData] =
+            usePageModal(newCallback, editCallback)
+
+        function edit(item) {
+            console.log(modalConfig, 'formItems')
+            newModelConfig = modalConfig.formItems.map((o) => {
+                if (o.field === 'extension') {
+                    o.otherOptions = {
+                        ...o.otherOptions,
+                        disabled: true,
+                    }
+                }
+            });
+
+
+            return handleEditData(item);
+        }
+
+        function addClick(item) {
+            newModelConfig = modalConfig.formItems.map((o) => {
+                if (o.field === 'extension') {
+                     
+                    o.otherOptions = {
+                        ...o.otherOptions,
+                        disabled: false,
+                    }
+                }
+            });
+            handleNewData(item);
+        }
+
+        return {
+            newModelConfig,
+            defaultInfo,
+            addClick,
+            edit,
+            pageModalRef,
+            clRowData,
+            searchFormConfig,
+            contentTableConfig,
+            pageContentRef,
+            handleResetClick,
+            handleQueryClick,
+            recordData,
+            open,
+        }
+    }
+})
+</script>
+  

src/views/main/system/addressBook/config/content.config.js

@@ -0,0 +1,12 @@
+export const contentTableConfig = {
+  title: '通讯录',
+  contentTableHeader: true,
+  propList: [
+    { prop: 'mobile', label: '电话'},
+    { prop: 'name', label: '名称' },
+    { prop: 'notes', label: '备注' },
+    { label: '操作', minWidth: '100', slotName: 'handler' }
+  ],
+  showIndexColumn: true,
+  showSelectColumn: false,
+}

src/views/main/system/addressBook/config/modal.config.js

@@ -0,0 +1,29 @@
+export const modalConfig = {
+  formItems: [
+    {
+      field: 'mobile',
+      type: 'input',
+      label: '电话',
+      required : true ,
+      placeholder: '请输入电话',
+    },
+    {
+      field: 'name',
+      type: 'input',
+      label: '名称',
+      required : true ,
+      placeholder: '请输入名称',
+
+    },
+    {
+      field: 'notes',
+      type: 'input',
+      label: '备注',
+      placeholder: '请输入备注',
+
+    },
+    
+  ],
+  colLayout: { span: 24 },
+  itemStyle: {}
+}

src/views/main/system/addressBook/config/search.config.js

@@ -0,0 +1,31 @@
+export const searchFormConfig = {
+  labelWidth: '120px',
+  itemStyle: {
+    padding: '0px'
+  },
+  colLayout: {
+    span: 6
+  },
+  formItems: [
+    {
+      field: 'mobile',
+      type: 'input',
+      label: '电话',
+      placeholder: '请输入电话',
+    },
+    {
+      field: 'name',
+      type: 'input',
+      label: '名称',
+      placeholder: '请输入名称',
+
+    },
+    {
+      field: 'notes',
+      type: 'input',
+      label: '备注',
+      placeholder: '请输入备注',
+
+    },
+  ]
+}

src/views/main/telephone/callRecord/callRecord.vue

@@ -17,6 +17,7 @@
       <template #recordCallHandler="scope">
         <el-tag class="ml-2" @click="handleRecordCall(scope.row)">
           {{
+            // getOfffixNuber(scope.row.callType === 1 ? scope.row.caller : scope.row.callee)
             getOfffixNuber(scope.row.phone)
           }}
         </el-tag>
@@ -53,7 +54,7 @@
       <audio-player ref="pageModalRef" :filePath="filePath"></audio-player>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="open = false">关 闭</el-button>
+          <!-- <el-button @click="open = false">关 闭</el-button> -->
         </div>
       </template>
     </el-dialog>

src/views/main/telephone/callRecord/cpns/audioPlayer.vue

@@ -2,9 +2,9 @@
   <div class="audio_player">
     <audio style="width: 100%" :src="filePath" controls="controls"></audio>
     <!-- <aplayer :music="musicList" autoplay theme="#41b883" /> -->
-    <el-button class="audio_btn" size="mini" plain type="primary" @click="btn_downlaod()"
+    <!-- <el-button class="audio_btn" size="mini" plain type="primary" @click="btn_downlaod()"
       >下载</el-button
-    >
+    > -->
   </div>
 </template>