Skip to content

P
pica-admin-consultation
提交 c725c652 编写于 作者: xiaoping.di's avatar xiaoping.di
浏览文件
操作

Merge branch 'feature/jq' into 'release' 

Feature/jq

See merge request !151
上级 d828111a bb429c99
隐藏空白字符变更
内嵌 并排
正在显示 包含 72 行增加 和 56 行删除
package-lock.json
浏览文件 @ c725c652
......@@ -2840,25 +2840,6 @@
"slash": "^2.0.0"
}
},
"has-flag": {
"version": "4.0.0",
"resolved": "http://192.168.110.93:4873/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "http://192.168.110.93:4873/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "http://192.168.110.93:4873/ms/-/ms-2.1.2.tgz",
......@@ -2877,41 +2858,6 @@
"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.7.0",
"resolved": "http://192.168.110.93:4873/vue-loader/-/vue-loader-16.7.0.tgz",
"integrity": "sha1-7hYbL2wnsLRZJkw8I9NAaLRx1XQ=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"chalk": {
"version": "4.1.2",
"resolved": "http://192.168.110.93:4873/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "http://192.168.110.93:4873/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"webpack-bundle-analyzer": {
"version": "3.9.0",
"resolved": "http://192.168.110.93:4873/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
......@@ -20394,6 +20340,32 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.7.0",
"resolved": "http://192.168.110.93:4873/vue-loader/-/vue-loader-16.7.0.tgz",
"integrity": "sha1-7hYbL2wnsLRZJkw8I9NAaLRx1XQ=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"loader-utils": {
"version": "2.0.0",
"resolved": "http://192.168.110.93:4873/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.5.2",
"resolved": "http://192.168.110.93:4873/vue-router/-/vue-router-3.5.2.tgz",
......
src/utils/GeneralData/diagnosis-list-new.js
浏览文件 @ c725c652
......@@ -9,6 +9,11 @@ export const DIAGNOS_LIST_NEW = [
label: '订单ID',
showtooltip: false,
},
{
prop: 'price',
label: '订单金额',
showtooltip: false,
},
{
prop: 'diagnoseTypeStr',
label: '预约类型',
......
src/utils/constants.js
浏览文件 @ c725c652
......@@ -63,6 +63,17 @@ export const SOURCE_LIST = [{
value: 5
}
];
// 订单价格
export const ORDER_PRICE = [
{
label: '0元订单',
value: 0
},
{
label: '付费订单',
value: 9999
}
];
// 订单状态
export const STATUS_LIST = [{
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ c725c652
......@@ -68,6 +68,25 @@
/>
</el-form-item>
</div>
<div>
<el-form-item
label="订单筛选"
class="t-b"
>
<el-select
v-model="searchParam.price"
placeholder="请选择订单筛选"
style="width: 220px"
>
<el-option
v-for="item of priceList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</div>
</div>
<div class="form-li">
<div>
......@@ -216,7 +235,7 @@
style="width: 220px"
:picker-options="pickerOptions1"
/> -->
<el-date-picker
<el-date-picker
v-model="assistantTime"
type="daterange"
value-format="yyyy-MM-dd"
......@@ -424,6 +443,7 @@
RECEPTION_TAB_LIST,
RUN_TAB_LIST,
MATCH_TAB_LIST,
ORDER_PRICE
} from '@/utils/constants';
import {
getCountQuery,
......@@ -494,11 +514,13 @@
pageNo: 1,
menuType: 1, // 菜单类型：1、all 2、运营 3、待分诊 4、待接诊 5、外呼
status: '',
price:''
},
alltabslist: [],
tyleList: TYPE_LIST,
fllowList: IS_FLLOW,
sourceList: SOURCE_LIST,
priceList:ORDER_PRICE,
tabpaneList: [],
rematchingOptions: [], // 备注信息
Raw_tabpaneList: [],
......@@ -814,7 +836,12 @@
diagnoseList(this.searchParam).then((res) => {
this.loading = false;
if (res.code == '000000') {
this.tableData = res.data.list;
this.tableData = (res.data.list || []).map(item => {
return {
...item,
price:item.price > 0 ? item.price / 100 : 0
};
});
this.totalRows = res.data.allSize;
}
});
......@@ -846,6 +873,7 @@
assistantVal: '',
receptionVal: '',
triageDepartmentId: '',
price:'',
diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文
createdTimeBegin: '',
createdTimeEnd: '',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或