Skip to content

P
pica.cloud.web-education-admin
提交 90eeb3ae 编写于 作者: mengxin.deng's avatar mengxin.deng
浏览文件
操作

Merge branch 'feature/zl' into 'test' 

Feature/zl

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!402
上级 b2945a4a 42bc013f
隐藏空白字符变更
内嵌 并排
正在显示 包含 172 行增加 和 85 行删除
src/views/shop/create-shop.vue
浏览文件 @ 90eeb3ae
......@@ -106,7 +106,7 @@
></el-input>
<span class="word-num"
>{{
formData.storeDescription.replace(/\s+/g, "").length
formData.storeDescription ? formData.storeDescription.replace(/\s+/g, "").length : ''
}}/400</span
>
</el-col>
......@@ -344,7 +344,6 @@
placeholder="请选择企业类型类型"
size="small"
clearable
:disabled="isDisabled"
style="width: 35%"
>
<el-option
......@@ -411,7 +410,7 @@
</p>
<div>
<div>
<el-form-item prop="imgUrlC1">
<el-form-item prop="imgUrlC1" ref="imgUrlC1">
<el-upload
v-model="formData.imgUrlC1"
:disabled="Boolean(formData.imgUrlC1)"
......@@ -491,6 +490,7 @@
<div v-if="formData.storeType == 1">
<div>委托人身份证</div>
<div class="flex-wrap">
<el-form-item prop="imgUrlC4" ref="fIdCard">
<el-upload
v-model="formData.imgUrlC4"
:disabled="Boolean(formData.imgUrlC4)"
......@@ -520,6 +520,8 @@
<i class="el-icon-delete"></i>
</div>
</el-upload>
</el-form-item>
<el-form-item prop="imgUrlC5" ref="fIdCardBack">
<el-upload
:disabled="Boolean(formData.imgUrlC5)"
v-model="formData.imgUrlC5"
......@@ -549,6 +551,7 @@
<i class="el-icon-delete"></i>
</div>
</el-upload>
</el-form-item>
</div>
<div class="img-data">
<el-form-item
......@@ -626,7 +629,7 @@
<p v-if="certifyValidDtoList(6)" class="red">{{certifyValidDtoList(6)}}</p>
<div>法人身份证</div>
<div class="flex-wrap">
<el-form-item prop="imgUrlC2">
<el-form-item prop="imgUrlC2" ref="idCard">
<el-upload
:disabled="Boolean(formData.imgUrlC2)"
v-model="formData.imgUrlC2"
......@@ -658,7 +661,7 @@
<div>身份证正面</div>
</el-upload>
</el-form-item>
<el-form-item prop="imgUrlC3">
<el-form-item prop="imgUrlC3" ref="idCardBack">
<el-upload
:disabled="Boolean(formData.imgUrlC3)"
v-model="formData.imgUrlC3"
......@@ -690,6 +693,9 @@
<div>身份证反面</div>
</el-upload>
</el-form-item>
<el-form-item>
<div v-show="idCardError" style="color:#F56C6C">身份证内容识别失败，请手动输入</div>
</el-form-item>
</div>
<div class="img-data">
......@@ -733,7 +739,7 @@
<p v-if="certifyValidDtoList(6)" class="red">{{certifyValidDtoList(6)}}</p>
<div>法人身份证</div>
<div class="flex-wrap">
<el-form-item>
<el-form-item ref="idCard">
<el-upload
:disabled="Boolean(formData.imgUrlC2)"
v-model="formData.imgUrlC2"
......@@ -765,7 +771,7 @@
<div>身份证正面</div>
</el-upload>
</el-form-item>
<el-form-item>
<el-form-item ref="idCardBack">
<el-upload
:disabled="Boolean(formData.imgUrlC3)"
v-model="formData.imgUrlC3"
......@@ -797,6 +803,9 @@
<div>身份证反面</div>
</el-upload>
</el-form-item>
<el-form-item>
<div v-show="idCardError" style="color:#F56C6C">身份证内容识别失败，请手动输入</div>
</el-form-item>
</div>
<div class="img-data">
......@@ -887,55 +896,55 @@
</el-date-picker>
</el-form-item>
</div>
<div v-if="controlLicense.includes('1')">
<p v-if="certifyValidDtoList(8)" class="red">{{certifyValidDtoList(8)}}</p>
<p class="tips">药品经营质量管理规范认证证书</p>
<el-form-item prop="imgUrlP8">
<el-upload
:disabled="Boolean(formData.imgUrlP8)"
v-model="formData.imgUrlP8"
class="bg-uploader"
action="#"
:show-file-list="false"
:before-upload="(file) => {this.beforeUploadProve(file, 'imgUrlP8')}"
>
<el-image
class="bg-img"
v-if="formData.imgUrlP8"
:src="formData.imgUrlP8"
@mouseover.stop="imgMouseOverP8 = true"
:preview-src-list="[formData.imgUrlP8]">
</el-image>
<img
v-if="!formData.imgUrlP8"
class="bg-img"
src="../../assets/image/small.png"
/>
<div
class="img-delete"
v-show="imgMouseOverP8"
@click.stop="deleteImg('imgUrlP8')"
@mouseout.stop="imgMouseOverP8 = false"
>
<i class="el-icon-delete"></i>
</div>
</el-upload>
</el-form-item>
<el-form-item
label="有效日期"
label-width="100px"
prop="imgUrlP8Date"
>
<el-date-picker
v-model="formData.imgUrlP8Date"
@change="(v) => {this.orgDate(v, 'imgUrlP8')}"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</div>
<!-- <div v-if="controlLicense.includes('1')">-->
<!-- <p v-if="certifyValidDtoList(8)" class="red">{{certifyValidDtoList(8)}}</p>-->
<!-- <p class="tips">药品经营质量管理规范认证证书</p>-->
<!-- <el-form-item prop="imgUrlP8">-->
<!-- <el-upload-->
<!-- :disabled="Boolean(formData.imgUrlP8)"-->
<!-- v-model="formData.imgUrlP8"-->
<!-- class="bg-uploader"-->
<!-- action="#"-->
<!-- :show-file-list="false"-->
<!-- :before-upload="(file) => {this.beforeUploadProve(file, 'imgUrlP8')}"-->
<!-- >-->
<!-- <el-image-->
<!-- class="bg-img"-->
<!-- v-if="formData.imgUrlP8"-->
<!-- :src="formData.imgUrlP8"-->
<!-- @mouseover.stop="imgMouseOverP8 = true"-->
<!-- :preview-src-list="[formData.imgUrlP8]">-->
<!-- </el-image>-->
<!-- <img-->
<!-- v-if="!formData.imgUrlP8"-->
<!-- class="bg-img"-->
<!-- src="../../assets/image/small.png"-->
<!-- />-->
<!-- <div-->
<!-- class="img-delete"-->
<!-- v-show="imgMouseOverP8"-->
<!-- @click.stop="deleteImg('imgUrlP8')"-->
<!-- @mouseout.stop="imgMouseOverP8 = false"-->
<!-- >-->
<!-- <i class="el-icon-delete"></i>-->
<!-- </div>-->
<!-- </el-upload>-->
<!-- </el-form-item>-->
<!-- <el-form-item-->
<!-- label="有效日期"-->
<!-- label-width="100px"-->
<!-- prop="imgUrlP8Date"-->
<!-- >-->
<!-- <el-date-picker-->
<!-- v-model="formData.imgUrlP8Date"-->
<!-- @change="(v) => {this.orgDate(v, 'imgUrlP8')}"-->
<!-- type="daterange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </div>-->
<div v-if="controlLicense.includes('3')">
<p v-if="certifyValidDtoList(9)" class="red">{{certifyValidDtoList(9)}}</p>
<p class="tips">食品经营(流通)许可证</p>
......@@ -985,7 +994,7 @@
</el-date-picker>
</el-form-item>
</div>
<div v-if="controlLicense.includes('2')">
<div v-if="controlLicense.includes(3) && controlLicense.includes('2')">
<p v-if="certifyValidDtoList(10)" class="red">{{certifyValidDtoList(10)}}</p>
<p class="tips">医疗器械经营许可证</p>
<el-form-item prop="imgUrlP10">
......@@ -1070,11 +1079,11 @@
<el-form-item
label="有效日期"
label-width="100px"
prop="imgUrlP11Date"
prop="imgUrlP13Date"
>
<el-date-picker
v-model="formData.imgUrlP11Date"
@change="(v) => {this.orgDate(v, 'imgUrlP11')}"
v-model="formData.imgUrlP13Date"
@change="(v) => {this.orgDate(v, 'imgUrlP13')}"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
......@@ -1082,7 +1091,7 @@
</el-date-picker>
</el-form-item>
</div>
<div v-if="controlLicense.includes('2')">
<div v-if="controlLicense.includes(2) && controlLicense.includes('2')">
<p v-if="certifyValidDtoList(11)" class="red">{{certifyValidDtoList(11)}}</p>
<p class="tips">二类医疗器械经营备案凭证</p>
<el-form-item prop="imgUrlP11">
......@@ -1119,11 +1128,11 @@
<el-form-item
label="有效日期"
label-width="100px"
prop="imgUrlP6Date"
prop="imgUrlP11Date"
>
<el-date-picker
v-model="formData.imgUrlP6Date"
@change="(v) => {this.orgDate(v, 'imgUrlP6')}"
v-model="formData.imgUrlP11Date"
@change="(v) => {this.orgDate(v, 'imgUrlP11')}"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
......@@ -1425,7 +1434,9 @@ export default {
areaStr: [],
orgType: '',
orgName:'',
legalName:'',
licenseUrl:'',
legalCertNo:'',
licenseValidDateBegin:'',
licenseValidDateEnd:'',
licenseType: 1,
......@@ -1433,7 +1444,9 @@ export default {
creditCode:'',
assignorLetterUrl:'',
bizScope:'',
certifyLicenseImgList: []
certifyLicenseImgList: [],
assignorName:'',
assignorCertNo:''
},
},
cpmList: [], //所有的物流公司
......@@ -1583,14 +1596,14 @@ export default {
'certifyReq.orgType':[{required: true, message: '请填企业类型', trigger: 'blur'}], //有多条校验条件的时候可以放个ob
'certifyReq.orgAddress':[{type: "string", required: true, message: '请填写详细地址', trigger: 'blur'}],
'certifyReq.bizScope':[{type: "array", required: true, message: '请选择经营范围', trigger: 'change'}],
'certifyReq.orgName':[{type: "string", required: true, message: '请输入企业名称', trigger: 'blur'}],
'certifyReq.creditCode':[{type: "string", required: true, message: '请输入信用代码', trigger: 'blur'}],
'certifyReq.orgName':[{type: "string", required: true, message: '请输入企业名称', trigger: 'change'}],
'certifyReq.creditCode':[{type: "string", required: true, message: '请输入信用代码', trigger: 'change'}],
imgUrlC1Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'blur'}],
'certifyReq.assignorName':[{type: "string", required: true, message: '请输入委托人姓名', trigger: 'blur'}],
'certifyReq.assignorCertNo':[{type: "string", required: true, message: '请输入证件号码', trigger: 'blur'}],
'certifyReq.assignorName':[{type: "string", required: true, message: '请输入委托人姓名', trigger: 'change'}],
'certifyReq.assignorCertNo':[{type: "string", required: true, message: '请输入证件号码', trigger: 'change'}],
imgUrlC5Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
'certifyReq.legalName':[{type: "string", required: true, message: '请输入法人姓名', trigger: 'blur'}],
'certifyReq.legalCertNo':[{type: "string", required: true, message: '请输入证件号码', trigger: 'blur'}],
'certifyReq.legalName':[{type: "string", required: true, message: '请输入法人姓名', trigger: 'change'}],
'certifyReq.legalCertNo':[{type: "string", required: true, message: '请输入证件号码', trigger: 'change'}],
imgUrlC3Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
imgUrlP5:[{type: "string", required: true, message: '请上传图片', trigger: 'blur'}],
imgUrlP5Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
......@@ -1604,6 +1617,8 @@ export default {
imgUrlC1:[{type: "string", required: true, message: '请上传图片', trigger: 'change'}],
imgUrlC2:[{type: "string", required: true, message: '请上传图片', trigger: 'change'}],
imgUrlC3:[{type: "string", required: true, message: '请上传图片', trigger: 'change'}],
imgUrlC4:[{type: "string", required: true, message: '请上传图片', trigger: 'change'}],
imgUrlC5:[{type: "string", required: true, message: '请上传图片', trigger: 'change'}],
imgUrlP8Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
imgUrlP9Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
imgUrlP10Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
......@@ -1659,9 +1674,21 @@ export default {
}
}
},
orgLIST: [],
orgLIST: [
{
id: 5,
intro: "生产企业",
name: "生产企业",
},
{
id: 6,
intro: "商业公司",
name: "商业公司",
}
],
orgScopeLIST:[],
certifyStatus: ''
certifyStatus: '',
idCardError:false,
};
},
computed: {
......@@ -1672,12 +1699,14 @@ export default {
watch: {
"formData.certifyReq.bizScope": {
handler(val) {
console.log(val);
const j = [];
if(val) {
val.map( i => {
i.type && j.push(String(i.type))
i.type && j.push(String(i.type),i.id)
})
this.controlLicense = j;
console.log(this.controlLicense);
}
},
deep: true,
......@@ -1750,7 +1779,8 @@ export default {
this.formData.imgUrlC5Date = [assignorValidDateBegin, assignorValidDateEnd];
this.formData.imgUrlC3Date = [legalValidDateBegin, legalValidDateEnd];
// imgUrlC3Date
(certifyReportImgList || []).concat(certifyLicenseImgList).map(i => {
const cl = certifyLicenseImgList || [];
(certifyReportImgList || []).concat(cl).map(i => {
const n = `imgUrlP${i.imageType}Date`;
const m = `imgUrlP${i.imageType}`;
this.formData[n] = [i.validDateBegin, i.validDateEnd];
......@@ -1896,9 +1926,9 @@ export default {
completeWholeForm() {
let flag = this.submitForm();
if (flag && this.certifyStatus == 3) {
this.$confirm('确定要删除这条地址信息么?', '提示', {
this.$confirm('您的店铺已经审核通过，重新提交后需要重新审核。', '确认重新提交店铺信息吗?', {
confirmButtonText: '确定',
cancelButtonText: '',
cancelButtonText: '取消',
type: 'error'
}).then(() => {
this.formData.storeType = Number(this.formData.storeType);
......@@ -2185,6 +2215,13 @@ export default {
const e = dayjs(v[1]).format('YYYY-MM-DD');
const l = this.formData.certifyReq.certifyLicenseImgList;
const t = type.charAt(type.length-1);
const t2 = type.charAt(type.length-2);
let last;
if(isNaN(t2)){
last = t
}else{
last = t2 + t;
}
switch (type) {
case 'imgUrlC1':
// 营业执照
......@@ -2217,10 +2254,9 @@ export default {
// 委托书
case 'imgUrlP5':
// 年度报告
const r = l.filter( i => {return i.imageType == t})[0] || {};
l.push(Object.assign(r, {validDateBegin: b, validDateEnd: e, imageType: t}));
const r = l.filter( i => {return i.imageType == last})[0] || {};
l.push(Object.assign(r, {validDateBegin: b, validDateEnd: e, imageType: last}));
this.formData.certifyReq.certifyLicenseImgList = this.clearRepeat(l, 'imageType');
console.log('--this.formData', this.formData);
break;
default:
return false;
......@@ -2294,7 +2330,7 @@ export default {
attachmentExt: path.ext,
attachmentSize: path.size,
};
console.log('vm.formData--', vm.formData, fileLimit);
console.log(vm.formData.imgUrlC2,'--------------');
vm.setImgUrl(path, fileLimit);
vm.$message.success("上传成功");
});
......@@ -2317,6 +2353,7 @@ export default {
setImgUrl (path, fileLimit) {
const l = this.formData.certifyReq.certifyLicenseImgList;
const f = path.fullPath;
const imgName = fileLimit.key;
const u = this.formData[imgName];
const t = imgName.charAt(imgName.length-1);
......@@ -2459,6 +2496,7 @@ export default {
const n = checkedNodes.filter( i => {return !i.hasChildren;}).map(k => {return {...k.data}});
vm.formData.certifyReq.bizScope = n;
this.bizScopeCasValue = v;
console.log(this.bizScopeCasValue ,this.controlLicense);
},
// 获取裁剪的图片数据
getCropImg(argument) {
......@@ -2618,7 +2656,7 @@ export default {
return new Promise((resolve) => {
orgOptionList().then(res => {
if(res.code == '000000') {
this.orgLIST = res.data;
// this.orgLIST = res.data;
}
});
orgScopeOptionList().then( res => {
......@@ -2633,6 +2671,7 @@ export default {
item.list = res.data.filter(v => v.type == item.id.charAt(0) );
});
this.orgScopeLIST = m;
console.log(this.orgScopeLIST);
}
});
resolve(true);
......@@ -2822,6 +2861,7 @@ export default {
const {wordsResult} = data.ocrCardDto;
if(wordsResult) {
const {creditCode, establishmentDate, orgName, validDate} = wordsResult;
this.$refs.imgUrlC1.clearValidate();
vm.formData.certifyReq.orgName = orgName;
vm.formData.certifyReq.creditCode = creditCode;
if(establishmentDate && validDate) {
......@@ -2838,6 +2878,7 @@ export default {
},
// 身份证正面/反面OCR上传后的回调处理
idCardFileHandle(file, type, legal) {
console.log(type);
file['cardSide'] = type;
console.log('---cardSide', file);
idCardOcr(file).then((res) => {
......@@ -2845,24 +2886,53 @@ export default {
const { code, data } = res;
if (code === '000000') {
console.log('---data', data);
if(!data.ocrCardDto.ocrStatus) {
this.$message.error(data.ocrCardDto.ocrMessage || '身份证识别失败，请重新上传');
if(type === 1){
console.log('上传身份证正面');
setTimeout(() => {
this.formData.imgUrlC2 = ''
this.formData.imgUrlC4 = ''
}, 500);
}
if(type === 2){
setTimeout(() => {
this.formData.imgUrlC3 = ''
this.formData.imgUrlC5 = ''
}, 500);
}
return;
}
if(data.ocrCardDto.wordsResultDto){
this.$refs.idCard.clearValidate();
const {cardNo,name} = data.ocrCardDto.wordsResultDto;
if(!cardNo || !name) { // 身份证内容识别失败
this.idCardError = true
}
if(legal == 'legal'){
vm.formData.certifyReq.legalName = name;
vm.formData.certifyReq.legalCertNo = cardNo;
}else {
this.$refs.fIdCard.clearValidate();
vm.formData.certifyReq.assignorName = name;
vm.formData.certifyReq.assignorCertNo = cardNo;
}
}
if(data.ocrCardDto.wordsResultBackDto){
console.log(this.$refs.idCardBack);
const {signYmd, endYmd} = data.ocrCardDto.wordsResultBackDto;
if(!signYmd || !endYmd) { // 身份证内容识别失败
this.idCardError = true
}
if(legal == 'legal'){
this.$refs.idCardBack.clearValidate();
vm.formData.imgUrlC3Date = [signYmd, endYmd];
vm.formData.certifyReq.legalValidDateBegin = signYmd;
vm.formData.certifyReq.legalValidDateEnd = endYmd;
}else {
this.$refs.fIdCardBack.clearValidate();
vm.formData.imgUrlC5Date = [signYmd, endYmd];
vm.formData.certifyReq.assignorValidDateBegin = signYmd;
vm.formData.certifyReq.assignorValidDateEnd = endYmd;
......@@ -3130,6 +3200,7 @@ export default {
max-width: 1400px;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
.el-range-editor{
width: 500px;
}
......
src/views/shop/shop-list.vue
浏览文件 @ 90eeb3ae
......@@ -195,7 +195,7 @@
<el-button v-if="checkSpe(scope.row)" @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
<el-button v-if="scope.row.tradeStore.storeType == 3" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
<el-button v-if="scope.row.tradeStore.storeType == 3 && isOutsideGetted == 'no'" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
</div>
</template>
</el-table-column>
......@@ -273,12 +273,14 @@
import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue";
import { queryStore, queryShopAuth, closeShop } from '@/utils/shop';
import { getUserTypeReq } from "@/utils/cme/cmeApi";
export default {
components: {
BreadCrumb
},
data(){
return{
isOutsideGetted: 'no',
curmbFirst: '云鹊店铺',
showAllFlag: false,
showNewFlag: false,
......@@ -326,13 +328,17 @@
}],
storeTypeList: [
{
value: 1,
label: "待完善"
},
{
value: 2,
label: "认证提交中"
label: "待审核"
},
{
value: 3,
label: "认证通过"
label: "审核通过"
},
{
value: 4,
......@@ -372,6 +378,7 @@
// this.idType = localStorage.getItem("storageIdType");
this.storageIdType = localStorage.getItem("storageIdType") - 0;
console.log(this.storageIdType);
this.getUserTypeReq();
this.getAddAuth();
this.searchList();
},
......@@ -384,6 +391,15 @@
}
})
},
getUserTypeReq () {
getUserTypeReq().then(res => {
console.log('--res', res);
if(res.code == '000000'){
this.isOutsideGetted = res.data.code;
}
});
},
searchList() {
openLoading(this);
let params = this.searchForm;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或