diff --git a/src/api/mzcx/cydj.js b/src/api/mzcx/cydj.js index 4e937bc..dc43b77 100644 --- a/src/api/mzcx/cydj.js +++ b/src/api/mzcx/cydj.js @@ -23,10 +23,10 @@ export function printBarcodeall(data) { data: data }) } -// 查询采样登记详细 -export function getReqmain(sqh) { +// 查询病人列表 +export function queryPatList() { return request({ - url: '/system/reqmain/' + sqh, + url: '/mzcx/queryPatList', method: 'get' }) } diff --git a/src/utils/request.js b/src/utils/request.js index f0b7d46..d5a344d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: import.meta.env.VITE_APP_BASE_API, // 超时 - timeout: 10000 + timeout: 60000 }) // request拦截器 @@ -121,6 +121,16 @@ service.interceptors.response.use(res => { } else if (code === 601) { ElMessage({ message: msg, type: 'warning' }) return Promise.reject(new Error(msg)) + } else if (code === 3) { + //提示并成功 + ElMessage({ message: msg, type: 'warning' }) + return Promise.resolve(res.data) + } else if (code === 2) { + //选择是否后续操作 + ElMessageBox.confirm(msg, '系统提示', { confirmButtonText: '是', cancelButtonText: '否', type: 'warning' }).then(() => { + return Promise.resolve(res.data); + }) + return Promise.reject('error'); } else if (code !== 200 && code !== 0) { ElNotification.error({ title: msg }) return Promise.reject('error') diff --git a/src/views/mzcx/cydj/components/OutPatList.vue b/src/views/mzcx/cydj/components/OutPatList.vue new file mode 100644 index 0000000..7a6bb0e --- /dev/null +++ b/src/views/mzcx/cydj/components/OutPatList.vue @@ -0,0 +1,179 @@ + + + + + \ No newline at end of file diff --git a/src/views/mzcx/cydj/index.vue b/src/views/mzcx/cydj/index.vue index 59d0b85..8ba5e48 100644 --- a/src/views/mzcx/cydj/index.vue +++ b/src/views/mzcx/cydj/index.vue @@ -35,10 +35,10 @@ - 读卡 + 读卡 - 查找病人 + @@ -166,13 +166,11 @@