Skip to content

P
peizhen-vue
Commit e6acf71f by honghong
Options

Merge branch 'feature_lyj' of http://git.nyinhong.com/PeiZhen-Java/peizhen-vue

parents af08c508 9e945aa5
Showing with 326 additions and 71 deletions
package.json
......@@ -71,6 +71,7 @@
"connect": "3.6.6",
"eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0",
"html-webpack-plugin": "^5.5.3",
"lint-staged": "10.5.3",
"runjs": "4.4.2",
"sass": "1.32.13",
......
src/views/orderManagement/dbghOrder/index.vue
......@@ -128,7 +128,16 @@
prop="title"
key="title"
:show-overflow-tooltip="true"
/>
width="100"
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="就诊人员"
align="center"
......@@ -145,7 +154,13 @@
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename" width="100">
<el-table-column
label="接单人"
align="center"
prop="ename"
key="ename"
width="100"
>
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
......@@ -156,10 +171,9 @@
<el-table-column label="备注" align="center" prop="remark" key="remark">
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>点击查看</el-button
>查看</el-button
>
</template>
</el-table-column>
......@@ -170,7 +184,15 @@
key="visitTime"
width="180"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.visitTime, '期望就诊时间')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="当前状态"
align="center"
......@@ -186,14 +208,14 @@
<span v-if="row.ystatus == 6">进行中</span>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="服务结束时间"
align="center"
prop="overTime"
key="overTime"
width="180"
:show-overflow-tooltip="true"
/>
/> -->
<el-table-column
label="订单状态"
align="center"
......@@ -227,16 +249,16 @@
prop="evaluationContent"
key="evaluationContent"
>
<!-- v-if="row.evaluationContent" -->
<template slot-scope="{ row }">
<el-button
v-if="row.evaluationContent"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="完成凭证"
align="center"
prop="voucher"
......@@ -254,7 +276,7 @@
>
</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="创建时间"
align="center"
......@@ -263,7 +285,15 @@
width="180"
:show-overflow-tooltip="true"
sortable
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......
src/views/orderManagement/dbmyOrder/index.vue
......@@ -111,7 +111,6 @@
>
<template slot-scope="{ row }">
<el-button
v-if="row.ypName"
type="primary"
@click="clickSeeROWrFK(row.ypName, '药品名称')"
>查看</el-button
......@@ -127,8 +126,8 @@
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.ydAddress" -->
<el-button
v-if="row.ydAddress"
type="primary"
@click="clickSeeROWrFK(row.ydAddress, '药店地址')"
>查看</el-button
......@@ -144,9 +143,12 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<el-button type="primary" @click="clickSeeJudge(row)">查看</el-button>
</template>
<!-- <template slot-scope="{ row }">
<span v-if="row.isCf == 0">否</span>
<span v-if="row.isCf == 1">是</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="处方附件"
......@@ -171,8 +173,8 @@
/>
</template> -->
<template slot-scope="{ row }">
<!-- v-if="row.prescriptionAttachment" -->
<el-button
v-if="row.prescriptionAttachment"
type="primary"
@click="
clickSeeROWrFK(
......@@ -185,10 +187,17 @@
>
</template>
</el-table-column>
<el-table-column label="取药方式" align="center" prop="way" key="way">
<el-table-column
label="取药方式"
align="center"
prop="way"
key="way"
width="100"
>
<template slot-scope="{ row }">
<span v-if="row.way == 0">邮寄到家</span>
<span v-if="row.way == 1">送货上门</span>
<!-- <span v-if="row.way == 0">邮寄到家</span>
<span v-if="row.way == 1">送货上门</span> -->
<el-button type="primary" @click="clickSeeWay(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column
......@@ -197,10 +206,11 @@
prop="recipient"
key="recipient"
:show-overflow-tooltip="true"
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.recipient" -->
<el-button
v-if="row.recipient"
type="primary"
@click="clickSeeROWrFK(row.recipient, '收件人')"
>查看</el-button
......@@ -217,7 +227,6 @@
>
<template slot-scope="{ row }">
<el-button
v-if="row.adress"
type="primary"
@click="clickSeeROWrFK(row.adress, '收货地址')"
>查看</el-button
......@@ -239,21 +248,22 @@
:show-overflow-tooltip="true"
width="100"
>
<!-- v-if="row.addressInfo" -->
<template slot-scope="{ row }">
<el-button
v-if="row.addressInfo"
type="primary"
@click="clickSeeROWrFK(row.addressInfo, '详细地址')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<el-table-column label="接单人" align="center" prop="ename" key="ename" width="100">
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
<!-- v-if="row.ename" -->
<el-button type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span>
<!-- <span v-else>未接单</span> -->
</template>
</el-table-column>
<el-table-column
......@@ -268,10 +278,15 @@
<span v-if="row.isRefrigerate == 1">送货上门</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" key="remark" width="100">
<el-table-column
label="备注"
align="center"
prop="remark"
key="remark"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button
......@@ -330,15 +345,15 @@
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.evaluationContent" -->
<el-button
v-if="row.evaluationContent"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="服务结束时间"
align="center"
prop="overTime"
......@@ -364,7 +379,7 @@
>
</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="创建时间"
align="center"
......@@ -373,7 +388,15 @@
width="180"
:show-overflow-tooltip="true"
sortable
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
</template>
</el-table-column>
<!-- <el-table-column
label="操作"
align="center"
......@@ -632,6 +655,48 @@
</div>
</el-dialog>
</template>
<template v-if="openCfInfo">
<el-dialog
title="是否处方药"
:visible.sync="openCfInfo"
width="600px"
append-to-body
>
<div class="contl">
<div class="contl-item">
<p class="contl-item-label">是否处方药:</p>
<p class="contl-item-rig">
{{
currentRow.isCf == 0 ? "否" : currentRow.isCf == 1 ? "是" : ""
}}
</p>
</div>
</div>
</el-dialog>
</template>
<template v-if="openQYInfo">
<el-dialog
title="取药方式"
:visible.sync="openQYInfo"
width="600px"
append-to-body
>
<div class="contl">
<div class="contl-item">
<p class="contl-item-label">取药方式:</p>
<p class="contl-item-rig">
{{
currentRow.way == 0
? "邮寄到家"
: currentRow.way == 1
? "送货上门"
: "暂无取药方式"
}}
</p>
</div>
</div>
</el-dialog>
</template>
</div>
</template>
......@@ -654,6 +719,9 @@ export default {
value: "",
type: "",
},
currentRow: {},
openCfInfo: false,
openQYInfo: false,
openEMInfo: false,
openArticleInfoImg: false,
openArticleInfo: false,
......@@ -733,6 +801,14 @@ export default {
this.$set(this.vDataL, "type", type);
this.$set(this.vDataL, "open", true);
},
clickSeeJudge(row) {
this.openCfInfo = true;
this.currentRow = row;
},
clickSeeWay(row) {
this.openQYInfo = true;
this.currentRow = row;
},
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
......
src/views/orderManagement/dbwzOrder/index.vue
......@@ -107,7 +107,17 @@
prop="title"
key="title"
:show-overflow-tooltip="true"
/>
width="100"
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="订单价"
align="center"
......@@ -131,7 +141,13 @@
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename" width="100">
<el-table-column
label="接单人"
align="center"
prop="ename"
key="ename"
width="100"
>
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
......@@ -146,11 +162,26 @@
key="visitTime"
width="180"
:show-overflow-tooltip="true"
/>
<el-table-column label="备注" align="center" prop="remark" key="remark">
>
<template slot-scope="{ row }">
<el-button
v-if="row.chiefComplaint"
type="primary"
@click="clickSeeROWrEM(row.visitTime, '期望就诊时间')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="备注"
align="center"
prop="remark"
key="remark"
width="100"
>
<!-- v-if="row.remark" -->
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button
......@@ -295,14 +326,14 @@
<span v-if="row.tstatus == 8">已退款</span>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="服务完成时间"
align="center"
prop="overTime"
key="overTime"
width="180"
:show-overflow-tooltip="true"
/>
/> -->
<el-table-column
label="是否好评"
align="center"
......@@ -324,15 +355,15 @@
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.evaluationContent" -->
<el-button
v-if="row.evaluationContent"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="完成凭证"
align="center"
prop="voucher"
......@@ -350,7 +381,7 @@
>
</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="创建时间"
align="center"
......@@ -359,7 +390,15 @@
width="180"
:show-overflow-tooltip="true"
sortable
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
</template>
</el-table-column>
<!-- <el-table-column
label="操作"
align="center"
......
src/views/orderManagement/order/index.vue
......@@ -129,7 +129,16 @@
prop="title"
key="title"
:show-overflow-tooltip="true"
/>
width="100"
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="就诊人员"
align="center"
......@@ -146,7 +155,13 @@
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename" width="100">
<el-table-column
label="接单人"
align="center"
prop="ename"
key="ename"
width="100"
>
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
......@@ -159,14 +174,14 @@
align="center"
prop="remark"
key="remark"
width="120"
width="130"
>
<!-- v-if="row.remark" -->
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>点击查看</el-button
>查看</el-button
>
</template>
</el-table-column>
......@@ -177,14 +192,30 @@
key="visitTime"
width="180"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.visitTime, '订单就诊时间')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="预约电话"
align="center"
prop="phone"
key="phone"
:show-overflow-tooltip="true"
/>
width="120"
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.phone, '预约电话')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="当前状态"
align="center"
......@@ -232,17 +263,18 @@
align="center"
prop="evaluationContent"
key="evaluationContent"
width="100"
>
<!-- v-if="row.evaluationContent" -->
<template slot-scope="{ row }">
<el-button
v-if="row.evaluationContent"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="服务完成时间"
align="center"
prop="overTime"
......@@ -268,7 +300,7 @@
>
</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="创建时间"
align="center"
......@@ -277,7 +309,15 @@
width="180"
:show-overflow-tooltip="true"
sortable
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
</template>
</el-table-column>
<!-- <el-table-column
label="操作"
align="center"
......
src/views/orderManagement/zqghOrder/index.vue
......@@ -124,7 +124,13 @@
prop="title"
key="title"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="{ row }">
<el-button type="primary" @click="clickSeeROWrEM(row.title, '科室')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="医生"
align="center"
......@@ -138,7 +144,15 @@
prop="userName"
key="userName"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.userName, '用户')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="预约时间"
align="center"
......@@ -146,11 +160,25 @@
key="timeOfAppointment"
width="180"
:show-overflow-tooltip="true"
/>
<el-table-column label="备注" align="center" prop="remark" key="remark" width="100">
>
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="primary"
@click="clickSeeROWrEM(row.timeOfAppointment, '预约时间')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="备注"
align="center"
prop="remark"
key="remark"
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.remark" -->
<el-button
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button
......@@ -179,7 +207,15 @@
width="180"
:show-overflow-tooltip="true"
sortable
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
</template>
</el-table-column>
<!-- <el-table-column
label="操作"
align="center"
......
src/views/orderManagement/zyphOrder/index.vue
......@@ -128,7 +128,15 @@
prop="title"
key="title"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="就诊人员"
align="center"
......@@ -145,7 +153,13 @@
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename" width="100">
<el-table-column
label="接单人"
align="center"
prop="ename"
key="ename"
width="100"
>
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
......@@ -153,10 +167,16 @@
<span v-else>未接单</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" key="remark" width="100">
<el-table-column
label="备注"
align="center"
prop="remark"
key="remark"
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.remark" -->
<el-button
v-if="row.remark"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button
......@@ -172,10 +192,15 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
{{ row.startDay }} - {{ row.endDay }}
<!-- {{ row.startDay }} - {{ row.endDay }} -->
<el-button
type="primary"
@click="clickSeeROWrEM(`${row.startDay}至${row.endDay}`, '期待陪护日期')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="期待陪护时间"
align="center"
prop="startTime"
......@@ -186,7 +211,7 @@
<template slot-scope="{ row }">
{{ row.startTime }} - {{ row.endTime }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="当前状态"
align="center"
......@@ -237,15 +262,15 @@
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.evaluationContent" -->
<el-button
v-if="row.evaluationContent"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="服务完成时间"
align="center"
prop="overTime"
......@@ -271,7 +296,7 @@
>
</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="创建时间"
align="center"
......@@ -280,7 +305,15 @@
width="180"
:show-overflow-tooltip="true"
sortable
/>
>
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
</template>
</el-table-column>
<!-- <el-table-column
label="操作"
align="center"
......
vue.config.js
......@@ -37,7 +37,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8089`,
target: `https://peizheng.shanpeikj.com/api`,
// target: `http://192.168.0.169:8089`,
// target: `http://192.168.0.129:8089`,
// target: `http://192.168.0.137:8089`,
// target: `http://192.168.0.199:8089`,
// target: `http://192.168.0.125:8089`,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment