Commit 2e31690d by 伍思炜

脱敏处理+更改图片获取接口

parent 9e32a10b
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
{"value":"未下单","name":"未下单"}, {"value":"未下单","name":"未下单"},
{"value":"提交中","name":"提交中"}, {"value":"提交中","name":"提交中"},
{"value":"审核中","name":"审核中"}, {"value":"审核中","name":"审核中"},
{"value":"审核中","name":"审核中"},
{"value":"已完成","name":"已完成"}, {"value":"已完成","name":"已完成"},
{"value":"异常单","name":"异常单"} {"value":"异常单","name":"异常单"}
] ]
......
...@@ -29,6 +29,8 @@ let setKuanDiData = (params) => postAction(prefix +"order/setKuanDiData" , param ...@@ -29,6 +29,8 @@ let setKuanDiData = (params) => postAction(prefix +"order/setKuanDiData" , param
let reportList = (params) => postAction(prefix + "order/getHhrOrderInfo",params); let reportList = (params) => postAction(prefix + "order/getHhrOrderInfo",params);
let reportDownload = (params) => downFilePost(prefix + "order/outputHhrOrder",params); let reportDownload = (params) => downFilePost(prefix + "order/outputHhrOrder",params);
let images = (params) => postAction(prefix + "/images" , params);
export { export {
...@@ -48,5 +50,6 @@ export { ...@@ -48,5 +50,6 @@ export {
updateSendType, updateSendType,
updateIccid, updateIccid,
setUpgradeStatus, setUpgradeStatus,
setKuanDiData setKuanDiData,
images
} }
...@@ -6,9 +6,11 @@ let excelOut = (params) => downFilePost(prefix + "/studentCardVerify/excelOut" , ...@@ -6,9 +6,11 @@ let excelOut = (params) => downFilePost(prefix + "/studentCardVerify/excelOut" ,
let list = (params) => postAction(prefix + "/studentCardVerify/list" , params); let list = (params) => postAction(prefix + "/studentCardVerify/list" , params);
let update = (params) => postAction(prefix + "/studentCardVerify/update" , params); let update = (params) => postAction(prefix + "/studentCardVerify/update" , params);
let queryById = (params) => postAction(prefix + "/studentCardVerify/queryById" , params); let queryById = (params) => postAction(prefix + "/studentCardVerify/queryById" , params);
let images = (params) => postAction(prefix + "/images" , params);
export { export {
excelOut, excelOut,
list, list,
update, update,
queryById queryById,
images
} }
...@@ -9,10 +9,13 @@ let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames" ...@@ -9,10 +9,13 @@ let getSchoolNames = (params) => postAction(prefix + "/newUser/getSchoolNames"
let initUsers = (params) => postAction(prefix + "/newUser/initUsers" , params); let initUsers = (params) => postAction(prefix + "/newUser/initUsers" , params);
let list = (params) => postAction(prefix + "/newUser/list" , params); let list = (params) => postAction(prefix + "/newUser/list" , params);
let update = (params) => postAction(prefix + "/newUser/update" , params); let update = (params) => postAction(prefix + "/newUser/update" , params);
let images = (params) => postAction(prefix + "/images" , params);
export { export {
initUsers, initUsers,
initSubstName, initSubstName,
getSchoolNames, getSchoolNames,
list, list,
update, update,
images
} }
...@@ -87,6 +87,12 @@ const err = (error) => { ...@@ -87,6 +87,12 @@ const err = (error) => {
// request interceptor // request interceptor
service.interceptors.request.use(config => { service.interceptors.request.use(config => {
const path = location.hash.substr(1);
let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB";
let encrypt = new window.JSEncrypt();
encrypt.setPublicKey(publicKey);
config.headers[ 'security'] = encrypt.encryptLong(path);
console.log(config)
if(config.url.indexOf('school-center-ui.json')!= -1){ if(config.url.indexOf('school-center-ui.json')!= -1){
config.baseURL ='' config.baseURL =''
} }
......
...@@ -125,12 +125,26 @@ ...@@ -125,12 +125,26 @@
<a-button @click="handleSubmit" style="margin-left: 10px">导出</a-button> <a-button @click="handleSubmit" style="margin-left: 10px">导出</a-button>
<a-dropdown> <a-dropdown>
<a-menu slot="overlay" @click="handleMenuClick"> <a-menu slot="overlay" @click="handleMenuClick">
<a-menu-item key="1"><a-icon type="arrow-up"/>受理单</a-menu-item> <a-menu-item key="1">
<a-menu-item key="2"><a-icon type="arrow-up"/>快递</a-menu-item> <a-icon type="arrow-up"/>
<a-menu-item key="3"><a-icon type="arrow-up"/>iccid填号</a-menu-item> 受理单
<a-menu-item key="4"><a-icon type="arrow-up"/>5G加装包</a-menu-item> </a-menu-item>
<a-menu-item key="2">
<a-icon type="arrow-up"/>
快递
</a-menu-item>
<a-menu-item key="3">
<a-icon type="arrow-up"/>
iccid填号
</a-menu-item>
<a-menu-item key="4">
<a-icon type="arrow-up"/>
5G加装包
</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px">导入<a-icon type="down"/></a-button> <a-button style="margin-left: 8px">导入
<a-icon type="down"/>
</a-button>
</a-dropdown> </a-dropdown>
</a-col> </a-col>
</a-row> </a-row>
...@@ -148,7 +162,7 @@ ...@@ -148,7 +162,7 @@
:locale="emptyText"> :locale="emptyText">
<!--拦截器--> <!--拦截器-->
<template slot="productLastUpdateTime" slot-scope="text">{{ text | dayjs}}</template> <template slot="productLastUpdateTime" slot-scope="text">{{ text | dayjs}}</template>
<template slot="createtime" slot-scope="text" >{{ text | dayjs}}</template> <template slot="createtime" slot-scope="text">{{ text | dayjs}}</template>
<!--拦截器--> <!--拦截器-->
<template slot="productCreateTime" slot-scope="text">{{ text | dayjs}}</template> <template slot="productCreateTime" slot-scope="text">{{ text | dayjs}}</template>
<template slot="text" slot-scope="text"> <template slot="text" slot-scope="text">
...@@ -338,22 +352,30 @@ ...@@ -338,22 +352,30 @@
</a-row> </a-row>
<a-divider orientation="left">附件</a-divider> <a-divider orientation="left">附件</a-divider>
<div v-show="!imgShow">无附件</div> <div v-show="!imgShow">无附件</div>
<div v-show="imgShow" style="margin-bottom: 50px"> <div v-if="imgShow" style="margin-bottom: 50px">
<a-carousel arrows dotsClass="slick-dots slick-thumb"> <a-carousel arrows dotsClass="slick-dots slick-thumb">
<a slot="customPaging" slot-scope="props"> <a slot="customPaging" slot-scope="props">
<img :src="getImgUrl(props.i)"/> <img :src="getImgUrl(props.i)"/>
</a> </a>
<div @click="pictureSize" v-for="item in certificatePhoto.length"> <div @click="pictureSize" v-for="item in certificatePhoto" :key="item">
<img :style="imgStype" :src="certificatePhoto[item - 1]"/> <img :style="imgStype" :src="item "/>
</div> </div>
</a-carousel> </a-carousel>
</div> </div>
<div> <div>
<a-button v-show="orderInfo.orderStatus == '待配送'" @click="openKD" type="primary">填写快递单号</a-button> <a-button v-show="orderInfo.orderStatus == '待配送'" @click="openKD" type="primary">填写快递单号
<a-button v-show="orderInfo.orderStatus == '待处理' && (orderInfo.sendType == null || orderInfo.sendType == '')" @click="openConfigSendType()" type="primary">配送方式</a-button> </a-button>
<a-button v-show="orderInfo.orderStatus == '待选号'" @click="openConfigIccidFun" type="primary">配置iccid</a-button> <a-button
v-show="orderInfo.orderStatus == '待处理' && (orderInfo.sendType == null || orderInfo.sendType == '')"
@click="openConfigSendType()" type="primary">配送方式
</a-button>
<a-button v-show="orderInfo.orderStatus == '待选号'" @click="openConfigIccidFun"
type="primary">配置iccid
</a-button>
<a-button @click="showReview()" type="primary">审核学生证</a-button> <a-button @click="showReview()" type="primary">审核学生证</a-button>
<a-button v-show="orderInfo.userType == '1' && orderInfo.orderStatus == '待受理'" @click="showUpgrade" type="primary">存量升级受理</a-button> <a-button v-show="orderInfo.userType == '1' && orderInfo.orderStatus == '待受理'"
@click="showUpgrade" type="primary">存量升级受理
</a-button>
</div> </div>
<a-divider orientation="left">受理信息</a-divider> <a-divider orientation="left">受理信息</a-divider>
<a-row> <a-row>
...@@ -523,8 +545,10 @@ ...@@ -523,8 +545,10 @@
html-type="submit" html-type="submit"
width="256px"> width="256px">
<div> <div>
<span>iccid:</span><a-input v-model="iccidParam.businessIccid" placeholder="请输入iccid" /> <span>iccid:</span>
<span>办理号码:</span><a-input v-model="iccidParam.businessNumber" placeholder="请输入办理号码" /> <a-input v-model="iccidParam.businessIccid" placeholder="请输入iccid"/>
<span>办理号码:</span>
<a-input v-model="iccidParam.businessNumber" placeholder="请输入办理号码"/>
</div> </div>
</a-modal> </a-modal>
...@@ -657,23 +681,27 @@ ...@@ -657,23 +681,27 @@
<a-row> <a-row>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="学号:"> <a-form-item label="学号:">
<a-input placeholder="学号" v-text="orderInfo.studentNumber" v-model="orderInfo.studentNumber"></a-input> <a-input placeholder="学号" v-text="orderInfo.studentNumber"
v-model="orderInfo.studentNumber"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="班级:"> <a-form-item label="班级:">
<a-input placeholder="班级" v-text="orderInfo.classNumber" v-model="orderInfo.classNumber"></a-input> <a-input placeholder="班级" v-text="orderInfo.classNumber"
v-model="orderInfo.classNumber"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="父母名字:"> <a-form-item label="父母名字:">
<a-input placeholder="父母名字" v-text="orderInfo.parentName" v-model="orderInfo.parentName"></a-input> <a-input placeholder="父母名字" v-text="orderInfo.parentName"
v-model="orderInfo.parentName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="身份证号:"> <a-form-item label="身份证号:">
<p v-if="isEdit === false">{{ orderInfo.idCard }}</p> <p v-if="isEdit === false">{{ orderInfo.idCard }}</p>
<a-input v-if="isEdit === true" placeholder="身份证号" v-text="orderInfo.idCard" v-model="orderInfo.idCard"></a-input> <a-input v-if="isEdit === true" placeholder="身份证号" v-text="orderInfo.idCard"
v-model="orderInfo.idCard"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -681,24 +709,29 @@ ...@@ -681,24 +709,29 @@
<a-row> <a-row>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="地址:"> <a-form-item label="地址:">
<a-input placeholder="地址" v-text="orderInfo.address" v-model="orderInfo.address"></a-input> <a-input placeholder="地址" v-text="orderInfo.address"
v-model="orderInfo.address"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="省市县:"> <a-form-item label="省市县:">
<a-input placeholder="省市县" v-text="orderInfo.site" v-model="orderInfo.site"></a-input> <a-input placeholder="省市县" v-text="orderInfo.site"
v-model="orderInfo.site"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="联系电话:"> <a-form-item label="联系电话:">
<a-input placeholder="联系电话" v-text="orderInfo.contactNumber" v-model="orderInfo.contactNumber"></a-input> <a-input placeholder="联系电话" v-text="orderInfo.contactNumber"
v-model="orderInfo.contactNumber"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item label="订单状态:"> <a-form-item label="订单状态:">
<a-select :value="orderInfo.orderStatus" v-model="orderInfo.orderStatus"> <a-select :value="orderInfo.orderStatus" v-model="orderInfo.orderStatus">
<a-select-option value>请选择</a-select-option> <a-select-option value>请选择</a-select-option>
<a-select-option v-for="d in orderjson.orderStatus" :key="d.value" :value="d.value" >{{d.name}}</a-select-option> <a-select-option v-for="d in orderjson.orderStatus" :key="d.value"
:value="d.value">{{d.name}}
</a-select-option>
<!-- <a-select-option value="待处理">待处理</a-select-option>--> <!-- <a-select-option value="待处理">待处理</a-select-option>-->
<!-- <a-select-option value="待选号">待选号</a-select-option>--> <!-- <a-select-option value="待选号">待选号</a-select-option>-->
<!-- <a-select-option value="待识别">待识别</a-select-option>--> <!-- <a-select-option value="待识别">待识别</a-select-option>-->
...@@ -718,7 +751,8 @@ ...@@ -718,7 +751,8 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="备注:"> <a-form-item label="备注:">
<a-input placeholder="备注" v-text="orderInfo.remarks" v-model="orderInfo.remarks"></a-input> <a-input placeholder="备注" v-text="orderInfo.remarks"
v-model="orderInfo.remarks"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -747,13 +781,13 @@ ...@@ -747,13 +781,13 @@
</a-row> </a-row>
<a-divider orientation="left">附件</a-divider> <a-divider orientation="left">附件</a-divider>
<div v-show="!imgShow">无附件</div> <div v-show="!imgShow">无附件</div>
<div v-show="imgShow" style="margin-bottom: 50px"> <div v-if="imgShow" style="margin-bottom: 50px">
<a-carousel arrows dotsClass="slick-dots slick-thumb"> <a-carousel arrows dotsClass="slick-dots slick-thumb">
<a slot="customPaging" slot-scope="props"> <a slot="customPaging" slot-scope="props">
<img :src="getImgUrl(props.i)"/> <img :src="getImgUrl(props.i)"/>
</a> </a>
<div @click="pictureSize" v-for="item in certificatePhoto.length"> <div @click="pictureSize" v-for="item in certificatePhoto" :key="item">
<img :style="imgStype" :src="certificatePhoto[item - 1]"/> <img :style="imgStype" :src="item"/>
</div> </div>
</a-carousel> </a-carousel>
</div> </div>
...@@ -816,8 +850,8 @@ ...@@ -816,8 +850,8 @@
</template> </template>
<script> <script>
import STable from "@/components/table"; import STable from "@/components/table";
import { import {
orderList, orderList,
download, download,
abnormal, abnormal,
...@@ -831,18 +865,20 @@ import { ...@@ -831,18 +865,20 @@ import {
updateIccid, updateIccid,
updateSendType, updateSendType,
setUpgradeStatus, setUpgradeStatus,
setKuanDiData setKuanDiData,
} from "../../../api/school-center/orderAPI"; images
import {cloneObject, exportFile} from "@/utils/util"; } from "../../../api/school-center/orderAPI";
import moment from "moment"; import {cloneObject, exportFile} from "@/utils/util";
import ConstantActivity from "@/constant/ConstantActivity"; import moment from "moment";
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ConstantActivity from "@/constant/ConstantActivity";
import { getJonslist } from '@/api/api'; import ImportBtn from "../../../components/sysmanage/ImportBtn";
const options = [ import {getJonslist} from '@/api/api';
const options = [
{label: "审核通过", value: "1"}, {label: "审核通过", value: "1"},
{label: "审核不通过", value: "0"} {label: "审核不通过", value: "0"}
]; ];
export default { export default {
name: "orderView", name: "orderView",
components: { components: {
STable, STable,
...@@ -850,7 +886,8 @@ export default { ...@@ -850,7 +886,8 @@ export default {
}, },
data() { data() {
return { return {
orderjson:{}, viewImgUrl: '',
orderjson: {},
emptyText: {emptyText: '暂无数据'}, emptyText: {emptyText: '暂无数据'},
reviewStudentImg: "", reviewStudentImg: "",
reviewStudent: { reviewStudent: {
...@@ -879,31 +916,31 @@ export default { ...@@ -879,31 +916,31 @@ export default {
childrenDrawer: false, childrenDrawer: false,
YRYMmoBan: false, YRYMmoBan: false,
KDmoBan: false, KDmoBan: false,
YZKmoBan:false, YZKmoBan: false,
PackageMoBan:false, PackageMoBan: false,
importUrl: "", importUrl: "",
importTile: "", importTile: "",
modifyvisible: false, modifyvisible: false,
isAbnormal:false, isAbnormal: false,
isEdit:false, isEdit: false,
setAbnormal:false, setAbnormal: false,
setAbnormalStr: { setAbnormalStr: {
orderId:"", orderId: "",
errorMsg: "", errorMsg: "",
}, },
setShowUpgrade:false, setShowUpgrade: false,
setShowUpgradeStr:{ setShowUpgradeStr: {
orderId:"", orderId: "",
auditType:"", auditType: "",
contentMsg: "", contentMsg: "",
}, },
setShowKD:false, setShowKD: false,
setShowKDStr:{ setShowKDStr: {
orderId:"", orderId: "",
company:"", company: "",
kuaidiOrder: "", kuaidiOrder: "",
}, },
edit:false, edit: false,
title: ConstantActivity.title, title: ConstantActivity.title,
Formtable: this.$form.createForm(this), Formtable: this.$form.createForm(this),
visible: false, visible: false,
...@@ -929,18 +966,24 @@ export default { ...@@ -929,18 +966,24 @@ export default {
contactNumber: "", contactNumber: "",
hehuorenSchool: "", hehuorenSchool: "",
hehuorenName: "", hehuorenName: "",
hehuorenArea:"", hehuorenArea: "",
orderStatus: "", orderStatus: "",
orderId: "", orderId: "",
xbOrderId: "", xbOrderId: "",
businessPackage:"", businessPackage: "",
}, },
orderInfo: {}, orderInfo: {},
columns: [ columns: [
{dataIndex: "customerName", width: 100, title: "客户姓名", fixed: "left"}, {dataIndex: "customerName", width: 100, title: "客户姓名", fixed: "left"},
{dataIndex: "businessNumber", width: 120, title: "办理号码", fixed: "left"}, {dataIndex: "businessNumber", width: 120, title: "办理号码", fixed: "left"},
{dataIndex: "orderStatus", width: 80, title: "订单状态"}, {dataIndex: "orderStatus", width: 80, title: "订单状态"},
{dataIndex: 'createTime',width:150, sort: true, title: '订单创建时间', scopedSlots: { customRender: 'createtime' } }, {
dataIndex: 'createTime',
width: 150,
sort: true,
title: '订单创建时间',
scopedSlots: {customRender: 'createtime'}
},
{dataIndex: "hehuorenSchool", width: 200, title: "合伙人学校"}, {dataIndex: "hehuorenSchool", width: 200, title: "合伙人学校"},
{dataIndex: "hehuorenName", width: 90, title: "合伙人姓名"}, {dataIndex: "hehuorenName", width: 90, title: "合伙人姓名"},
{dataIndex: "hehuorenPhone", width: 120, title: "合伙人手机"}, {dataIndex: "hehuorenPhone", width: 120, title: "合伙人手机"},
...@@ -1181,14 +1224,14 @@ export default { ...@@ -1181,14 +1224,14 @@ export default {
this.setAbnormal = true; this.setAbnormal = true;
this.setAbnormalStr.orderId = orderId; this.setAbnormalStr.orderId = orderId;
}, },
setAbnormalOk(){ setAbnormalOk() {
if(this.setAbnormalStr.errorMsg.length<3){ if (this.setAbnormalStr.errorMsg.length < 3) {
this.$notification.error({ this.$notification.error({
message: "请输入不小于三个字的操作结果", message: "请输入不小于三个字的操作结果",
description: "", description: "",
duration: 4 duration: 4
}); });
}else{ } else {
let setAbnormalStr = this.setAbnormalStr; let setAbnormalStr = this.setAbnormalStr;
abnormal(setAbnormalStr).then(res => { abnormal(setAbnormalStr).then(res => {
if (res.state == "success") { if (res.state == "success") {
...@@ -1201,25 +1244,25 @@ export default { ...@@ -1201,25 +1244,25 @@ export default {
}); });
} }
}, },
setAbnormalCancel(){ setAbnormalCancel() {
this.setAbnormalClear(); this.setAbnormalClear();
}, },
setAbnormalClear(){ setAbnormalClear() {
this.setAbnormalStr.orderId = ""; this.setAbnormalStr.orderId = "";
this.setAbnormalStr.errorMsg = ""; this.setAbnormalStr.errorMsg = "";
this.setAbnormal = false; this.setAbnormal = false;
}, },
showUpgrade(){ showUpgrade() {
this.setShowUpgrade = true; this.setShowUpgrade = true;
}, },
setUpgradeOk(){ setUpgradeOk() {
if(this.setShowUpgradeStr.contentMsg.length<3){ if (this.setShowUpgradeStr.contentMsg.length < 3) {
this.$notification.error({ this.$notification.error({
message: "请输入不小于三个字的操作结果", message: "请输入不小于三个字的操作结果",
description: "", description: "",
duration: 4 duration: 4
}); });
}else{ } else {
this.setShowUpgradeStr.orderId = this.orderInfo.id; this.setShowUpgradeStr.orderId = this.orderInfo.id;
setUpgradeStatus(this.setShowUpgradeStr).then(res => { setUpgradeStatus(this.setShowUpgradeStr).then(res => {
if (res.state == "success") { if (res.state == "success") {
...@@ -1241,23 +1284,23 @@ export default { ...@@ -1241,23 +1284,23 @@ export default {
}); });
} }
}, },
setUpgradeCancel(){ setUpgradeCancel() {
this.setShowUpgradeStr.orderId=""; this.setShowUpgradeStr.orderId = "";
this.setShowUpgradeStr.auditType=""; this.setShowUpgradeStr.auditType = "";
this.setShowUpgradeStr.contentMsg=""; this.setShowUpgradeStr.contentMsg = "";
this.setShowUpgrade = false; this.setShowUpgrade = false;
}, },
openKD(){ openKD() {
this.setShowKD = true; this.setShowKD = true;
}, },
setKDOk(){ setKDOk() {
if(this.setShowKDStr.company.length==0 || this.setShowKDStr.kuaidiOrder.length==0){ if (this.setShowKDStr.company.length == 0 || this.setShowKDStr.kuaidiOrder.length == 0) {
this.$notification.error({ this.$notification.error({
message: "请填写信息", message: "请填写信息",
description: "", description: "",
duration: 4 duration: 4
}); });
}else{ } else {
this.setShowKDStr.orderId = this.orderInfo.id; this.setShowKDStr.orderId = this.orderInfo.id;
setKuanDiData(this.setShowKDStr).then(res => { setKuanDiData(this.setShowKDStr).then(res => {
if (res.state == "success") { if (res.state == "success") {
...@@ -1279,13 +1322,13 @@ export default { ...@@ -1279,13 +1322,13 @@ export default {
}); });
} }
}, },
setKDCancel(){ setKDCancel() {
this.setShowKDStr.orderId=""; this.setShowKDStr.orderId = "";
this.setShowKDStr.company=""; this.setShowKDStr.company = "";
this.setShowKDStr.kuaidiOrder=""; this.setShowKDStr.kuaidiOrder = "";
this.setShowKD = false; this.setShowKD = false;
}, },
editOk(){ editOk() {
let orderInfo = this.orderInfo; let orderInfo = this.orderInfo;
editOrder(orderInfo).then(res => { editOrder(orderInfo).then(res => {
if (res.state == "success") { if (res.state == "success") {
...@@ -1394,7 +1437,7 @@ export default { ...@@ -1394,7 +1437,7 @@ export default {
onClose() { onClose() {
this.certificatePhoto = []; this.certificatePhoto = [];
this.orderInfo = { this.orderInfo = {
id:"", id: "",
acceptResult: "", acceptResult: "",
nowPackage: "", nowPackage: "",
businessPackage: "", businessPackage: "",
...@@ -1416,7 +1459,7 @@ export default { ...@@ -1416,7 +1459,7 @@ export default {
createTime: "", createTime: "",
address: "", address: "",
site: "", site: "",
isDelivery :"", isDelivery: "",
remarks: "", remarks: "",
checkFail: "", checkFail: "",
expenses: "", expenses: "",
...@@ -1427,39 +1470,31 @@ export default { ...@@ -1427,39 +1470,31 @@ export default {
giftPassword: "", giftPassword: "",
kuaidiOrder: "", kuaidiOrder: "",
company: "", company: "",
kuaidiTime:"", kuaidiTime: "",
studentCardCheckStatus: "", studentCardCheckStatus: "",
kdOrderId: "", kdOrderId: "",
orderStatus: "", orderStatus: "",
userType:"", userType: "",
sendType: "", sendType: "",
businessIccid: "", businessIccid: "",
msg:"", msg: "",
}; };
this.visible = false; this.visible = false;
this.edit = false; this.edit = false;
}, },
showDrawer(data,type) { async showDrawer(data, type) {
this.certificatePhoto.push(this.apis + (data.idCardz != null ? data.idCardz.replace("manager", "app") : "")); this.certificatePhoto = [];
this.certificatePhoto.push(this.apis + (data.idCardf != null ? data.idCardf.replace("manager", "app") : "")); this.certificatePhoto.push(this.apis + (data.idCardz != null ? data.idCardz : ""));
this.certificatePhoto.push(this.apis + (data.idCardzs != null ? data.idCardzs.replace("manager", "app") : "")); this.certificatePhoto.push(this.apis + (data.idCardf != null ? data.idCardf : ""));
this.certificatePhoto.push(this.apis + (data.studenCard != null ? data.studenCard.replace("manager", "app") : "")); this.certificatePhoto.push(this.apis + (data.idCardzs != null ? data.idCardzs : ""));
this.certificatePhoto.push(this.apis + (data.studenCard != null ? data.studenCard : ""));
/* this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png') /* this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')
this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png') this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')
this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png') this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')
this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')*/ this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')*/
if (
this.certificatePhoto[0] == '/api/null' &&
this.certificatePhoto[1] == '/api/null' &&
this.certificatePhoto[2] == '/api/null' &&
this.certificatePhoto[3] == '/api/null'
) {
this.imgShow = false;
} else {
this.imgShow = true;
}
this.orderInfo = { this.orderInfo = {
id:data.id, id: data.id,
acceptResult: data.acceptResult, acceptResult: data.acceptResult,
nowPackage: data.nowPackage, nowPackage: data.nowPackage,
businessPackage: data.businessPackage, businessPackage: data.businessPackage,
...@@ -1492,21 +1527,49 @@ export default { ...@@ -1492,21 +1527,49 @@ export default {
giftPassword: data.giftPassword, giftPassword: data.giftPassword,
kuaidiOrder: data.kuaidiOrder, kuaidiOrder: data.kuaidiOrder,
company: data.company, company: data.company,
kuaidiTime:data.kuaidiTime, kuaidiTime: data.kuaidiTime,
studentCardCheckStatus: data.studentCardCheckStatus, studentCardCheckStatus: data.studentCardCheckStatus,
kdOrderId: data.kdOrderId, kdOrderId: data.kdOrderId,
orderStatus: data.orderStatus, orderStatus: data.orderStatus,
userType:data.userType, userType: data.userType,
sendType: data.sendType, sendType: data.sendType,
businessIccid: data.businessIccid, businessIccid: data.businessIccid,
msg:data.msg, msg: data.msg,
}; };
this.selectOrderHis(data.id); this.selectOrderHis(data.id);
if(type == 1){ if (type == 1) {
this.visible = true; this.visible = true;
}else if(type == 2) { } else if (type == 2) {
this.edit = true; this.edit = true;
} }
if (
this.certificatePhoto[0] == '/api/null' &&
this.certificatePhoto[1] == '/api/null' &&
this.certificatePhoto[2] == '/api/null' &&
this.certificatePhoto[3] == '/api/null'
) {
this.imgShow = false;
} else {
this.imgShow = false;
for(let i = 0; i < this.certificatePhoto.length; i++) {
await this.loadImage(this.certificatePhoto[i], i);
}
this.$nextTick(() => {
this.imgShow = true;
})
}
},
loadImage(url, index) {
return new Promise((resolve, reject) => {
images({url}).then(res => {
let url = 'data:images/jpg;base64,' + res;
if (!index) {
this.viewImgUrl = url;
}
this.certificatePhoto[index] = url;
resolve(true);
}).catch(err => reject(err))
})
}, },
//时间事件 //时间事件
onChange(date, dateString) { onChange(date, dateString) {
...@@ -1582,48 +1645,48 @@ export default { ...@@ -1582,48 +1645,48 @@ export default {
} }
}); });
}, },
openKuaiDi(){ openKuaiDi() {
}, },
typeStatus(data){ typeStatus(data) {
if(data === "1"){ if (data === "1") {
return "省仓配送" return "省仓配送"
}else if(data === "2"){ } else if (data === "2") {
return "本地配送" return "本地配送"
} }
} }
} }
}; };
</script> </script>
<style scoped> <style scoped>
.ant-carousel >>> .slick-dots { .ant-carousel >>> .slick-dots {
height: auto; height: auto;
} }
.ant-carousel >>> .slick-slide img { .ant-carousel >>> .slick-slide img {
border: 5px solid #fff; border: 5px solid #fff;
display: block; display: block;
margin: auto; margin: auto;
max-width: 80%; max-width: 80%;
} }
.ant-carousel >>> .slick-thumb { .ant-carousel >>> .slick-thumb {
bottom: -45px; bottom: -45px;
} }
.ant-carousel >>> .slick-thumb li { .ant-carousel >>> .slick-thumb li {
width: 60px; width: 60px;
height: 45px; height: 45px;
} }
.ant-carousel >>> .slick-thumb li img { .ant-carousel >>> .slick-thumb li img {
width: 100%; width: 100%;
height: 100%; height: 100%;
filter: grayscale(100%); filter: grayscale(100%);
} }
.ant-carousel >>> .slick-thumb li.slick-active img { .ant-carousel >>> .slick-thumb li.slick-active img {
filter: grayscale(0%); filter: grayscale(0%);
} }
</style> </style>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<script> <script>
import STable from '@/components/table'; import STable from '@/components/table';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import {list, excelOut,update,queryById} from "../../../api/school-center/uploadVerify/studentCardVerifyAPI" import {list, excelOut,update,queryById,images} from "../../../api/school-center/uploadVerify/studentCardVerifyAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import ConstantActivity from "@/constant/ConstantActivity"; import ConstantActivity from "@/constant/ConstantActivity";
import Vue from 'vue'; import Vue from 'vue';
...@@ -405,8 +405,12 @@ ...@@ -405,8 +405,12 @@
this.visiblepicture = false; this.visiblepicture = false;
}, },
imgClick(res) { imgClick(res) {
this.imgInfo = this.baseuploadUrl() + res
this.imgInfo = this.replaceUrl(this.imgInfo); let imgInfo = this.baseuploadUrl() + res
//imgInfo = this.replaceUrl(imgInfo);
images({url: imgInfo}).then(response => {
this.imgInfo = 'data:image/jpg;base64,' + response
})
this.visiblepicture = true this.visiblepicture = true
}, },
replaceUrl(res){ replaceUrl(res){
......
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<script> <script>
import STable from '@/components/table'; import STable from '@/components/table';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import {list,update,getSchoolNames, initSubstName} from "../../../api/school-center/userManager/newUserAPI" import {list,update,getSchoolNames, initSubstName,images} from "../../../api/school-center/userManager/newUserAPI"
import {cloneObject} from '@/utils/util'; import {cloneObject} from '@/utils/util';
import ConstantActivity from "@/constant/ConstantActivity"; import ConstantActivity from "@/constant/ConstantActivity";
import Vue from 'vue'; import Vue from 'vue';
...@@ -257,7 +257,11 @@ ...@@ -257,7 +257,11 @@
this.visiblepicture = false; this.visiblepicture = false;
}, },
imgClick(res) { imgClick(res) {
this.imgInfo = this.apis + (res != null ? res.replace("manager", "app") : ""); let imgInfo = this.apis + (res != null ? res : "");
//imgInfo = this.replaceUrl(imgInfo);
images({url: imgInfo}).then(response => {
this.imgInfo = 'data:image/jpg;base64,' + response
})
this.visiblepicture = true this.visiblepicture = true
}, },
imgUrl(res){ imgUrl(res){
......
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