Skip to content

P
pica.cloud.web-education-admin
提交 e64a1a9e 编写于 作者: yafei.li's avatar yafei.li
浏览文件
操作

Merge branch 'feat/lyf' into 'develop' 

Feat/lyf

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!284
上级 68d5233f c7066318
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 566 行增加 和 108 行删除
src/components/education/template/selectPeople.vue
浏览文件 @ e64a1a9e
//
//
<template>
<div class="select-people">
<el-tab-pane label="设定人员" name="fourth">
......
src/components/icd/addDiagnose.vue
浏览文件 @ e64a1a9e
<template>
<div class="add-diagnose-wrap">
<div class="fixed-wrap" v-show="showDiagnoseModal">
<div class="fullscreen-bg"></div>
<div class="add-diagnose-modal" >
......@@ -12,11 +12,11 @@
<div class="main-content">
<div class="left-box left">
<!-- 搜索列表 有搜索结果时-->
<div
v-if="searchList && searchList.length > 0"
<div
v-if="searchList && searchList.length > 0"
class="search-list-wrap"
v-infinite-scroll="loadMore"
:infinite-scroll-disabled="busy"
v-infinite-scroll="loadMore"
:infinite-scroll-disabled="busy"
infinite-scroll-distance="5"
infinite-scroll-immediate-check="false"
>
......@@ -36,13 +36,13 @@
<p v-if="noMore" class="loading">没有更多了...</p>
</ul>
</div>
<!-- 常用诊断 -->
<div v-if="!(searchList && searchList.length > 0)" class="common-diagnose">
<p class="title">常用诊断<span class='no-result' v-if="hasNoResult">没有找到相关搜索结果</span></p>
<ul class="list">
<li
v-for="item in commonList"
<li
v-for="item in commonList"
:class="returnEachCommonLiClass(item)"
@click="handleEachCommonLiClick(item)"
>
......@@ -88,14 +88,14 @@
</span>
</el-dialog>
</div>
</div>
</template>
<script>
import {
import {
getCommonDiagnoseList,
goToSearch,
goToSearch,
} from '@/utils/patients/patientsapi';
export default {
......@@ -138,7 +138,7 @@
},
watch: {
showDiagnoseModal(val) {
}
},
methods: {
......@@ -205,7 +205,6 @@
},
// 搜索框中输入文字 时 page=1 pageSize=30
handleInputSearch() {
// debugger;
clearTimeout(this.searchFlagTimer);
let that = this;
that.page = 1;
......@@ -262,7 +261,7 @@
}
that.busy = true;
that.page += 1;
// console.log('请求第几页数据： ', that.page)
if(that.page > that.totalPageNum){
// console.log('没有更多了。。。。。');
......@@ -296,7 +295,7 @@
})
}, 500)
},
handleInputSearchBlur(){
this.searchList = [];
},
......@@ -340,8 +339,8 @@
}
return -1;
},
},
},
}
</script>
......@@ -416,7 +415,7 @@
.common-diagnose{
width: 100%; height: 300px;
.title{
color: #303133;
color: #303133;
font-size: 16px;
line-height: 40px;
margin-top: 10px;
......@@ -432,7 +431,7 @@
overflow-y: scroll;
.scroll-bar;
padding: 10px;
border: 1px solid #DCDFE6;
border: 1px solid #DCDFE6;
li{
height: 35px; line-height: 35px; padding: 0 15px;
background: #fff;
......@@ -461,7 +460,7 @@
.scroll-bar;
.search-list{
border-radius: 4px;
width: 100%;
width: 100%;
padding: 10px;
li{
position: relative;
......@@ -494,7 +493,7 @@
.code{
float: left;
}
}
}
.right{
......@@ -502,7 +501,7 @@
right: 0;
top: 50%;
margin-top: -13px;
// width: 0px;
// width: 0px;
// float: left;
display: inline-block;
vertical-align: middle;
......@@ -515,7 +514,7 @@
.code{
line-height: 30px;
}
}
.loading{
color: #ccc;
......@@ -532,7 +531,7 @@
height: 300px;
margin-left: 30px;
.title{
color: #303133;
color: #303133;
font-size: 16px;
line-height: 40px;
margin-top: 10px;
......@@ -543,7 +542,7 @@
width: 450px;
height: 250px;
padding: 10px;
border: 1px solid #DCDFE6;
border: 1px solid #DCDFE6;
.scroll-bar;
.el-tag {
margin: 0 10px 10px 0;;
......@@ -558,14 +557,14 @@
}
}
}
}
}
.dialog-footer{
text-align: center;
margin: 20px auto;
}
}
.tips-wrap {
.know-confirm{
......
src/utils/yqrange/yqrangeApi.js
浏览文件 @ e64a1a9e
......@@ -255,7 +255,6 @@ export const getGoodsExportUrl = (params) => {
};
export const getOrdersExportUrl = (params) => {
debugger
return fetch({
headers,
url: getBaseUrl('/store/orders/admin/export'),
......@@ -265,6 +264,45 @@ export const getOrdersExportUrl = (params) => {
})
};
export const uploadExpress = (params) => {
return fetch({
headers,
url: getBaseUrl(`/store/batch/upload/express`),
method: 'POST',
data: params,
description: '批量更新物流操作',
})
};
export const uploadRefund = (params) => {
return fetch({
headers,
url: getBaseUrl(`/store/batch/upload/refund`),
method: 'POST',
data: params,
description: '批量取消退款操作',
})
};
export const getUploadExpressProgress = (id) => {
return fetch({
headers,
url: getBaseUrl(`store/batch/upload/progress/express/${id}`),
method: 'GET',
description: '查询批量更新物流处理进度，id为批次id',
})
};
export const getUploadRefundProgress = (id) => {
return fetch({
headers,
url: getBaseUrl(`store/batch/upload/progress/refund/${id}`),
method: 'GET',
description: '查询批量取消退款处理进度，id为批次id',
})
};
export const getExamAwardList = (params) => {
return fetch({
......@@ -347,3 +385,7 @@ export const delActivity = (params) => {
description: '活动列表',
})
};
src/views/goods/order-manage.vue
浏览文件 @ e64a1a9e
此差异已折叠。
src/views/yqrange/edit-range.vue
浏览文件 @ e64a1a9e
......@@ -171,7 +171,7 @@
uploadPersonExcel
} from "@/utils/education/educationApi";
import Sortable from "sortablejs";
let vm = null;
export default {
components: {
......@@ -198,7 +198,7 @@
callback(new Error(`请输入0~100正整数`));
}
};
let checkOrgListName = (rule, value, callback) => {
console.log(rule, value, callback);
// const val = parseFloat(value);
......@@ -210,7 +210,7 @@
// callback(new Error(`请输入0~100正整数`));
// }
};
return {
idTypeProject: "",
......@@ -238,7 +238,7 @@
},
projectId: null,
peopleLevel: null,
orgListIndex: 0,
pickerOptions0: {
disabledDate: time => {
......@@ -260,7 +260,7 @@
}
},
fileList: [],
//设定机构 数据
getRowKeys(row) {
return row.id;
......@@ -410,9 +410,9 @@
this.formOrganization.pageNum = 1;
this.formOrganization.name = "";
this.formOrganization.administrativeIdList = ["0"];
this.formOrganization.level = "-1";
this.formOrganization.level = "-1";
},
//初始化范围树
setTreeData(administrative) {
let treeIdList = [];
......@@ -502,7 +502,7 @@
halfCheckedTree
);
//重构内容
this.allSelectedKeys = allSelectedKeys;
this.initCheckList(allSelectedKeys);
//console.log("allSelectedKeys", allSelectedKeys);
......@@ -511,7 +511,6 @@
this.updatedTree = true;
},
getTreeCheck() {
debugger
//重构归并树
let checkedTree = operationData.getSimpleCheckedNodes(
this.$refs.tree.store
......@@ -535,7 +534,7 @@
console.log(treeKeyList);
this.$refs.tree.setCheckedKeys(treeKeyList);
},
//删除label节点 同步树结构
handleCloseTree(tag) {
if (this.status4Flag != 1) {
......@@ -617,7 +616,7 @@
);
console.log("选", this.changedPerson, "没", this.changedPerson2);
},
//改变小生态 table check
selectionChangeEcology(rows) {
this.changedEcology = [];
......@@ -775,7 +774,7 @@
if (res.code == "000000") {
this.tableOrganization = res.data.organizationList;
this.totalOrganization = res.data.total;
vm.initOrganizationStatus();
} else {
vm.$message(res.message);
......@@ -800,7 +799,7 @@
if (res.code == "000000") {
this.tableOrganization = res.data.organizationList;
this.totalOrganization = res.data.total;
vm.initOrganizationStatus();
} else {
vm.$message(res.message);
......@@ -844,7 +843,7 @@
console.log("scope", scope);
return scope;
},
//选择搜索机构方式
searchPeople() {
this.formPerson.pageNum = 1;
......@@ -857,7 +856,7 @@
this.getPeopleChoose();
}
},
//判断项目范围选择
showScopeType() {
if (this.projectStatus == "" || this.projectStatus == 1) {
......@@ -916,7 +915,7 @@
this.changedOrganization = [];
this.changedOrganization2 = [];
},
initTags(value) {
//console.log('value',value,'optionsComponent',this.optionsComponent);
this.tagsComponent = [];
......@@ -937,13 +936,13 @@
}
console.log("this.optionsComponent值：", this.optionsComponent);
},
// add 校验输入是否为整数
checkIntFun(str) {
let r = /^\+?[0-9]*$/;
return r.test(str);
},
hideErrorInfo(str) {
if (str) {
this.customError[str] = {
......@@ -954,14 +953,14 @@
this.customError = {};
}
},
dioErrorPop(str) {
return this.$message({
message: str,
type: "warning"
});
},
blurName() {
vm.visibleName = false;
setTimeout(function() {
......@@ -1338,4 +1337,3 @@
left: 0;
}
</style>
\ No newline at end of file
static/UEditor/third-party/video-js/video.dev.js
浏览文件 @ e64a1a9e
......@@ -4414,12 +4414,12 @@ vjs.SeekBar.prototype.onMouseMove = function(event){
};
vjs.SeekBar.prototype.onMouseUp = function(event){
debugger
vjs.Slider.prototype.onMouseUp.call(this, event);
this.player_.scrubbing = false;
if (this.videoWasPlaying) {
debugger
this.player_.play();
}
};
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或