提交 de5bc7b4 编写于 作者: changdi.hao's avatar changdi.hao

Merge branch 'release' of...

Merge branch 'release' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into release
......@@ -593,7 +593,7 @@
</div>
<div v-if="formData.certifyReq.certType == 2|| formData.storeType == 2 " class="flex-upload">
<p v-if="certifyValidDtoList(5)" class="red">{{certifyValidDtoList(5)}}</p>
<div>委托书</div>
<div class="required-star" >委托书</div>
<el-form-item prop="imgUrlP5" ref="pIdCardBack">
<el-upload
:disabled="Boolean(formData.imgUrlP5)"
......@@ -848,7 +848,7 @@
</div>
</el-form-item>
<el-form-item label="资质信息" class="required-label" v-if="formData.storeType < 3">
<div v-if="controlLicense.includes('1') || formData.storeType == 2">
<div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '1'; })).length > 0 || formData.storeType == 2">
<p v-if="certifyValidDtoList(7)" class="red">{{certifyValidDtoList(7)}}</p>
<p class="tips">药品经营许可证</p>
<el-form-item prop="imgUrlP7">
......@@ -947,7 +947,7 @@
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </div>-->
<div v-if="controlLicense.includes('3')">
<div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '3'; })).length > 0">
<p v-if="certifyValidDtoList(9)" class="red">{{certifyValidDtoList(9)}}</p>
<p class="tips">食品经营(流通)许可证</p>
<el-form-item prop="imgUrlP9">
......@@ -996,7 +996,7 @@
</el-date-picker>
</el-form-item>
</div>
<div v-if="controlLicense.includes(3) && controlLicense.includes('2')">
<div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2'; })).length > 0">
<p v-if="certifyValidDtoList(10)" class="red">{{certifyValidDtoList(10)}}</p>
<p class="tips">医疗器械经营许可证</p>
<el-form-item prop="imgUrlP10">
......@@ -1045,7 +1045,7 @@
</el-date-picker>
</el-form-item>
</div>
<div v-if="controlLicense.includes('2')">
<div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '3'; })).length > 0">
<p class="tips">医疗器械网络销售备案</p>
<el-form-item prop="imgUrlP13">
<el-upload
......@@ -1093,7 +1093,7 @@
</el-date-picker>
</el-form-item>
</div>
<div v-if="controlLicense.includes(2) && controlLicense.includes('2')">
<div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '2'; })).length > 0">
<p v-if="certifyValidDtoList(11)" class="red">{{certifyValidDtoList(11)}}</p>
<p class="tips">二类医疗器械经营备案凭证</p>
<el-form-item prop="imgUrlP11">
......@@ -1699,20 +1699,6 @@ 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.id)
})
// this.controlLicense = j;
// console.log(this.controlLicense);
}
},
deep: true,
},
},
created() {
vm = this;
......@@ -1762,21 +1748,13 @@ export default {
storejs.remove('store_info');
this.curmbSecond = "新建店铺";
this.isDisabled = false;
// if(s){
// // 存在数据 就反现
// this.formData = s;
// const {areaStr} = s.certifyReq;
// const v = areaStr.map(i => {return i.label;}).join('/');
// this.orgRegionValueFirst = v;
// this.orgDateReverse();
// }
}
}
},
//日期 设置
orgDateReverse () {
const {licenseValidDateBegin,licenseValidDateEnd,legalValidDateBegin, legalValidDateEnd, assignorValidDateBegin, assignorValidDateEnd} = this.formData.certifyReq;
const {certifyLicenseImgList, certifyReportImgList} = this.formData.certifyReq;
const {certifyLicenseImgList, certifyReportImgList, bizScope} = this.formData.certifyReq;
this.formData.imgUrlC1Date = [licenseValidDateBegin, licenseValidDateEnd];
this.formData.imgUrlC5Date = [assignorValidDateBegin, assignorValidDateEnd];
this.formData.imgUrlC3Date = [legalValidDateBegin, legalValidDateEnd];
......@@ -1787,7 +1765,14 @@ export default {
const m = `imgUrlP${i.imageType}`;
this.formData[n] = [i.validDateBegin, i.validDateEnd];
this.formData[m] = i.url;
})
});
if(bizScope){
const j = [];
bizScope.map( i => {
i.type && j.push(String(i.type) + '__' + i.id,)
})
this.controlLicense = j;
}
},
resetImgUrl () {
// 营业执照 legalCertBackUrl legalCertFrontUrl
......@@ -2495,16 +2480,23 @@ export default {
}
},
orgScopeLISTChange(v){
const that = this;
this.$nextTick(() => {
const c = that.$refs['cascaderBizScope'].getCheckedNodes();
const m = c.filter( i => {return !i.hasChildren;}).map(k => {return {...k.data}});
const j = [];
if(m) {
m.map( i => {
i.type && j.push(String(i.type) + '__' + i.id,)
})
this.controlLicense = j;
}
});
const checkedNodes = this.$refs['cascaderBizScope'].getCheckedNodes();
const n = checkedNodes.filter( i => {return !i.hasChildren;}).map(k => {return {...k.data}});
vm.formData.certifyReq.bizScope = n;
console.log(vm.formData.certifyReq.bizScope,v);
this.bizScopeCasValue = v;
this.controlLicense = []
v.forEach(item => {
this.controlLicense.push(...item)
})
console.log(this.bizScopeCasValue ,this.controlLicense);
},
// 获取裁剪的图片数据
getCropImg(argument) {
......@@ -3243,5 +3235,10 @@ export default {
.el-range-editor{
width: 500px;
}
.required-star::before{
content: "*";
color: #f56c6c;
margin-right: 4px;
}
}
</style>
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册