Skip to content

P
pica.cloud.web-education-admin
提交 4451f36b 编写于 作者: 张磊's avatar 张磊
浏览文件
操作

auto commit

上级 40df5a43
显示空白字符变更
内嵌 并排
正在显示 包含 318 行增加 和 49 行删除
gitPush.sh 0 → 100644
浏览文件 @ 4451f36b
#!/bin/bash
hasGit=`which git` # 判断是否存在git
msg=${1:-'auto commit'} # 获取终端输入的第一个参数，若为空则为auto commit
if [ ! $hasGit ];then
echo 'Please download git first!';
exit 1;
else
git fetch --all
result=`git symbolic-ref --short -q HEAD` # 获取分支名
current_id=`git log -n 1 release --pretty=format:"%H"`
git reset --soft $current_id
git add .
git commit -m "$msg"
echo "curBranch $result"
git push origin -f $result # 提交代码到github(修改了远程项目名)
fi
package.json
浏览文件 @ 4451f36b
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
"build:test": "cross-env BUILD_ENV=test node build/build.js", "build:test": "cross-env BUILD_ENV=test node build/build.js",
"build:test2": "cross-env BUILD_ENV=test2 node build/build.js", "build:test2": "cross-env BUILD_ENV=test2 node build/build.js",
"build:uat": "cross-env BUILD_ENV=uat node build/build.js", "build:uat": "cross-env BUILD_ENV=uat node build/build.js",
"build:pro": "cross-env BUILD_ENV=pro node build/build.js" "build:pro": "cross-env BUILD_ENV=pro node build/build.js",
"push": "bash gitPush.sh"
}, },
"dependencies": { "dependencies": {
"@babel/polyfill": "^7.2.5", "@babel/polyfill": "^7.2.5",
......
src/style/common.scss
浏览文件 @ 4451f36b
...@@ -218,6 +218,7 @@ html,body{ ...@@ -218,6 +218,7 @@ html,body{
border: 1px solid #449284 !important; border: 1px solid #449284 !important;
opacity: 0.5; opacity: 0.5;
} }
// .el-button--default:focus, .el-button--default:hover { // .el-button--default:focus, .el-button--default:hover {
// color: #449284 !important; // color: #449284 !important;
// border-color: #449284 !important; // border-color: #449284 !important;
......
src/utils/base/baseApi.js
浏览文件 @ 4451f36b
...@@ -41,3 +41,11 @@ export const getTowns = (params) => { ...@@ -41,3 +41,11 @@ export const getTowns = (params) => {
params: params, params: params,
}); });
}; };
// /*获取机构地址*/
export const getDetectTowns = (params) => {
return fetch({
url: getBaseUrl(`store/detect/address/province/city/${params.storeId || 0}/${params.addressId || 0}`),
method: "get",
});
};
src/views/shop/create-shop.vue
浏览文件 @ 4451f36b
...@@ -1160,7 +1160,7 @@ ...@@ -1160,7 +1160,7 @@
<el-tab-pane v-if="formData.storeType != 3" label="其他设置" name="third"> <el-tab-pane v-if="formData.storeType != 3" label="其他设置" name="third">
<el-form-item label="仓库地址管理" prop="selectedKey" class="required-label warehouseAdress-wrap" v-if="formData.storeType < 3"> <el-form-item label="仓库地址管理" prop="selectedKey" class="required-label warehouseAdress-wrap" v-if="formData.storeType < 3">
<p class="warehouseAdress-tip">(该地址用于买家退货时退回地址，请准确填写)</p> <p class="warehouseAdress-tip">(该地址用于买家退货时退回地址，请准确填写)</p>
<el-button type="success" class="warehouseAdress-add" size="small" @click="createAdress(0)">+新增地址</el-button> <el-button type="primary" class="warehouseAdress-add" size="small" @click="createAdress(0)">+新增地址</el-button>
<el-radio-group v-model="formData.selectedKey" class="warehouseAdress-list"> <el-radio-group v-model="formData.selectedKey" class="warehouseAdress-list">
<el-radio :label="addressItem.key" class="warehouseAdress-item" v-for="(addressItem, index) of formData.repotList" :key="index"> <el-radio :label="addressItem.key" class="warehouseAdress-item" v-for="(addressItem, index) of formData.repotList" :key="index">
<span>默认</span> <span>默认</span>
...@@ -1170,7 +1170,7 @@ ...@@ -1170,7 +1170,7 @@
<span class="warehouseAdress-msg">{{setAddress(addressItem)}}</span> <span class="warehouseAdress-msg">{{setAddress(addressItem)}}</span>
</span> </span>
<span class="warehouseAdress-do"> <span class="warehouseAdress-do">
<el-button class="btn-small" @click.prevent="createAdress(1,index)">编辑</el-button> ｜ <el-button class="btn-small" @click.prevent="createAdress(1,index)">编辑</el-button>
<el-button class="btn-small" @click.prevent="deleteAdress(index)">删除</el-button> <el-button class="btn-small" @click.prevent="deleteAdress(index)">删除</el-button>
</span> </span>
</el-radio> </el-radio>
...@@ -1178,7 +1178,11 @@ ...@@ -1178,7 +1178,11 @@
</el-form-item> </el-form-item>
<el-form-item label="送检地址管理" class="warehouseAdress-wrap" v-if="formData.storeType < 3"> <el-form-item label="送检地址管理" class="warehouseAdress-wrap" v-if="formData.storeType < 3">
<p class="warehouseAdress-tip">(该地址用于机构回寄样本地址，请准确填写)</p> <p class="warehouseAdress-tip">(该地址用于机构回寄样本地址，请准确填写)</p>
<el-button type="success" class="warehouseAdress-add" size="small" v-if="!formData.tradeStoreDetectionAddress.receiverMobile" @click="createDetectionAdress(0)">+新增地址</el-button> <div class="detectionAddress-wrap">
<div class="detectionAddress-title">
<span class="bold">平台默认</span>
<el-button v-if="!formData.tradeStoreDetectionAddress.receiverMobile" type="primary" size="small" @click="createDetectionAdress(0)">+新增地址</el-button>
</div>
<div class="detectionAddress" v-if="formData.tradeStoreDetectionAddress && formData.tradeStoreDetectionAddress.receiverMobile"> <div class="detectionAddress" v-if="formData.tradeStoreDetectionAddress && formData.tradeStoreDetectionAddress.receiverMobile">
<div class="warehouseAdress-item"> <div class="warehouseAdress-item">
<span class="warehouseAdress-main"> <span class="warehouseAdress-main">
...@@ -1192,6 +1196,33 @@ ...@@ -1192,6 +1196,33 @@
</span> </span>
</div> </div>
</div> </div>
<div class="detectionAddress-title dt-border-top">
<span class="bold">指定区域</span>
<el-button v-if="formData.detectionAreaAddressList.length < 10" type="primary" size="small" @click="createAreaAddress(0)">+新增地址</el-button>
</div>
<div class="warehouseAdress-list border-none" v-if="formData.detectionAreaAddressList.length > 0" v-model="checkList">
<div class="warehouseAdress-item" v-for="(addressItem, index) of formData.detectionAreaAddressList" :key="index">
<el-popover
placement="top-start"
title=""
trigger="hover"
:visible-arrow="false"
:content="areaContentPop(addressItem.areaList)">
<p slot="reference" class="warehouseAdress-main">
<span class="warehouseAdress-msg">{{addressItem.receiver}}</span>
<span class="warehouseAdress-msg">{{addressItem.receiverMobile}}</span>
<span class="warehouseAdress-msg">{{setAddress(addressItem)}}</span>
</p>
</el-popover>
<span class="warehouseAdress-do">
<el-button class="btn-small" @click.prevent="createAreaAddress(1, index)">编辑</el-button>
<el-button class="btn-small" @click.prevent="deleteAreaAdress(index)">删除</el-button>
</span>
</div>
</div>
</div>
<div class="certifyStatusColor2"><i class="el-icon-warning-outline"></i> 平台默认地址指除了指定区域外，其他区域统一使用默认地址</div>
</el-form-item> </el-form-item>
<el-form-item label="退货支持的物流公司" class="required-label" v-if="formData.storeType < 3"> <el-form-item label="退货支持的物流公司" class="required-label" v-if="formData.storeType < 3">
<el-radio-group v-model="formData.expressLimitFlag" @change="changeExpressLimitFlag"> <el-radio-group v-model="formData.expressLimitFlag" @change="changeExpressLimitFlag">
...@@ -1340,7 +1371,18 @@ ...@@ -1340,7 +1371,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="详细地址" label-width="70px" prop="addr"> <el-form-item label="详细地址" label-width="70px" prop="addr">
<el-input v-model="warehouseAdressForm.addr" autocomplete="off" clearable class="warehouseAdress-input"></el-input> <el-input v-model="warehouseAdressForm.addr" autocomplete="off" clearable @input="addrChange" class="warehouseAdress-input"></el-input>
</el-form-item>
<div class="area-title" v-if="isAreaAddress" >指定对应省市</div>
<el-form-item v-if="isAreaAddress" label="机构地址" prop="areaAddressValue" label-width="70px">
<el-cascader
ref="cascader"
class="warehouseAdress-input"
v-model="warehouseAdressForm.areaAddressValue"
:options="areaAddressList"
placeholder="请选择"
:props="areaAddressListProps"
filterable></el-cascader>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -1357,7 +1399,7 @@ import { openLoading, closeLoading, deepCopy} from "../../utils/utils"; ...@@ -1357,7 +1399,7 @@ import { openLoading, closeLoading, deepCopy} from "../../utils/utils";
import { doUpload, getFilePath } from "../../utils/qiniu-util"; import { doUpload, getFilePath } from "../../utils/qiniu-util";
import Cropper from "@/components/common/cropper.vue"; import Cropper from "@/components/common/cropper.vue";
import { saveStore, queryStore, getLgCompanyList, getStoreAdressRepot, OCRStore, idCardOcr, orgOptionList, orgScopeOptionList} from "@/utils/shop"; import { saveStore, queryStore, getLgCompanyList, getStoreAdressRepot, OCRStore, idCardOcr, orgOptionList, orgScopeOptionList} from "@/utils/shop";
import { getProvinces, getCities, getCounties, getTowns } from '@/utils/base/baseApi'; import { getProvinces, getCities, getCounties, getTowns, getDetectTowns} from '@/utils/base/baseApi';
import { checkMobile } from "@/utils/patients/checkValid"; import { checkMobile } from "@/utils/patients/checkValid";
import * as operationData from "../../utils/operation"; import * as operationData from "../../utils/operation";
import storejs from 'storejs' import storejs from 'storejs'
...@@ -1453,6 +1495,7 @@ export default { ...@@ -1453,6 +1495,7 @@ export default {
imgUrlC1Date:'', imgUrlC1Date:'',
repotList:[//仓库地址 repotList:[//仓库地址
], ],
detectionAreaAddressList:[],
tradeStoreDetectionAddress:{}, // 送检地址 tradeStoreDetectionAddress:{}, // 送检地址
selectedKey: '', //默认收货地址 selectedKey: '', //默认收货地址
expressLimitFlag: 0, //是否限制物流公司 expressLimitFlag: 0, //是否限制物流公司
...@@ -1492,7 +1535,8 @@ export default { ...@@ -1492,7 +1535,8 @@ export default {
countyName: '', countyName: '',
townName: '', townName: '',
addr: '', addr: '',
key: '' key: '',
areaAddressValue:[]
}, },
warehouseAdressFormVisible: false, warehouseAdressFormVisible: false,
warehouseAdressFormTitle: '添加地址', warehouseAdressFormTitle: '添加地址',
...@@ -1517,6 +1561,7 @@ export default { ...@@ -1517,6 +1561,7 @@ export default {
cityId: { required: true, message: "请选择市", trigger: ["change", "blur"] }, cityId: { required: true, message: "请选择市", trigger: ["change", "blur"] },
countyId: { required: true, message: "请选择区/县", trigger: ["change", "blur"] }, countyId: { required: true, message: "请选择区/县", trigger: ["change", "blur"] },
townId: { required: true, message: "请选择乡/镇", trigger: ["change", "blur"] }, townId: { required: true, message: "请选择乡/镇", trigger: ["change", "blur"] },
areaAddressValue: { required: true, message: "请选择机构地址", trigger: ["change", "blur"] },
addr:[ addr:[
{ required: true, message: "请输入详细收货地址", trigger: "blur" } { required: true, message: "请输入详细收货地址", trigger: "blur" }
], ],
...@@ -1589,7 +1634,7 @@ export default { ...@@ -1589,7 +1634,7 @@ export default {
], ],
storeDescription: [ storeDescription: [
{ required: false, message: "请输入店铺简介", trigger: "blur" }, { required: false, message: "请输入店铺简介", trigger: "blur" },
{ validator: checkProjectStr, trigger: "blur" }, // { validator: checkProjectStr, trigger: "blur" },
], ],
storeType: [ storeType: [
{ required: true, message: "请选择店铺类型", trigger: "blur" }, { required: true, message: "请选择店铺类型", trigger: "blur" },
...@@ -1717,7 +1762,15 @@ export default { ...@@ -1717,7 +1762,15 @@ export default {
orgScopeLIST:[], orgScopeLIST:[],
certifyStatus: '', certifyStatus: '',
idCardError:false, idCardError:false,
isDetection:false, // 是否是创建送检地址 isDetection:0, // 是否是创建送检地址 1 仓库地址 2 平台默认 3 指定区域
isAreaAddress: false, // 是否创建指定区域地址
checkList:[],
areaAddressList: [],
areaAddressListProps: {
multiple: true,
children:'cityDtoList',
emitPath: false
},
}; };
}, },
computed: { computed: {
...@@ -1741,6 +1794,11 @@ export default { ...@@ -1741,6 +1794,11 @@ export default {
} }
}, },
watch: { watch: {
warehouseAdressFormVisible(newVideoUrl) {
if(!newVideoUrl) {
this.isAreaAddress = false;
}
}
}, },
created() { created() {
vm = this; vm = this;
...@@ -1871,6 +1929,10 @@ export default { ...@@ -1871,6 +1929,10 @@ export default {
this.formData.storeDescription = storeDescription; this.formData.storeDescription = storeDescription;
this.formData.storeType = storeType; this.formData.storeType = storeType;
this.formData.tradeStoreDetectionAddress = this.storeData.tradeStoreDetectionAddress || {} this.formData.tradeStoreDetectionAddress = this.storeData.tradeStoreDetectionAddress || {}
this.storeData.detectionAreaAddressList.forEach( (j, k) => {
this.storeData.detectionAreaAddressList[k]['addr'] = j.address;
});
this.formData.detectionAreaAddressList = this.storeData.detectionAreaAddressList || [];
if (storeType == 1) { if (storeType == 1) {
this.formData.compainName = storeOwner; this.formData.compainName = storeOwner;
this.formData.phoneNum = storePhone; this.formData.phoneNum = storePhone;
...@@ -1954,7 +2016,6 @@ export default { ...@@ -1954,7 +2016,6 @@ export default {
}); });
}, },
completeWholeForm() { completeWholeForm() {
console.log(this.controlLicense,this.formData);
this.formData.certifyReq.certifyLicenseImgList = this.formData.certifyReq.certifyLicenseImgList || []; this.formData.certifyReq.certifyLicenseImgList = this.formData.certifyReq.certifyLicenseImgList || [];
if(!this.imgUrlP7Show){ if(!this.imgUrlP7Show){
this.formData.imgUrlP7 = '' this.formData.imgUrlP7 = ''
...@@ -2183,7 +2244,6 @@ export default { ...@@ -2183,7 +2244,6 @@ export default {
submitForm() { submitForm() {
let formName = "formData"; let formName = "formData";
let submitFlag = false; let submitFlag = false;
console.log('--this.formData', this.formData);
if (!this.formData.storeLogo) { if (!this.formData.storeLogo) {
this.uploadImgMessage1 = true; this.uploadImgMessage1 = true;
return; return;
...@@ -2570,7 +2630,6 @@ export default { ...@@ -2570,7 +2630,6 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
const c = that.$refs['cascaderBizScope'].getCheckedNodes(); const c = that.$refs['cascaderBizScope'].getCheckedNodes();
const m = c.filter( i => {return !i.hasChildren;}).map(k => {return {...k.data}}); const m = c.filter( i => {return !i.hasChildren;}).map(k => {return {...k.data}});
console.log('--m----', m);
const j = []; const j = [];
if(m) { if(m) {
m.map( i => { m.map( i => {
...@@ -2637,7 +2696,7 @@ export default { ...@@ -2637,7 +2696,7 @@ export default {
}, },
// 创建地址 // 创建地址
createDetectionAdress(type){ createDetectionAdress(type){
this.isDetection = true; this.isDetection = 2;
this.warehouseAdressType = type; this.warehouseAdressType = type;
this.warehouseAdressFormTitle = type ? '编辑地址' : '添加地址'; this.warehouseAdressFormTitle = type ? '编辑地址' : '添加地址';
this.warehouseAdressIndex = 0; this.warehouseAdressIndex = 0;
...@@ -2666,13 +2725,52 @@ export default { ...@@ -2666,13 +2725,52 @@ export default {
} }
this.warehouseAdressFormVisible = true; this.warehouseAdressFormVisible = true;
}, },
deleteDetectionAdress(){ // 创建地址
createAreaAddress(type,index){
if(!type && this.formData.detectionAreaAddressList.length >= 10){
this.$message('最多添加50条');
return false;
}
this.isAreaAddress = true;
this.isDetection = 3;
this.warehouseAdressType = type;
this.warehouseAdressFormTitle = type ? '编辑地址' : '添加地址';
this.warehouseAdressIndex = type ? index : '';
if (type) {
Object.assign(this.warehouseAdressForm,this.formData.detectionAreaAddressList[index]);
const al = this.formData.detectionAreaAddressList[index].areaList.map( i => {return i.cityId});
this.warehouseAdressForm.areaAddressValue = al;
this.getCitiesList();
this.getCountiesList();
this.getTownsList();
} else {
this.warehouseAdressForm = {
receiver: '',
receiverMobile: '',
provinceId: '',
cityId: '',
countyId: '',
townId: '',
provinceName: '',
cityName: '',
countyName: '',
townName: '',
addr: '',
address:'',
key: ''
}
}
this.getDetectTownsList();
this.warehouseAdressFormVisible = true;
},
deleteDetectionAdress(index){
this.$confirm('确定要删除这条地址信息么?', '提示', { this.$confirm('确定要删除这条地址信息么?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '', cancelButtonText: '',
type: 'error' type: 'error'
}).then(() => { }).then(() => {
this.formData.tradeStoreDetectionAddress = {} this.formData.tradeStoreDetectionAddress = {};
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!' message: '删除成功!'
...@@ -2686,7 +2784,7 @@ export default { ...@@ -2686,7 +2784,7 @@ export default {
}, },
// 编辑第几条数据 index // 编辑第几条数据 index
createAdress(type,index) { createAdress(type,index) {
this.isDetection = false; this.isDetection = 1;
this.warehouseAdressType = type; this.warehouseAdressType = type;
this.warehouseAdressFormTitle = type ? '编辑地址' : '添加地址'; this.warehouseAdressFormTitle = type ? '编辑地址' : '添加地址';
this.warehouseAdressIndex = type ? index : ''; this.warehouseAdressIndex = type ? index : '';
...@@ -2734,6 +2832,27 @@ export default { ...@@ -2734,6 +2832,27 @@ export default {
}); });
}); });
}, },
deleteAreaAdress(index) {
this.$confirm('确定要删除这条地址信息么?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '',
type: 'error'
}).then(() => {
if (this.formData.detectionAreaAddressList[index].key == this.formData.selectedKey) {
this.formData.selectedKey = '';
}
this.formData.detectionAreaAddressList.splice(index,1)
this.$message({
type: 'success',
message: '删除成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
// 选择省 // 选择省
changeProvince() { changeProvince() {
this.warehouseAdressForm.cityId = ""; this.warehouseAdressForm.cityId = "";
...@@ -2854,6 +2973,40 @@ export default { ...@@ -2854,6 +2973,40 @@ export default {
}) })
.catch({}); .catch({});
}, },
getDetectTownsList() {
const p = {
addressId: '',
storeId: ''
};
getDetectTowns(p).then((res) => {
if (res.code == "000000") {
const l = res.data;
const disabledItem = this.disabledAreaItem();
l.forEach((m,n) => {
l[n]['value'] = m.provinceId;
l[n]['label'] = m.provinceName;
if(m.cityDtoList) {
m.cityDtoList.forEach((k, j) => {
l[n]['cityDtoList'][j]['value'] = k.cityId;
l[n]['cityDtoList'][j]['label'] = k.cityName;
l[n]['cityDtoList'][j]['provinceName'] = m.provinceName;
if(disabledItem.length > 0){
disabledItem.map(di => {
if(di.cityId == k.cityId){
l[n]['cityDtoList'][j]['disabled'] = true;
}
})
}
})
}
})
console.log('disabledItemdisabledItem', disabledItem);
this.areaAddressList = l;
}
})
},
/* slelect时，获取省市区对应的名称 /* slelect时，获取省市区对应的名称
* vId：省市区id * vId：省市区id
* cId： id对应的key值名称 * cId： id对应的key值名称
...@@ -2871,19 +3024,34 @@ export default { ...@@ -2871,19 +3024,34 @@ export default {
// 确认地址 // 确认地址
warehouseAdressFormSet() { warehouseAdressFormSet() {
const {warehouseAdressForm, warehouseAdressIndex, warehouseAdressFormTitle, warehouseAdressType} = this; const {warehouseAdressForm, warehouseAdressIndex, warehouseAdressFormTitle, warehouseAdressType} = this;
const { repotList } = this.formData; const { repotList, detectionAreaAddressList} = this.formData;
this.$refs['warehouseAdressForm'].validate((valid) => { this.$refs['warehouseAdressForm'].validate((valid) => {
if (valid) { if (valid) {
if(this.isDetection){ // 送检地址 if(this.isDetection == 2){ // 送检地址
this.formData.tradeStoreDetectionAddress = JSON.parse(JSON.stringify(warehouseAdressForm)) this.formData.tradeStoreDetectionAddress = JSON.parse(JSON.stringify(warehouseAdressForm))
this.formData.tradeStoreDetectionAddress.address = this.formData.tradeStoreDetectionAddress.addr this.formData.tradeStoreDetectionAddress.address = this.formData.tradeStoreDetectionAddress.addr
} else { // 仓库地址 } else if(this.isDetection == 1){ // 仓库地址
if (warehouseAdressType) { if (warehouseAdressType) {
repotList[warehouseAdressIndex] = JSON.parse(JSON.stringify(warehouseAdressForm)); repotList[warehouseAdressIndex] = JSON.parse(JSON.stringify(warehouseAdressForm));
} else { } else {
warehouseAdressForm.key = repotList.length + Math.round(Math.random()*1000); warehouseAdressForm.key = repotList.length + Math.round(Math.random()*1000);
repotList.push(JSON.parse(JSON.stringify(warehouseAdressForm))); repotList.push(JSON.parse(JSON.stringify(warehouseAdressForm)));
} }
}else if(this.isDetection == 3) {
if(this.isAreaAddress) {
const nodesInfo = this.$refs['cascader'].getCheckedNodes();
warehouseAdressForm['areaList'] = nodesInfo && nodesInfo.map(i => {return i&&i.data}).filter(j => {return j.cityId});
console.log('-nodesInfo', warehouseAdressForm);
if (warehouseAdressType) {
detectionAreaAddressList[warehouseAdressIndex] = JSON.parse(JSON.stringify(warehouseAdressForm));
} else {
warehouseAdressForm.key = detectionAreaAddressList.length + Math.round(Math.random()*1000);
detectionAreaAddressList.push(JSON.parse(JSON.stringify(warehouseAdressForm)));
}
console.log('---',this.formData.detectionAreaAddressList);
}
} }
this.$message({ this.$message({
...@@ -2904,14 +3072,12 @@ export default { ...@@ -2904,14 +3072,12 @@ export default {
// 格式化地址 // 格式化地址
setAddress(arg) { setAddress(arg) {
let townName = arg.townName || ''; let townName = arg.townName || '';
console.log(arg,arg.addr, arg.address);
return arg.provinceName + arg.cityName + arg.countyName + townName + (arg.addr || arg.address); return arg.provinceName + arg.cityName + arg.countyName + townName + (arg.addr || arg.address);
}, },
// 获取退货物流 // 获取退货物流
getCompanyList() { getCompanyList() {
getLgCompanyList() getLgCompanyList()
.then(({ code, data, message }) => { .then(({ code, data, message }) => {
console.log(data);
if (code == '000000') { if (code == '000000') {
this.cpmList = data; this.cpmList = data;
} else { } else {
...@@ -2964,10 +3130,7 @@ export default { ...@@ -2964,10 +3130,7 @@ export default {
vm.$router.push({ path: "create-shop", query: s}); vm.$router.push({ path: "create-shop", query: s});
}, },
resetCertType() { resetCertType() {
console.log('this.formData.certifyReq.certType == 1');
console.log(this.formData.certifyReq.certType == 1);
if(this.formData.certifyReq.certType == 1) { if(this.formData.certifyReq.certType == 1) {
console.log('papsdpapspd');
this.formData.imgUrlC4 = ''; this.formData.imgUrlC4 = '';
this.formData.imgUrlC5 = ''; this.formData.imgUrlC5 = '';
this.formData.certifyReq.assignorCertBackUrl = ''; this.formData.certifyReq.assignorCertBackUrl = '';
...@@ -3012,7 +3175,6 @@ export default { ...@@ -3012,7 +3175,6 @@ export default {
} }
return option; return option;
}, },
OCRStore () {},
// 企业执照OCR上传后的回调处理 // 企业执照OCR上传后的回调处理
licenseFileHandle(file) { licenseFileHandle(file) {
OCRStore(file).then((res) => { OCRStore(file).then((res) => {
...@@ -3124,8 +3286,35 @@ export default { ...@@ -3124,8 +3286,35 @@ export default {
vm.formData.certifyReq.certifyValidDtoList = []; vm.formData.certifyReq.certifyValidDtoList = [];
vm.formData.certifyReq.bizScope = []; vm.formData.certifyReq.bizScope = [];
} }
console.log('--vm.formData', vm.formData); },
} areaContentPop(array) {
let res = {}
array.map(item => {
res[item.provinceId] = res[item.provinceId] || [];
res[item.provinceId].push(item);
})
let str = '';
Object.keys(res).forEach( i => {
let pri = res[i][0].provinceName + ':';
res[i].forEach( k => {
pri = pri + " " + k.cityName;
})
str = pri + ' / ' + str;
});
str = str.substr(0, str.length - 2)
return str;
},
addrChange() {
this.warehouseAdressForm.address = this.warehouseAdressForm.addr;
},
disabledAreaItem() {
// const al = deepCopy(this.areaAddressList); // 下拉列表
const dl = [].concat(...deepCopy(this.formData.detectionAreaAddressList).map( i => {return i.areaList})); // 所有的
const cl = deepCopy(this.warehouseAdressForm.areaAddressValue) || []; // 当前选中
return dl.filter( i => {
return !cl.includes(i.cityId);
});
},
}, },
filters: { filters: {
storeStatusFormat(v) { storeStatusFormat(v) {
...@@ -3297,19 +3486,15 @@ export default { ...@@ -3297,19 +3486,15 @@ export default {
font-size: 13px; font-size: 13px;
color: #8c8c8c; color: #8c8c8c;
} }
.warehouseAdress-add { .warehouseAdress-list,.detectionAddress-wrap {
color: #FFFFFF;
border-color: #449284;
}
.warehouseAdress-list,.detectionAddress {
display: block; display: block;
margin-top: 20px; margin-top: 20px;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
padding: 10px; padding: 10px;
border-radius: 4px; border-radius: 4px;
height: 114px; min-height: 114px;
width: 900px; width: 900px;
overflow-y: scroll; //overflow-y: scroll;
&::-webkit-scrollbar { &::-webkit-scrollbar {
height: 2px; height: 2px;
width: 4px; width: 4px;
...@@ -3323,6 +3508,14 @@ export default { ...@@ -3323,6 +3508,14 @@ export default {
&:last-of-type { &:last-of-type {
margin-bottom: 0; margin-bottom: 0;
} }
&>span:first-child{
flex: 1;
}
&>span:first-child:hover{
.warehouseAdress-msg{
color:#0C8D76;
}
}
} }
.el-radio__label { .el-radio__label {
display: flex; display: flex;
...@@ -3335,6 +3528,11 @@ export default { ...@@ -3335,6 +3528,11 @@ export default {
.warehouseAdress-msg { .warehouseAdress-msg {
color: #606266; color: #606266;
margin: 0 10px; margin: 0 10px;
white-space: nowrap;
max-width: 500px;
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
} }
.warehouseAdress-do { .warehouseAdress-do {
position: sticky; position: sticky;
...@@ -3352,11 +3550,34 @@ export default { ...@@ -3352,11 +3550,34 @@ export default {
} }
} }
} }
.detectionAddress{ .detectionAddress-wrap{
padding: 0; padding: 0;
height: 50px; height: auto;
line-height: 50px; .detectionAddress-title{
overflow-y: hidden; display: flex;
justify-content: space-between;
align-items: center;
padding: 20px;
.bold{
font-weight: 600;
color: #303133;
font-size: 14px;
}
}
.dt-border-top{
border-top: 1px solid #DCDFE6;
}
}
.border-none{
border: none;
margin-top: 0;
.el-checkbox__inner{
top: 3px;
}
.el-checkbox__label{
flex: 1;
display: flex;
}
} }
} }
.warehouseAdress-input { .warehouseAdress-input {
...@@ -3412,5 +3633,27 @@ export default { ...@@ -3412,5 +3633,27 @@ export default {
color: #f56c6c; color: #f56c6c;
margin-right: 4px; margin-right: 4px;
} }
.el-checkbox__input.is-checked .el-checkbox__inner{
background-color: #449284 !important;
border-color: #449284 !important;
}
.area-title{
font-weight: 500;
color: #303133;
font-size: 14px;
padding-bottom: 20px;
}
}
.el-popover{
padding: 5px;
background: rgba(0,0,0,0.8);
box-shadow: 0px 3px 14px 0px rgba(0,0,0,0.2);
border-radius: 4px;
font-size: 12px;
font-weight: 600;
color: #FFFFFF;
min-width: auto;
max-width: 1000px;
word-break: break-all;
} }
</style> </style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或