|
@@ -677,6 +677,12 @@ export default class extends Vue {
|
|
|
}
|
|
}
|
|
|
this.ColorCard = response.Data.F_ColorCard || this.stoneColors[0].value;
|
|
this.ColorCard = response.Data.F_ColorCard || this.stoneColors[0].value;
|
|
|
this.selectedProcess = response.Data.F_DeepGrooveTech || this.deepSlotProcesses[0].value;
|
|
this.selectedProcess = response.Data.F_DeepGrooveTech || this.deepSlotProcesses[0].value;
|
|
|
|
|
+ // 有墙面工艺
|
|
|
|
|
+ if(this.selectedProcess ){
|
|
|
|
|
+ const selectedProcessSelctIndex = this.deepSlotProcesses.findIndex(item => item.value === this.selectedProcess);
|
|
|
|
|
+ // 墙面分割线选项
|
|
|
|
|
+ this.splitWays = this.deepSlotProcesses[selectedProcessSelctIndex].subitems;
|
|
|
|
|
+ }
|
|
|
this.selectedSplit = response.Data.F_DivisionMethod || this.splitWays[0].value;
|
|
this.selectedSplit = response.Data.F_DivisionMethod || this.splitWays[0].value;
|
|
|
this.selectedWindowFrame = response.Data.F_WindowsColor || this.windowFrames[0].value;
|
|
this.selectedWindowFrame = response.Data.F_WindowsColor || this.windowFrames[0].value;
|
|
|
this.selectedRailing = response.Data.F_CastRailing || this.railings[0].value;
|
|
this.selectedRailing = response.Data.F_CastRailing || this.railings[0].value;
|
|
@@ -806,10 +812,9 @@ export default class extends Vue {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private selectProcess(value: string, refsName: string, selcIndex: number) {
|
|
private selectProcess(value: string, refsName: string, selcIndex: number) {
|
|
|
- // if (this.selectedSplit == '平涂' && value != '无') {
|
|
|
|
|
- // this.selectedSplit = '双横线';
|
|
|
|
|
- // }
|
|
|
|
|
this.selectedProcess = value;
|
|
this.selectedProcess = value;
|
|
|
|
|
+ this.splitWays = this.deepSlotProcesses[selcIndex].subitems;
|
|
|
|
|
+ this.selectedSplit = this.splitWays[0].value;
|
|
|
this.autoScrollToActive(refsName, selcIndex); // 选中后触发自动滚动
|
|
this.autoScrollToActive(refsName, selcIndex); // 选中后触发自动滚动
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -903,6 +908,11 @@ export default class extends Vue {
|
|
|
// const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
|
|
// const userInfo: any = JSON.parse(window.localStorage.getItem("userInfoV1")!);
|
|
|
const formData = new FormData();
|
|
const formData = new FormData();
|
|
|
if (this.activeName === '外墙质感') {
|
|
if (this.activeName === '外墙质感') {
|
|
|
|
|
+ // 如果字典渲染有误,不让提交;墙面工艺、电子色卡都为必填项且没有不需要;
|
|
|
|
|
+ if (!this.selectedProcess || !this.ColorCard) {
|
|
|
|
|
+ this.$toast.fail('数据有误,请重试');
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
// 用户选择的选项
|
|
// 用户选择的选项
|
|
|
const uDesignStyle = this.DesignStyle === '无' ? '' : this.DesignStyle;
|
|
const uDesignStyle = this.DesignStyle === '无' ? '' : this.DesignStyle;
|
|
|
const uColorCard = this.ColorCard === '无' ? '' : this.ColorCard;
|
|
const uColorCard = this.ColorCard === '无' ? '' : this.ColorCard;
|
|
@@ -924,6 +934,11 @@ export default class extends Vue {
|
|
|
formData.append('skirtType', uSkirtType);//墙裙
|
|
formData.append('skirtType', uSkirtType);//墙裙
|
|
|
|
|
|
|
|
} else if (this.activeName === '外墙平涂') {
|
|
} else if (this.activeName === '外墙平涂') {
|
|
|
|
|
+ // 如果字典渲染有误,不让提交;
|
|
|
|
|
+ if (!this.color_selValue) {
|
|
|
|
|
+ this.$toast.fail('数据有误,请重试');
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
formData.append('DesignStyle', "CHANGE_COLOR");
|
|
formData.append('DesignStyle', "CHANGE_COLOR");
|
|
|
formData.append('Color', this.color_selValue)
|
|
formData.append('Color', this.color_selValue)
|
|
|
}
|
|
}
|
|
@@ -945,7 +960,7 @@ export default class extends Vue {
|
|
|
// formData.append('projectid', this.checkedProject.projectid);
|
|
// formData.append('projectid', this.checkedProject.projectid);
|
|
|
// }
|
|
// }
|
|
|
// 企微类型
|
|
// 企微类型
|
|
|
- formData.append('wecomType', 5);
|
|
|
|
|
|
|
+ // formData.append('wecomType', 5);
|
|
|
// // 服务商代码
|
|
// // 服务商代码
|
|
|
// if (serviceCodeArray.length > 0) {
|
|
// if (serviceCodeArray.length > 0) {
|
|
|
// formData.append('serivceCode', serviceCodeArray.join(','));
|
|
// formData.append('serivceCode', serviceCodeArray.join(','));
|
|
@@ -1105,7 +1120,7 @@ export default class extends Vue {
|
|
|
// formData.append('roleIds', roleIdArray.join(','));
|
|
// formData.append('roleIds', roleIdArray.join(','));
|
|
|
// formData.append('WXuserid', userInfo.loginName);
|
|
// formData.append('WXuserid', userInfo.loginName);
|
|
|
formData.append('baseType', 0);
|
|
formData.append('baseType', 0);
|
|
|
- formData.append('wecomType', 5);
|
|
|
|
|
|
|
+ // formData.append('wecomType', this.wecomType);
|
|
|
// const isRefresh = userInfo.isRefreshProvider === '是' ? 1 : 0;//0=否 1=是
|
|
// const isRefresh = userInfo.isRefreshProvider === '是' ? 1 : 0;//0=否 1=是
|
|
|
// formData.append('isRefresh', isRefresh);
|
|
// formData.append('isRefresh', isRefresh);
|
|
|
GetDictList(formData).then(response => {
|
|
GetDictList(formData).then(response => {
|
|
@@ -1119,8 +1134,10 @@ export default class extends Vue {
|
|
|
this.stoneColors = response.Data.dict.ColorCard;
|
|
this.stoneColors = response.Data.dict.ColorCard;
|
|
|
// 墙面工艺选项
|
|
// 墙面工艺选项
|
|
|
this.deepSlotProcesses = response.Data.dict.DeepGrooveTech;
|
|
this.deepSlotProcesses = response.Data.dict.DeepGrooveTech;
|
|
|
- // 墙面分割线选项
|
|
|
|
|
- this.splitWays = response.Data.dict.DivisionMethod;
|
|
|
|
|
|
|
+ if(this.deepSlotProcesses && this.deepSlotProcesses.length > 0){
|
|
|
|
|
+ // 墙面分割线选项
|
|
|
|
|
+ this.splitWays = this.deepSlotProcesses[0].subitems;
|
|
|
|
|
+ }
|
|
|
// 窗套样式选项
|
|
// 窗套样式选项
|
|
|
this.windowFrames = response.Data.dict.WindowsColor;
|
|
this.windowFrames = response.Data.dict.WindowsColor;
|
|
|
// 浇筑栏杆选项
|
|
// 浇筑栏杆选项
|
|
@@ -1191,7 +1208,6 @@ export default class extends Vue {
|
|
|
that.projectActionListShow = false;
|
|
that.projectActionListShow = false;
|
|
|
// }
|
|
// }
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
</script>
|
|
</script>
|
|
|
<style>
|
|
<style>
|