Skip to content

M
mallapp
Commit 91da7301 authored by Mac's avatar Mac
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents 64b37c7d b42d4f31
Show whitespace changes
Inline Side-by-side
Showing with 181 additions and 111 deletions
pages/kotra/carrierInformation.vue
View file @ 91da7301
...@@ -64,22 +64,9 @@ ...@@ -64,22 +64,9 @@
<template> <template>
<view class="carrierInformationfrom"> <view class="carrierInformationfrom">
<view class="bottom-border"> <!-- <view class="bottom-border" v-if="datas.CompanyStatus == -1">
<view class="label-text"
>载体名称 <span style="color: #e54d42">*</span></view
>
<input
type="text"
v-model="model.CarrierName"
style="padding: 10px 0"
placeholder="请填写载体名称"
:disabled="disabled || disabled2 ? true : false"
placeholder-style="color:#CECECE;"
/>
</view>
<view class="bottom-border" v-if="datas.CompanyStatus == -1">
<view class="label-text" <view class="label-text"
>关联载体<span style="color: #e54d42">*</span></view >关联载体</view
> >
<view <view
class="bottom-border_r" class="bottom-border_r"
...@@ -96,9 +83,25 @@ ...@@ -96,9 +83,25 @@
/> />
<u-icon name="arrow" color="#A5A4AC" size="30"></u-icon> <u-icon name="arrow" color="#A5A4AC" size="30"></u-icon>
</view> </view>
</view> -->
<view class="bottom-border">
<view class="label-text"
>载体名称 <span style="color: #e54d42">*</span></view
>
<input
type="text"
v-model="model.CarrierName"
style="padding: 10px 0"
placeholder="请填写载体名称"
:disabled="disabled || disabled2 ? true : false"
placeholder-style="color:#CECECE;"
/>
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">开发商</view> <view class="label-text"
>开发商<span style="color: #e54d42">*</span></view
>
<input <input
type="text" type="text"
v-model="model.Developers" v-model="model.Developers"
...@@ -109,7 +112,9 @@ ...@@ -109,7 +112,9 @@
/> />
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">项目地址</view> <view class="label-text"
>项目地址<span style="color: #e54d42">*</span></view
>
<view <view
class="bottom-border_r" class="bottom-border_r"
style="padding: 10px 0; height: 42px; display: flex" style="padding: 10px 0; height: 42px; display: flex"
...@@ -136,77 +141,11 @@ ...@@ -136,77 +141,11 @@
<u-icon name="arrow" color="#A5A4AC" size="30"></u-icon> <u-icon name="arrow" color="#A5A4AC" size="30"></u-icon>
</view> </view>
</view> </view>
<view class="bottom-border">
<view class="label-text">
<view style="display: flex">
首店类别/数量
<u-icon
name="plus"
color="#A5A4AC"
size="28"
style="margin-left: 20rpx"
@click="addFirstShop"
></u-icon
></view>
</view>
<view
style="
display: flex;
align-items: center;
justify-content: space-between;
"
v-for="(item, index) in model.FirstShopNumList"
:key="index"
>
<view style="width: 50%">
<picker
@change="clickFirstShop($event, index)"
v-model="item.Id"
range-key="Name"
:range="shenList"
>
<view
style="
display: flex;
align-items: center;
justify-content: space-between;
"
>
<text v-if="item.Name != ''">{{ item.Name }}</text>
<text style="color: #cecece" v-else>请选择首店类型</text>
<u-icon name="arrow" color="#A5A4AC" size="28"></u-icon
></view>
</picker>
</view>
<view
style="
width: 40%;
display: flex;
align-items: center;
justify-content: space-between;
"
>
<input
type="number"
v-model="item.Num"
:disabled="disabled"
style="padding: 10px 0"
placeholder="请填写首店数量"
placeholder-style="color:#CECECE;"
/>
<u-icon
name="close"
color="#A5A4AC"
size="28"
style="margin-left: 20rpx"
@click="delFirstShop(index)"
></u-icon>
</view>
</view>
</view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">去年业绩</view> <view class="label-text"
>去年业绩<span style="color: #e54d42">*</span></view
>
<view <view
style=" style="
display: flex; display: flex;
...@@ -281,7 +220,9 @@ ...@@ -281,7 +220,9 @@
</view> </view>
</view> --> </view> -->
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">店铺数量</view> <view class="label-text"
>店铺数量<span style="color: #e54d42">*</span></view
>
<input <input
type="number" type="number"
v-model="model.ShopNum" v-model="model.ShopNum"
...@@ -292,7 +233,9 @@ ...@@ -292,7 +233,9 @@
/> />
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">经营面积(m²)</view> <view class="label-text"
>经营面积(m²)<span style="color: #e54d42">*</span></view
>
<view <view
class="bottom-border_r" class="bottom-border_r"
style="padding: 10px 0; height: 42px; display: flex" style="padding: 10px 0; height: 42px; display: flex"
...@@ -317,7 +260,9 @@ ...@@ -317,7 +260,9 @@
</view> </view>
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">可租赁面积(m²)</view> <view class="label-text"
>可租赁面积(m²)<span style="color: #e54d42">*</span></view
>
<view <view
class="bottom-border_r" class="bottom-border_r"
style="padding: 10px 0; height: 42px; display: flex" style="padding: 10px 0; height: 42px; display: flex"
...@@ -343,7 +288,7 @@ ...@@ -343,7 +288,7 @@
</view> </view>
<view class="label-text" style="margin-top: 20px; margin-bottom: 30rpx"> <view class="label-text" style="margin-top: 20px; margin-bottom: 30rpx">
<text>Logo</text> <view>Logo<span style="color: #e54d42">*</span></view>
</view> </view>
<view @click="disabled ? '' : uploadcard()"> <view @click="disabled ? '' : uploadcard()">
<view slot="addBtn" class="slot-btn" v-if="model.Logo == ''"> <view slot="addBtn" class="slot-btn" v-if="model.Logo == ''">
...@@ -362,11 +307,13 @@ ...@@ -362,11 +307,13 @@
</view> </view>
</view> </view>
<view class="label-text" style="margin-top: 20px; margin-bottom: 30rpx"> <view class="label-text" style="margin-top: 20px; margin-bottom: 30rpx">
<text>介绍图</text> <view style="display: flex">
<view>介绍图<span style="color: #e54d42">*</span></view>
<text style="color: #999; font-weight: 400" <text style="color: #999; font-weight: 400"
>（最多9张,第一张为封面图）</text >（最多9张,第一张为封面图）</text
> >
</view> </view>
</view>
<view> <view>
<u-upload <u-upload
:action="action" :action="action"
...@@ -471,7 +418,9 @@ ...@@ -471,7 +418,9 @@
</u-upload> </u-upload>
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">开业时间</view> <view class="label-text"
>开业时间<span style="color: #e54d42">*</span></view
>
<input <input
type="text" type="text"
@click="disabled ? '' : (showOpenTime = true)" @click="disabled ? '' : (showOpenTime = true)"
...@@ -489,7 +438,9 @@ ...@@ -489,7 +438,9 @@
></u-picker> ></u-picker>
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">项目类型</view> <view class="label-text"
>项目类型<span style="color: #e54d42">*</span></view
>
<view class="con6" style="margin-top: 20px"> <view class="con6" style="margin-top: 20px">
<u-radio-group v-model="model.ProjectType"> <u-radio-group v-model="model.ProjectType">
<u-radio <u-radio
...@@ -509,7 +460,9 @@ ...@@ -509,7 +460,9 @@
</view> </view>
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">商业体量</view> <view class="label-text"
>商业体量<span style="color: #e54d42">*</span></view
>
<view <view
class="bottom-border_r" class="bottom-border_r"
style="padding: 10px 0; height: 42px; display: flex" style="padding: 10px 0; height: 42px; display: flex"
...@@ -525,6 +478,77 @@ ...@@ -525,6 +478,77 @@
<span>万平方米</span> <span>万平方米</span>
</view> </view>
</view> </view>
<view class="bottom-border">
<view class="label-text">
<view style="display: flex">
首店类别/数量
<!-- <u-icon
name="plus"
color="#A5A4AC"
size="28"
style="margin-left: 20rpx"
@click="addFirstShop"
></u-icon
> -->
</view>
</view>
<view
style="
display: flex;
align-items: center;
justify-content: space-between;
"
v-for="(item, index) in model.FirstShopNumList"
:key="index"
>
<view style="width: 50%">
<picker
@change="clickFirstShop($event, index)"
v-model="item.Id"
range-key="Name"
:range="shenList"
disabled
>
<view
style="
display: flex;
align-items: center;
justify-content: space-between;
"
>
<text v-if="item.Name != ''">{{ item.Name }}</text>
<text style="color: #cecece" v-else>请选择首店类型</text>
<u-icon name="arrow" color="#A5A4AC" size="28"></u-icon
></view>
</picker>
</view>
<view
style="
width: 40%;
display: flex;
align-items: center;
justify-content: space-between;
"
>
<input
type="number"
v-model="item.Num"
:disabled="disabled"
style="padding: 10px 0"
placeholder="请填写首店数量"
placeholder-style="color:#CECECE;"
/>
<!-- <u-icon
name="close"
color="#A5A4AC"
size="28"
style="margin-left: 20rpx"
@click="delFirstShop(index)"
></u-icon> -->
</view>
</view>
</view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">商业层数</view> <view class="label-text">商业层数</view>
<input <input
...@@ -675,7 +699,7 @@ ...@@ -675,7 +699,7 @@
v-model="model.StartingInfo" v-model="model.StartingInfo"
:disabled="disabled" :disabled="disabled"
style="padding: 10px 0" style="padding: 10px 0"
placeholder="请填写首发政策" placeholder="请填写首发首秀首展政策"
placeholder-style="color:#CECECE;" placeholder-style="color:#CECECE;"
/> />
</view> </view>
...@@ -761,21 +785,21 @@ export default { ...@@ -761,21 +785,21 @@ export default {
CarrierMetroList: [], //地铁信息 CarrierMetroList: [], //地铁信息
FirstShopNumList: [ FirstShopNumList: [
//载体类型、数量 //载体类型、数量
{ // {
Id: 0, // Id: 0,
Name: "", // Name: "",
Num: 0, // Num: 0,
}, // },
], ],
HonorList: [], //载体荣誉 HonorList: [], //载体荣誉
Discount: "", //招引优惠政策 Discount: "", //招引优惠政策
StartingInfo: "", //首发政策 StartingInfo: "", //首发政策
FirstShow: "", //首秀政策 FirstShow: "", //首秀政策
FirstExhibition: "", //首展政策 FirstExhibition: "", //首展政策
ShopNum: "", //店铺数量 ShopNum: 0, //店铺数量
BuiltUpArea: "", //经营面积 BuiltUpArea: 0, //经营面积
AreaRequirement: "", //可租赁面积 AreaRequirement: 0, //可租赁面积
YeJi: "", //去年业绩 YeJi: 0, //去年业绩
}, },
showOpenTime: false, showOpenTime: false,
goodsType: [], //载体类型 goodsType: [], //载体类型
...@@ -902,6 +926,7 @@ export default { ...@@ -902,6 +926,7 @@ export default {
this.disabled2 = true; this.disabled2 = true;
this.glCarrierName = this.model.CarrierName; this.glCarrierName = this.model.CarrierName;
} }
} else {
} }
}, },
methods: { methods: {
...@@ -1178,6 +1203,10 @@ export default { ...@@ -1178,6 +1203,10 @@ export default {
uni.showToast({ title: "请输入开发商", icon: "none" }); uni.showToast({ title: "请输入开发商", icon: "none" });
return; return;
} }
if (this.model.Address == "") {
uni.showToast({ title: "请输入项目地址", icon: "none" });
return;
}
if (this.model.ProjectType == 0) { if (this.model.ProjectType == 0) {
uni.showToast({ title: "请选择项目类型", icon: "none" }); uni.showToast({ title: "请选择项目类型", icon: "none" });
return; return;
...@@ -1193,6 +1222,25 @@ export default { ...@@ -1193,6 +1222,25 @@ export default {
uni.showToast({ title: "请输入开业时间", icon: "none" }); uni.showToast({ title: "请输入开业时间", icon: "none" });
return; return;
} }
if (this.model.ShopNum == "" || this.model.ShopNum === 0) {
uni.showToast({ title: "请输入店铺数量", icon: "none" });
return;
}
if (this.model.BuiltUpArea == "" || this.model.BuiltUpArea === 0) {
uni.showToast({ title: "请输入经营面积", icon: "none" });
return;
}
if (
this.model.AreaRequirement == "" ||
this.model.AreaRequirement === 0
) {
uni.showToast({ title: "请输入可租赁面积", icon: "none" });
return;
}
if (this.model.YeJi == "" || this.model.YeJi === 0) {
uni.showToast({ title: "请输入去年业绩", icon: "none" });
return;
}
console.log(this.model, "保存"); console.log(this.model, "保存");
uni.showLoading({ uni.showLoading({
title: "提交中...", title: "提交中...",
...@@ -1231,6 +1279,28 @@ export default { ...@@ -1231,6 +1279,28 @@ export default {
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.shenList = res.data; this.shenList = res.data;
if (this.model.FirstShopNumList.length === 0) {
this.shenList.map((item) => {
let obj = {
Id: item.Id,
Name: item.Name,
Num: 0,
};
this.model.FirstShopNumList.push(obj);
});
}
// else if (this.model.FirstShopNumList.length > 0) {
// this.shenList.map((item) => {
// let obj = {
// Id: item.Id,
// Name: item.Name,
// Num: 0,
// };
// this.mdel.FirstShopNumList.push(obj);
// });
// }
if (this.isdisabled == true) { if (this.isdisabled == true) {
this.shenList.map((x) => { this.shenList.map((x) => {
if (x.Id == this.model.Category) { if (x.Id == this.model.Category) {
......
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