Skip to content

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

Merge branch 'develop' into 'test' 

Develop

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!287
上级 68d5233f 6547d0ef
隐藏空白字符变更
内嵌 并排
正在显示 包含 614 行增加 和 108 行删除
src/components/education/template/selectPeople.vue
浏览文件 @ 95ba9fff
// //
<template> <template>
<div class="select-people"> <div class="select-people">
<el-tab-pane label="设定人员" name="fourth"> <el-tab-pane label="设定人员" name="fourth">
......
src/components/icd/addDiagnose.vue
浏览文件 @ 95ba9fff
<template> <template>
<div class="add-diagnose-wrap"> <div class="add-diagnose-wrap">
<div class="fixed-wrap" v-show="showDiagnoseModal"> <div class="fixed-wrap" v-show="showDiagnoseModal">
<div class="fullscreen-bg"></div> <div class="fullscreen-bg"></div>
<div class="add-diagnose-modal" > <div class="add-diagnose-modal" >
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<div class="main-content"> <div class="main-content">
<div class="left-box left"> <div class="left-box left">
<!-- 搜索列表 有搜索结果时--> <!-- 搜索列表 有搜索结果时-->
<div <div
v-if="searchList && searchList.length > 0" v-if="searchList && searchList.length > 0"
class="search-list-wrap" class="search-list-wrap"
v-infinite-scroll="loadMore" v-infinite-scroll="loadMore"
:infinite-scroll-disabled="busy" :infinite-scroll-disabled="busy"
infinite-scroll-distance="5" infinite-scroll-distance="5"
infinite-scroll-immediate-check="false" infinite-scroll-immediate-check="false"
> >
...@@ -36,13 +36,13 @@ ...@@ -36,13 +36,13 @@
<p v-if="noMore" class="loading">没有更多了...</p> <p v-if="noMore" class="loading">没有更多了...</p>
</ul> </ul>
</div> </div>
<!-- 常用诊断 --> <!-- 常用诊断 -->
<div v-if="!(searchList && searchList.length > 0)" class="common-diagnose"> <div v-if="!(searchList && searchList.length > 0)" class="common-diagnose">
<p class="title">常用诊断<span class='no-result' v-if="hasNoResult">没有找到相关搜索结果</span></p> <p class="title">常用诊断<span class='no-result' v-if="hasNoResult">没有找到相关搜索结果</span></p>
<ul class="list"> <ul class="list">
<li <li
v-for="item in commonList" v-for="item in commonList"
:class="returnEachCommonLiClass(item)" :class="returnEachCommonLiClass(item)"
@click="handleEachCommonLiClick(item)" @click="handleEachCommonLiClick(item)"
> >
...@@ -88,14 +88,14 @@ ...@@ -88,14 +88,14 @@
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { import {
getCommonDiagnoseList, getCommonDiagnoseList,
goToSearch, goToSearch,
} from '@/utils/patients/patientsapi'; } from '@/utils/patients/patientsapi';
export default { export default {
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
}, },
watch: { watch: {
showDiagnoseModal(val) { showDiagnoseModal(val) {
} }
}, },
methods: { methods: {
...@@ -205,7 +205,6 @@ ...@@ -205,7 +205,6 @@
}, },
// 搜索框中输入文字 时 page=1 pageSize=30 // 搜索框中输入文字 时 page=1 pageSize=30
handleInputSearch() { handleInputSearch() {
// debugger;
clearTimeout(this.searchFlagTimer); clearTimeout(this.searchFlagTimer);
let that = this; let that = this;
that.page = 1; that.page = 1;
...@@ -262,7 +261,7 @@ ...@@ -262,7 +261,7 @@
} }
that.busy = true; that.busy = true;
that.page += 1; that.page += 1;
// console.log('请求第几页数据： ', that.page) // console.log('请求第几页数据： ', that.page)
if(that.page > that.totalPageNum){ if(that.page > that.totalPageNum){
// console.log('没有更多了。。。。。'); // console.log('没有更多了。。。。。');
...@@ -296,7 +295,7 @@ ...@@ -296,7 +295,7 @@
}) })
}, 500) }, 500)
}, },
handleInputSearchBlur(){ handleInputSearchBlur(){
this.searchList = []; this.searchList = [];
}, },
...@@ -340,8 +339,8 @@ ...@@ -340,8 +339,8 @@
} }
return -1; return -1;
}, },
}, },
} }
</script> </script>
...@@ -416,7 +415,7 @@ ...@@ -416,7 +415,7 @@
.common-diagnose{ .common-diagnose{
width: 100%; height: 300px; width: 100%; height: 300px;
.title{ .title{
color: #303133; color: #303133;
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 40px;
margin-top: 10px; margin-top: 10px;
...@@ -432,7 +431,7 @@ ...@@ -432,7 +431,7 @@
overflow-y: scroll; overflow-y: scroll;
.scroll-bar; .scroll-bar;
padding: 10px; padding: 10px;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
li{ li{
height: 35px; line-height: 35px; padding: 0 15px; height: 35px; line-height: 35px; padding: 0 15px;
background: #fff; background: #fff;
...@@ -461,7 +460,7 @@ ...@@ -461,7 +460,7 @@
.scroll-bar; .scroll-bar;
.search-list{ .search-list{
border-radius: 4px; border-radius: 4px;
width: 100%; width: 100%;
padding: 10px; padding: 10px;
li{ li{
position: relative; position: relative;
...@@ -494,7 +493,7 @@ ...@@ -494,7 +493,7 @@
.code{ .code{
float: left; float: left;
} }
} }
} }
.right{ .right{
...@@ -502,7 +501,7 @@ ...@@ -502,7 +501,7 @@
right: 0; right: 0;
top: 50%; top: 50%;
margin-top: -13px; margin-top: -13px;
// width: 0px; // width: 0px;
// float: left; // float: left;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
...@@ -515,7 +514,7 @@ ...@@ -515,7 +514,7 @@
.code{ .code{
line-height: 30px; line-height: 30px;
} }
} }
.loading{ .loading{
color: #ccc; color: #ccc;
...@@ -532,7 +531,7 @@ ...@@ -532,7 +531,7 @@
height: 300px; height: 300px;
margin-left: 30px; margin-left: 30px;
.title{ .title{
color: #303133; color: #303133;
font-size: 16px; font-size: 16px;
line-height: 40px; line-height: 40px;
margin-top: 10px; margin-top: 10px;
...@@ -543,7 +542,7 @@ ...@@ -543,7 +542,7 @@
width: 450px; width: 450px;
height: 250px; height: 250px;
padding: 10px; padding: 10px;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
.scroll-bar; .scroll-bar;
.el-tag { .el-tag {
margin: 0 10px 10px 0;; margin: 0 10px 10px 0;;
...@@ -558,14 +557,14 @@ ...@@ -558,14 +557,14 @@
} }
} }
} }
} }
} }
.dialog-footer{ .dialog-footer{
text-align: center; text-align: center;
margin: 20px auto; margin: 20px auto;
} }
} }
.tips-wrap { .tips-wrap {
.know-confirm{ .know-confirm{
......
src/utils/yqrange/yqrangeApi.js
浏览文件 @ 95ba9fff
...@@ -255,7 +255,6 @@ export const getGoodsExportUrl = (params) => { ...@@ -255,7 +255,6 @@ export const getGoodsExportUrl = (params) => {
}; };
export const getOrdersExportUrl = (params) => { export const getOrdersExportUrl = (params) => {
debugger
return fetch({ return fetch({
headers, headers,
url: getBaseUrl('/store/orders/admin/export'), url: getBaseUrl('/store/orders/admin/export'),
...@@ -265,6 +264,45 @@ export const getOrdersExportUrl = (params) => { ...@@ -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) => { export const getExamAwardList = (params) => {
return fetch({ return fetch({
...@@ -347,3 +385,7 @@ export const delActivity = (params) => { ...@@ -347,3 +385,7 @@ export const delActivity = (params) => {
description: '活动列表', description: '活动列表',
}) })
}; };
src/views/goods/order-manage.vue
浏览文件 @ 95ba9fff
...@@ -107,36 +107,36 @@ ...@@ -107,36 +107,36 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="订单类型">-->
<!-- <el-select-->
<!-- v-model="searchForm.saleType"-->
<!-- placeholder="请选择订单类型"-->
<!-- size="small"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in saleTypeList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6" style="text-align: right"> <el-col :span="6" style="text-align: right">
<el-button type="primary" size="small" @click="searchList" <div class="button-container">
>查询</el-button <el-button type="primary" size="small" @click="searchList"
> >查询</el-button
<el-button >
type="default" <el-button
size="small" type="default"
@click="resetForm" size="small"
style="margin-left: 0" @click="resetForm"
>重置</el-button style="margin-left: 0"
> >重置</el-button
<el-button type="primary" size="small" @click="exportOrder" >
>导出订单</el-button <el-button type="primary" size="small" @click="exportOrder"
> >导出订单</el-button
>
</div>
<div class="button-container">
<el-button
type="primary"
size="small"
@click="ShowExportDialog(1)"
>导入物流单号</el-button
>
<el-button
type="primary"
size="small"
@click="ShowExportDialog(2)"
>批量取消订单</el-button
>
</div>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -258,6 +258,15 @@ ...@@ -258,6 +258,15 @@
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column
prop="fanxxxx"
label="返现"
min-width="100"
align="center"
>
</el-table-column> -->
<el-table-column <el-table-column
prop="saleTypeStr" prop="saleTypeStr"
label="销售方式" label="销售方式"
...@@ -347,7 +356,11 @@ ...@@ -347,7 +356,11 @@
>查看详情</el-button >查看详情</el-button
> >
<el-button <el-button
v-if="(scope.row.storeType == 1 || scope.row.storeType == 2) &&scope.row.showStatus == 3 &&scope.row.refundStatus == 0" v-if="
(scope.row.storeType == 1 || scope.row.storeType == 2) &&
scope.row.showStatus == 3 &&
scope.row.refundStatus == 0
"
@click="openTuiDialog(scope.row)" @click="openTuiDialog(scope.row)"
type="text" type="text"
size="small" size="small"
...@@ -473,8 +486,7 @@ ...@@ -473,8 +486,7 @@
</div> </div>
<div> <div>
<el-button type="text" @click="copyTxt">复制单号</el-button> <el-button type="text" @click="copyTxt">复制单号</el-button>
<el-button type="text" @click="updateOrderNo" <el-button type="text" @click="updateOrderNo" v-if="showStatus == 2"
v-if="showStatus == 2"
>修改物流单号</el-button >修改物流单号</el-button
> >
</div> </div>
...@@ -482,14 +494,14 @@ ...@@ -482,14 +494,14 @@
<div class="steps-logistics"> <div class="steps-logistics">
<el-steps direction="vertical" :active="0"> <el-steps direction="vertical" :active="0">
<el-step <el-step
v-for="(item,index) in expressData" v-for="(item, index) in expressData"
:title="item.time" :title="item.time"
:description="item.context" :description="item.context"
:key="index" :key="index"
> >
<div slot="icon"> <div slot="icon">
<div class="dot"></div> <div class="dot"></div>
</div> </div>
</el-step> </el-step>
</el-steps> </el-steps>
</div> </div>
...@@ -580,7 +592,6 @@ ...@@ -580,7 +592,6 @@
> >
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
class="tui-dialog" class="tui-dialog"
title="修改物流单号" title="修改物流单号"
...@@ -610,13 +621,190 @@ ...@@ -610,13 +621,190 @@
> >
</span> </span>
</el-dialog> </el-dialog>
<!-- 导入物流单号 dialog-->
<el-dialog
class="exportlogistics-dialog"
:title="ExportType == 1 ? '导入物流单号' : '批量取消订单'"
:visible="exportDialog"
@close="exportDialog = false"
width="600px"
>
<el-form label-width="120px">
<el-form-item label="导入文档：">
<el-upload
class="upload-excel"
action="#"
accept=".xlsx"
multiple
:limit="1"
:show-file-list="false"
:before-upload="uploadfile"
>
<div class="upload-container">
<el-input
class="file-name"
v-model="fileData.fileName"
size="mini"
readonly
></el-input
><el-button type="primary" size="mini">选择文件</el-button>
</div>
</el-upload>
</el-form-item>
<el-form-item label="模板：">
<a v-if="ExportType == 1" class="importUrl" :href="LogisticsUrl">
物流单号修改模板.xlxs</a
>
<a v-else class="importUrl" :href="CancelOrderUrl">
批量取消模板.xlxs</a
>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="cancelExport">取消</el-button>
<el-button
size="small"
:loading="isLoading"
type="primary"
@click="confirmExport"
>确认</el-button
>
</div>
</el-dialog>
<!-- 导出进度loading -->
<el-dialog
class="exportlogistics-dialog"
:visible="progressFlag"
width="600px"
:close-on-click-modal="false"
:show-close="false"
>
<div>
<div class="progress-container">
<div class="progress-tag">
{{ ProgressData.doneNum }}/{{ ProgressData.totalNum }}
<div class="popper__arrow"></div>
</div>
<div class="progress-content">正在导入...</div>
</div>
</div>
</el-dialog>
<!-- 结果统计 -->
<el-dialog
class="exportlogistics-dialog"
title="导入完成"
:visible="statFlg"
@close="statFlg = false"
width="600px"
>
<div class="stat-container">
<div class="stat-title">模板数据共{{ ProgressData.totalNum }}条</div>
<div class="stat-result">
<div class="success">成功：{{ ProgressData.successNum }}条</div>
<div class="repetition">重复：{{ ProgressData.repeatNum }}条</div>
<div class="failure">失败：{{ ProgressData.failNum }}条</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="statFlg = false">取消</el-button>
<el-button size="small" type="primary" @click="showReasondialog"
>查看失败原因</el-button
>
</div>
</el-dialog>
<!-- 失败原因 -->
<el-dialog
class="exportlogistics-dialog"
title="失败记录"
:visible="FailureReasonFlag"
@close="FailureReasonFlag = false"
width="1000px"
>
<div class="FailureReasonFlag-container" v-if="ExportType == 1">
<el-table
:data="ProgressData.errorList"
border
height="300"
style="width: 100%"
>
<el-table-column
prop="subOrderId"
label="订单号"
align="center"
width="210"
></el-table-column>
<el-table-column
prop="expressName"
label="快递公司"
align="center"
></el-table-column>
<el-table-column prop="expressNo" label="快递单号" align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column prop="failInfo" label="失败原因" align="center">
</el-table-column>
<el-table-column
prop="operationGuide"
label="操作指引"
align="center"
>
</el-table-column>
</el-table>
</div>
<div class="FailureReasonFlag-container" v-else>
<el-table
:data="ProgressData.errorList"
border
height="300"
style="width: 100%"
>
<el-table-column
prop="subOrderId"
label="订单号"
align="center"
width="210"
></el-table-column>
<el-table-column
prop="refundReason"
label="取消原因"
align="center"
></el-table-column>
<el-table-column prop="failInfo" label="失败原因" align="center">
</el-table-column>
<el-table-column
prop="operationGuide"
label="操作指引"
align="center"
>
</el-table-column>
</el-table>
</div>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="FailureReasonFlag = false"
>取消</el-button
>
<a :href="ProgressData.errorFileUrl">
<el-button size="small" type="primary">导出失败记录</el-button>
</a>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { openLoading, closeLoading } from "../../utils/utils"; import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue"; import BreadCrumb from "@/components/breadcrumb.vue";
import SendSetDialog from "@/components/shop/send-set-dialog"; import SendSetDialog from "@/components/shop/send-set-dialog";
import { getOrdersExportUrl } from "@/utils/yqrange/yqrangeApi"; import {
getOrdersExportUrl,
uploadExpress,
uploadRefund,
getUploadExpressProgress,
getUploadRefundProgress,
} from "@/utils/yqrange/yqrangeApi";
import { import {
queryOrderList, queryOrderList,
updateExpress, updateExpress,
...@@ -624,7 +812,7 @@ import { ...@@ -624,7 +812,7 @@ import {
brokerListAll, brokerListAll,
brokerOwnerListAll, brokerOwnerListAll,
updateExpressNo, updateExpressNo,
expressInfo expressInfo,
} from "@/utils/shop"; } from "@/utils/shop";
import { toDecimal2 } from "@/utils"; import { toDecimal2 } from "@/utils";
...@@ -639,7 +827,7 @@ export default { ...@@ -639,7 +827,7 @@ export default {
curmbFirst: "云鹊店铺", curmbFirst: "云鹊店铺",
curmbSecond: "订单管理", curmbSecond: "订单管理",
activeName: "all", activeName: "all",
showStatus:-1, showStatus: -1,
searchForm: { searchForm: {
showStatus: -1, showStatus: -1,
storeId: 0, storeId: 0,
...@@ -656,8 +844,15 @@ export default { ...@@ -656,8 +844,15 @@ export default {
pageSize: 10, pageSize: 10,
saleType: 0, saleType: 0,
}, },
// 确认物流
statFlg: false,
exportDialog: false,
ExportType: 1, // 1导入物流信息 2、批量取消订单
FailureReasonFlag: false,
progressFlag: false,
totalRows: 0, totalRows: 0,
tableData: [], tableData: [],
FailureTable: [],
closeTradeDialog: false, closeTradeDialog: false,
reasonTxt: "", reasonTxt: "",
changePriceDialog: false, changePriceDialog: false,
...@@ -681,10 +876,12 @@ export default { ...@@ -681,10 +876,12 @@ export default {
{ required: true, message: "请选择退款对象", trigger: "blur" }, { required: true, message: "请选择退款对象", trigger: "blur" },
], ],
}, },
expressData:[{ expressData: [
time:"2021-06-23 12:21:21", {
context:"待揽收" time: "2021-06-23 12:21:21",
}], context: "待揽收",
},
],
showTuiDialog: false, showTuiDialog: false,
tuiForm: { tuiForm: {
order: null, order: null,
...@@ -746,15 +943,37 @@ export default { ...@@ -746,15 +943,37 @@ export default {
label: "批发", label: "批发",
}, },
], ],
fileData: {
fileBaseStr: "",
fileName: "",
},
ownerId: "", ownerId: "",
brokerList: [], brokerList: [],
brokerOwnerList: [], brokerOwnerList: [],
showOrderNoFlag: false, showOrderNoFlag: false,
LogisticsUrl:
"https://pica-pro.oss-cn-shanghai.aliyuncs.com/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet/2021/08/12/20210812101318239-4c4e680b.xlsx",
CancelOrderUrl:
"https://pica-pro.oss-cn-shanghai.aliyuncs.com/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet/2021/08/12/2021081210125196-5a8743b1.xlsx",
timer: null,
pickerOptions1: { pickerOptions1: {
disabledDate: (time) => { disabledDate: (time) => {
return time.getTime() > new Date().getTime(); //减去一天的时间代表可以选择同一天; return time.getTime() > new Date().getTime(); //减去一天的时间代表可以选择同一天;
}, },
}, },
ProgressData: {
totalNum: "", //总数
status: "", // 1完成 0进行中
doneNum: "", // doneNum 完成数量
successNum: "", // 成功数量
failNum: "", //失败数量
repeatNum: "",
errorFileUrl: "", // 失败 原因文件
errorList: [], // 失败列表
},
isLoading: false,
// errorFileUrl:"",
}; };
}, },
created() { created() {
...@@ -765,6 +984,165 @@ export default { ...@@ -765,6 +984,165 @@ export default {
this.brokerOwnerListAll(); this.brokerOwnerListAll();
}, },
methods: { methods: {
// 确认导入
confirmExport() {
if (this.ExportType == 1) {
this.uploadExpress();
} else {
this.uploadRefund();
}
},
//
ShowExportDialog(type) {
this.ExportType = type;
this.exportDialog = true;
this.fileData = {
fileBaseStr: "",
fileName: "",
};
},
// 批量更新物流操作
uploadExpress() {
this.isLoading = true;
openLoading(this);
uploadExpress(this.fileData)
.then((res) => {
if (res && res.code == "000000") {
closeLoading(this);
this.getUploadExpressProgressInterval(
res.data.tradeBatchUploadLogId
);
} else {
this.isLoading = false;
this.$message.error(res.message);
}
})
.catch((err) => {
this.isLoading = false;
closeLoading(this);
});
},
// 批量取消退款操作
uploadRefund() {
this.isLoading = true;
openLoading(this);
uploadRefund(this.fileData)
.then((res) => {
console.log(res);
if (res && res.code == "000000") {
closeLoading(this);
this.getUploadRefundProgressInterval(res.data.tradeBatchUploadLogId);
} else {
this.isLoading = false;
this.$message.error(res.message);
}
})
.catch((err) => {
this.isLoading = false;
closeLoading(this);
});
},
// 获取物流上传进度
async getUploadExpressProgressInterval(id) {
clearInterval(this.timer);
let status = await this.getUploadExpressProgress(id);
if (status == 0) {
console.log("status------", status);
this.timer = setInterval(() => {
this.getUploadExpressProgress(id);
}, 2000);
}
},
getUploadExpressProgress(id) {
return getUploadExpressProgress(id).then((res) => {
if (res && res.code == "000000") {
this.isLoading = false;
this.exportDialog = false;
this.progressFlag = true;
this.ProgressData = res.data;
if (res.data.status == 1) {
clearInterval(this.timer);
setTimeout(() => {
this.progressFlag = false;
this.statFlg = true;
}, 2000);
}
return res.data.status;
} else {
this.isLoading = false;
this.$message.error(res.message);
return;
}
});
},
// 获取批量取消进度
async getUploadRefundProgressInterval(id) {
clearInterval(this.timer);
let status = await this.getUploadRefundProgress(id);
if (status == 0) {
this.timer = setInterval(() => {
this.getUploadRefundProgress(id);
}, 2000);
}
},
getUploadRefundProgress(id) {
return getUploadRefundProgress(id).then((res) => {
if (res && res.code == "000000") {
this.exportDialog = false;
this.progressFlag = true;
this.ProgressData = res.data;
this.isLoading = false;
if (res.data.status == 1) {
clearInterval(this.timer);
setTimeout(() => {
this.progressFlag = false;
this.statFlg = true;
}, 2000);
}
return res.data.status;
} else {
this.isLoading = false;
this.$message.error(res.message);
return;
}
});
},
// 取消导入物流信息
cancelExport() {
(this.fileData = {
fileBaseStr: "",
fileName: "",
}),
(this.exportDialog = false);
},
// 导入物流单号
uploadfile(file) {
let _this = this;
let arr = file.type.split("/");
let ext = "." + arr[1];
let name = file.name;
let reader = new FileReader();
reader.onload = function (e) {
_this.fileData.fileName = name;
_this.fileData.fileBaseStr = e.target.result.substr(
e.target.result.indexOf("base64,") + 7
);
console.log("fileJson", _this.fileData);
};
reader.readAsDataURL(file);
},
// 确认取消订单
showReasondialog() {
this.statFlg = false;
this.FailureReasonFlag = true;
},
searchList() { searchList() {
this.searchForm.orderBeginTime = this.createRangeTime[0]; this.searchForm.orderBeginTime = this.createRangeTime[0];
this.searchForm.orderEndTime = this.createRangeTime[1]; this.searchForm.orderEndTime = this.createRangeTime[1];
...@@ -880,17 +1258,17 @@ export default { ...@@ -880,17 +1258,17 @@ export default {
}, },
//查看物流 //查看物流
viewLogistics(row) { viewLogistics(row) {
console.log("row-----",row) console.log("row-----", row);
expressInfo({ expressNo: row.expressNo }).then((res) => { expressInfo({ expressNo: row.expressNo }).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
this.expressData=[...res.data.data,...this.expressData] this.expressData = [...res.data.data, ...this.expressData];
this.logisticeInfo = `${row.expressName} ${row.expressNo}`; this.logisticeInfo = `${row.expressName} ${row.expressNo}`;
this.expressForm.order = row; this.expressForm.order = row;
this.expressForm.company = `${row.expressName}`; this.expressForm.company = `${row.expressName}`;
this.expressForm.no = `${row.expressNo}`; this.expressForm.no = `${row.expressNo}`;
this.expressForm.extendMessage = `${row.remark}`; this.expressForm.extendMessage = `${row.remark}`;
this.showStatus=row.showStatus; this.showStatus = row.showStatus;
this.viewLogisticsDialog = true; this.viewLogisticsDialog = true;
} }
}); });
}, },
...@@ -1092,11 +1470,11 @@ export default { ...@@ -1092,11 +1470,11 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.order-manage-wrapper { .order-manage-wrapper {
.el-step__icon{ .el-step__icon {
border: none; border: none;
background: transparent; background: transparent;
} }
.el-step__title{ .el-step__title {
font-size: 14px; font-size: 14px;
} }
...@@ -1104,7 +1482,7 @@ export default { ...@@ -1104,7 +1482,7 @@ export default {
display: block !important; display: block !important;
height: 30%; height: 30%;
} }
.dot{ .dot {
border-radius: 50%; border-radius: 50%;
height: 8px; height: 8px;
width: 8px; width: 8px;
...@@ -1114,6 +1492,9 @@ export default { ...@@ -1114,6 +1492,9 @@ export default {
.order-manage-content { .order-manage-content {
background: #fff; background: #fff;
padding: 10px; padding: 10px;
.button-container {
margin-bottom: 10px;
}
.header-title { .header-title {
padding: 10px 12px; padding: 10px 12px;
font-size: 13px; font-size: 13px;
...@@ -1205,4 +1586,90 @@ export default { ...@@ -1205,4 +1586,90 @@ export default {
width: 193px; width: 193px;
} }
} }
.exportlogistics-dialog {
}
.upload-container {
display: flex;
justify-content: flex-start;
align-items: center;
.file-name {
margin-right: 5px;
}
}
.progress-container {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
.progress-content {
width: 150px;
height: 40px;
background: #449284;
border-radius: 5px;
display: flex;
justify-content: center;
align-items: center;
color: #fff;
}
.progress-tag {
width: 150px;
height: 40px;
border: 1px solid #ebeef5;
display: flex;
justify-content: center;
align-items: center;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
margin-bottom: 10px;
position: relative;
.popper__arrow {
position: absolute;
bottom: 0px;
left: 50%;
margin-right: 3px;
transform: translateX(-3px);
border-bottom-width: 0;
&::after {
position: absolute;
display: block;
width: 0;
height: 0;
border-top-color: #fff;
border-left-color: transparent;
border-bottom-color: transparent;
border-right-color: transparent;
border-style: solid;
content: " ";
border-width: 6px;
}
}
}
.stat-container {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.stat-title {
color: #333;
font-size: 16px;
font-weight: bold;
margin-bottom: 10px;
}
.stat-result {
display: flex;
justify-content: space-between;
width: 300px;
.failure {
color: #e63c3c;
}
}
}
.importUrl {
color: #449284;
}
</style> </style>
src/views/yqrange/edit-range.vue
浏览文件 @ 95ba9fff
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
uploadPersonExcel uploadPersonExcel
} from "@/utils/education/educationApi"; } from "@/utils/education/educationApi";
import Sortable from "sortablejs"; import Sortable from "sortablejs";
let vm = null; let vm = null;
export default { export default {
components: { components: {
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
callback(new Error(`请输入0~100正整数`)); callback(new Error(`请输入0~100正整数`));
} }
}; };
let checkOrgListName = (rule, value, callback) => { let checkOrgListName = (rule, value, callback) => {
console.log(rule, value, callback); console.log(rule, value, callback);
// const val = parseFloat(value); // const val = parseFloat(value);
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
// callback(new Error(`请输入0~100正整数`)); // callback(new Error(`请输入0~100正整数`));
// } // }
}; };
return { return {
idTypeProject: "", idTypeProject: "",
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
}, },
projectId: null, projectId: null,
peopleLevel: null, peopleLevel: null,
orgListIndex: 0, orgListIndex: 0,
pickerOptions0: { pickerOptions0: {
disabledDate: time => { disabledDate: time => {
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
} }
}, },
fileList: [], fileList: [],
//设定机构 数据 //设定机构 数据
getRowKeys(row) { getRowKeys(row) {
return row.id; return row.id;
...@@ -410,9 +410,9 @@ ...@@ -410,9 +410,9 @@
this.formOrganization.pageNum = 1; this.formOrganization.pageNum = 1;
this.formOrganization.name = ""; this.formOrganization.name = "";
this.formOrganization.administrativeIdList = ["0"]; this.formOrganization.administrativeIdList = ["0"];
this.formOrganization.level = "-1"; this.formOrganization.level = "-1";
}, },
//初始化范围树 //初始化范围树
setTreeData(administrative) { setTreeData(administrative) {
let treeIdList = []; let treeIdList = [];
...@@ -502,7 +502,7 @@ ...@@ -502,7 +502,7 @@
halfCheckedTree halfCheckedTree
); );
//重构内容 //重构内容
this.allSelectedKeys = allSelectedKeys; this.allSelectedKeys = allSelectedKeys;
this.initCheckList(allSelectedKeys); this.initCheckList(allSelectedKeys);
//console.log("allSelectedKeys", allSelectedKeys); //console.log("allSelectedKeys", allSelectedKeys);
...@@ -511,7 +511,6 @@ ...@@ -511,7 +511,6 @@
this.updatedTree = true; this.updatedTree = true;
}, },
getTreeCheck() { getTreeCheck() {
debugger
//重构归并树 //重构归并树
let checkedTree = operationData.getSimpleCheckedNodes( let checkedTree = operationData.getSimpleCheckedNodes(
this.$refs.tree.store this.$refs.tree.store
...@@ -535,7 +534,7 @@ ...@@ -535,7 +534,7 @@
console.log(treeKeyList); console.log(treeKeyList);
this.$refs.tree.setCheckedKeys(treeKeyList); this.$refs.tree.setCheckedKeys(treeKeyList);
}, },
//删除label节点 同步树结构 //删除label节点 同步树结构
handleCloseTree(tag) { handleCloseTree(tag) {
if (this.status4Flag != 1) { if (this.status4Flag != 1) {
...@@ -617,7 +616,7 @@ ...@@ -617,7 +616,7 @@
); );
console.log("选", this.changedPerson, "没", this.changedPerson2); console.log("选", this.changedPerson, "没", this.changedPerson2);
}, },
//改变小生态 table check //改变小生态 table check
selectionChangeEcology(rows) { selectionChangeEcology(rows) {
this.changedEcology = []; this.changedEcology = [];
...@@ -775,7 +774,7 @@ ...@@ -775,7 +774,7 @@
if (res.code == "000000") { if (res.code == "000000") {
this.tableOrganization = res.data.organizationList; this.tableOrganization = res.data.organizationList;
this.totalOrganization = res.data.total; this.totalOrganization = res.data.total;
vm.initOrganizationStatus(); vm.initOrganizationStatus();
} else { } else {
vm.$message(res.message); vm.$message(res.message);
...@@ -800,7 +799,7 @@ ...@@ -800,7 +799,7 @@
if (res.code == "000000") { if (res.code == "000000") {
this.tableOrganization = res.data.organizationList; this.tableOrganization = res.data.organizationList;
this.totalOrganization = res.data.total; this.totalOrganization = res.data.total;
vm.initOrganizationStatus(); vm.initOrganizationStatus();
} else { } else {
vm.$message(res.message); vm.$message(res.message);
...@@ -844,7 +843,7 @@ ...@@ -844,7 +843,7 @@
console.log("scope", scope); console.log("scope", scope);
return scope; return scope;
}, },
//选择搜索机构方式 //选择搜索机构方式
searchPeople() { searchPeople() {
this.formPerson.pageNum = 1; this.formPerson.pageNum = 1;
...@@ -857,7 +856,7 @@ ...@@ -857,7 +856,7 @@
this.getPeopleChoose(); this.getPeopleChoose();
} }
}, },
//判断项目范围选择 //判断项目范围选择
showScopeType() { showScopeType() {
if (this.projectStatus == "" || this.projectStatus == 1) { if (this.projectStatus == "" || this.projectStatus == 1) {
...@@ -916,7 +915,7 @@ ...@@ -916,7 +915,7 @@
this.changedOrganization = []; this.changedOrganization = [];
this.changedOrganization2 = []; this.changedOrganization2 = [];
}, },
initTags(value) { initTags(value) {
//console.log('value',value,'optionsComponent',this.optionsComponent); //console.log('value',value,'optionsComponent',this.optionsComponent);
this.tagsComponent = []; this.tagsComponent = [];
...@@ -937,13 +936,13 @@ ...@@ -937,13 +936,13 @@
} }
console.log("this.optionsComponent值：", this.optionsComponent); console.log("this.optionsComponent值：", this.optionsComponent);
}, },
// add 校验输入是否为整数 // add 校验输入是否为整数
checkIntFun(str) { checkIntFun(str) {
let r = /^\+?[0-9]*$/; let r = /^\+?[0-9]*$/;
return r.test(str); return r.test(str);
}, },
hideErrorInfo(str) { hideErrorInfo(str) {
if (str) { if (str) {
this.customError[str] = { this.customError[str] = {
...@@ -954,14 +953,14 @@ ...@@ -954,14 +953,14 @@
this.customError = {}; this.customError = {};
} }
}, },
dioErrorPop(str) { dioErrorPop(str) {
return this.$message({ return this.$message({
message: str, message: str,
type: "warning" type: "warning"
}); });
}, },
blurName() { blurName() {
vm.visibleName = false; vm.visibleName = false;
setTimeout(function() { setTimeout(function() {
...@@ -1338,4 +1337,3 @@ ...@@ -1338,4 +1337,3 @@
left: 0; left: 0;
} }
</style> </style>
\ No newline at end of file
static/UEditor/third-party/video-js/video.dev.js
浏览文件 @ 95ba9fff
...@@ -4414,12 +4414,12 @@ vjs.SeekBar.prototype.onMouseMove = function(event){ ...@@ -4414,12 +4414,12 @@ vjs.SeekBar.prototype.onMouseMove = function(event){
}; };
vjs.SeekBar.prototype.onMouseUp = function(event){ vjs.SeekBar.prototype.onMouseUp = function(event){
debugger
vjs.Slider.prototype.onMouseUp.call(this, event); vjs.Slider.prototype.onMouseUp.call(this, event);
this.player_.scrubbing = false; this.player_.scrubbing = false;
if (this.videoWasPlaying) { if (this.videoWasPlaying) {
debugger
this.player_.play(); this.player_.play();
} }
}; };
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或