Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/views/audit/saleOrder/components/settingConfig.vue

@@ -1,12 +1,15 @@
 <template>
 	<!-- 配置弹窗 -->
-	<vxe-modal v-model="setValue" width="60%" height="auto" show-zoom resize transfer show-footer>
+	<vxe-modal v-model="setValue" width="70%" :height="type=='setCForm'?'100%':'auto'" show-zoom resize transfer show-footer>
 		<template #title>
 			<span>{{title}}参数配置</span>
 		</template>
 		<template #default>
 			<by-form v-if="type=='setXForm'" key="setXForm" :propConfig="setXForm" ref="setXForm"></by-form>
+			<div v-if="type=='setCForm'" style="font-size: 22px;font-weight: 400;color: #1f2f3d;margin: 25px;">销售参数配置</div>
 			<by-form v-if="type=='setCForm'" key="setCForm" :propConfig="setCForm" ref="setCForm"></by-form>
+			<div v-if="type=='setCForm'" style="font-size: 22px;font-weight: 400;color: #1f2f3d;margin: 25px;">调拨参数配置</div>
+			<by-form v-if="type=='setCForm'" key="setCForms" :propConfig="setCForms" ref="setCForms"></by-form>
 		</template>
 		<template #footer>
 			<div class="btn">
@@ -261,6 +264,7 @@
 		setCForm : any = {
 			attr: {
 				size: 'medium',
+				labelWidth: '140px'
 			},
 			columns: [
 				[
@@ -471,6 +475,377 @@
 				]
 			]
 		}
+		setCForms : any = {
+			attr: {
+				size: 'medium',
+				labelWidth: '140px'
+			},
+			columns: [
+				[
+					{
+						span: 8,
+						label: '单据类型',
+						prop: 'FBillTypeID',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入单据类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入单据类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '业务类型',
+						prop: 'FBizType',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入业务类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入业务类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调拨方向',
+						prop: 'FTransferDirect',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调拨方向', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调拨方向',
+								clearable: true
+							}
+						}
+					},
+				],
+				[
+					{
+						span: 8,
+						label: '调拨类型',
+						prop: 'FTransferBizType',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调拨类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调拨类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调出货主类型',
+						prop: 'FOwnerTypeOutIdHead',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调出货主类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调出货主类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调出货主',
+						prop: 'FOwnerOutIdHead',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调出货主', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调出货主',
+								clearable: true
+							}
+						}
+					},
+				],
+				[
+					{
+						span: 8,
+						label: '汇率类型',
+						prop: 'FExchangeTypeId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入汇率类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入汇率类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调入货主类型',
+						prop: 'FOwnerTypeIdHead',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调入货主类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调入货主类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '结算币别',
+						prop: 'FSETTLECURRID',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入结算币别', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入结算币别',
+								clearable: true
+							}
+						}
+					},
+				],
+				[
+					{
+						span: 8,
+						label: '汇率',
+						prop: 'FExchangeRate',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入汇率', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入汇率',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调入货主',
+						prop: 'FOwnerIdHead',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调入货主', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调入货主',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '本位币',
+						prop: 'FBaseCurrId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入本位币', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入本位币',
+								clearable: true
+							}
+						}
+					}
+				],
+				[
+					{
+						span: 8,
+						label: '产品类型',
+						prop: 'FRowType',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入产品类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入产品类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调出库存状态',
+						prop: 'FSrcStockStatusId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调出库存状态', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调出库存状态',
+								clearable: true
+							}
+						}
+							
+					},
+					{
+						span: 8,
+						label: '调入库存状态',
+						prop: 'FDestStockStatusId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调入库存状态', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调入库存状态',
+								clearable: true
+							}
+						}
+							
+					}
+				],
+				[
+					{
+						span: 8,
+						label: '调出货主类型',
+						prop: 'FOwnerTypeOutId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调出货主类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调出货主类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调出货主',
+						prop: 'FOwnerOutId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调出货主', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调出货主',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调入货主类型',
+						prop: 'FOwnerTypeId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调入货主类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调入货主类型',
+								clearable: true
+							}
+						}
+					}
+				],
+				[
+					{
+						span: 8,
+						label: '调入货主',
+						prop: 'FOwnerId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调入货主', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调入货主',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调入保管者类型',
+						prop: 'FKeeperTypeId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调入保管者类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调入保管者类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调入保管者',
+						prop: 'FKeeperId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调入保管者', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调入保管者',
+								clearable: true
+							}
+						}
+					}
+				],
+				[
+					{
+						span: 8,
+						label: '调出保管者类型',
+						prop: 'FKeeperTypeOutId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调出保管者类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调出保管者类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '调出保管者',
+						prop: 'FKeeperOutId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入调出保管者', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入调出保管者',
+								clearable: true
+							}
+						}
+					}
+				]
+			]
+		}
 		// 打开弹窗
 		openSetting() {
 			this.setValue = true;
@@ -490,6 +865,9 @@
 							if (res.data.outorderSetting && res.data.outorderSetting.indexOf(this.getDepId) != -1) {
 								(this as any).$refs.setCForm.setValue(JSON.parse(res.data.outorderSetting)[this.getDepId]);
 							}
+							if (res.data.transferdirectSetting && res.data.transferdirectSetting.indexOf(this.getDepId) != -1) {
+								(this as any).$refs.setCForms.setValue(JSON.parse(res.data.transferdirectSetting)[this.getDepId]);
+							}
 						}, 0)
 					}
 				}
@@ -534,29 +912,49 @@
 			}
 			if (this.type == "setCForm") {
 				(this as any).$refs.setCForm.validate().then(() => {
-					value = (this as any).$refs.setCForm.getValue();
-					if (this.baseInfo.outorderSetting) {
-						let obj : any = JSON.parse(this.baseInfo.outorderSetting);
-						if (obj[this.getDepId]) {
-							obj[this.getDepId] = value
+					(this as any).$refs.setCForms.validate().then(() => {
+						
+						value = (this as any).$refs.setCForm.getValue();
+						if (this.baseInfo.outorderSetting) {
+							let obj : any = JSON.parse(this.baseInfo.outorderSetting);
+							if (obj[this.getDepId]) {
+								obj[this.getDepId] = value
+							} else {
+								if (this.getDepId == "kingdee") {
+									obj.kingdee = value
+								} else obj.yonbip = value
+							}
+							data.outorderSetting = JSON.stringify(obj);
 						} else {
-							if (this.getDepId == "kingdee") {
-								obj.kingdee = value
-							} else obj.yonbip = value
+							data.outorderSetting = JSON.stringify({ [this.getDepId]: value })
 						}
-						data.outorderSetting = JSON.stringify(obj);
-					} else {
-						data.outorderSetting = JSON.stringify({ [this.getDepId]: value })
-					}
-					if (this.baseInfo) data.id = this.baseInfo.id;
-					let loading = this.$loading({ target: '.main-container' });
-					api.updateList(data, 'supplyFinanceSetting').then((res : any) => {
-						if (res.code === 200) {
-							this.setValue = false;
-							loading.close();
-							this.$message.success("保存成功");
-						} else loading.close();
-					}).catch(() => loading.close());
+						
+						value = (this as any).$refs.setCForms.getValue();
+						if (this.baseInfo.transferdirectSetting) {
+							let obj : any = JSON.parse(this.baseInfo.transferdirectSetting);
+							if (obj[this.getDepId]) {
+								obj[this.getDepId] = value
+							} else {
+								if (this.getDepId == "kingdee") {
+									obj.kingdee = value
+								} else obj.yonbip = value
+							}
+							data.transferdirectSetting = JSON.stringify(obj);
+						} else {
+							data.transferdirectSetting = JSON.stringify({ [this.getDepId]: value })
+						}
+						
+						if (this.baseInfo) data.id = this.baseInfo.id;
+						let loading = this.$loading({ target: '.main-container' });
+						api.updateList(data, 'supplyFinanceSetting').then((res : any) => {
+							if (res.code === 200) {
+								this.setValue = false;
+								loading.close();
+								this.$message.success("保存成功");
+							} else loading.close();
+						}).catch(() => loading.close());
+						
+					})
 					
 				})
 			}