AlanWong 1 anno fa
parent
commit
940720a34f

+ 2 - 1
src/store/modules/settings.ts

@@ -12,7 +12,8 @@ const state = {
   tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
   fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
   sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
-  dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle
+  dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle,
+	depId: 'kingdee'
 }
 const mutations = {
   CHANGE_SETTING: (state:any, { key, value }:any) => {

+ 22 - 9
src/views/audit/attribute/index.vue

@@ -22,25 +22,25 @@
 									@close="handleClose(tag,index)">
 									{{tag}}
 								</el-tag>
-								<by-input class="input-new-tag fl" :ref="'getValue_'+index" maxlength="20"></by-input>
-								<el-button class="button-new-tag fl" @click="showInput(index)">添加</el-button>
+								<by-input style="width: 150px;" class="fl" :ref="'getValue_'+index" maxlength="20"></by-input>
+								<el-button class="fl" @click="showInput(index)">添加</el-button>
 							</div>
 						</div>
 					</div>
 					<div style="display: flex;">
 						<div style="margin-right: 20px;">
 							<label>规格:</label>
-							<div class="el-input el-input--small" style="width: 250px;">
+							<div class="el-input el-input--small" style="width: calc(100% - 56px);">
 								<input type="text" v-model="norms" placeholder="请输入规格" class="el-input__inner" maxlength="20">
 							</div>
 						</div>
 						<div style="margin-right: 20px;">
 							<label>规格值:</label>
-							<div class="el-input el-input--small" style="width: 250px;">
+							<div class="el-input el-input--small" style="width: calc(100% - 56px);">
 								<input type="text" v-model="normsValue" placeholder="请输入规格值" class="el-input__inner" maxlength="20">
 							</div>
 						</div>
-						<div @click="doComfirm" class="el-button el-button--primary el-button--small">确定</div>
+						<div @click="doComfirm" style="height: 32px;" class="el-button el-button--primary el-button--small">确定</div>
 					</div>
 				</template>
 			</by-form>
@@ -72,8 +72,8 @@
 		dialogFormVisible : boolean = false
 		tableConfig : any = []
 		config : any = {
-			attr:{
-				calculateH:true
+			attr: {
+				calculateH: true
 			},
 			search: {
 				attr: {
@@ -261,7 +261,10 @@
 		showInput(index : any) {
 			let inputValue = (this as any).$refs['getValue_' + index][0].getValue();
 			// console.log(this.tableConfig[index]);
-			if (this.tableConfig[index].list.indexOf(inputValue) !== -1) return (this as any).$refs['getValue_' + index][0].clearValue();
+			if (this.tableConfig[index].list.indexOf(inputValue) !== -1) {
+				this.$message.warning('规格值已重复,请重新输入');
+				return (this as any).$refs['getValue_' + index][0].clearValue()
+			};
 			if (inputValue) {
 				this.tableConfig[index].list.push(inputValue);
 			}
@@ -294,6 +297,9 @@
 			this.normsValue = this.normsValue.trim();
 			this.norms = this.norms.trim();
 			if (!this.normsValue || !this.norms) return (this as any).$message.warning('请添加完整的规格');
+			for (let v of this.tableConfig) {
+				if (v.title == this.norms) return (this as any).$message.warning('规格名不能重复添加');
+			}
 			let obj : any = {
 				title: this.norms,
 				field: this.norms + '_field_name',
@@ -309,9 +315,12 @@
 				if (this.tableConfig.length <= 0) return this.$message.warning('验证未通过,请添加完整的规格');
 				let query = (this as any).$refs.addFormId.getValue();
 				query.status = this.radio;
+				for (let v of this.tableConfig) {
+					if (v.list.length <= 0) return this.$message.warning('规格值不能为空')
+				}
 				query.attributeValue = JSON.stringify(this.tableConfig)
 				this.dialogFormVisible = false;
-				console.log(query);
+				// console.log(query);
 				if (this.popTitle === '新增') {
 					api.saveList(query, 'maindataMaterialAttribute').then((res : any) => {
 						if (res.code === 200) {
@@ -463,6 +472,10 @@
 			}
 		}
 
+		.item-tab {
+			margin-right: 16px;
+		}
+
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;

+ 15 - 1
src/views/audit/outbound/index.vue

@@ -4,6 +4,8 @@
 			@resert="resert" @detail="openEdit" @onSave="onSave" @clickTab="clickTab" @onChangeRow="onChangeRow"
 			@pagination="pagination" @onReturnSmt="onReturnSmt2" @getSupplierModal="getSupplierModal">
 		</by-bill>
+
+		<SettingConfig ref="setForm" type="setCForm" title="出库单" />
 	</div>
 </template>
 
@@ -13,7 +15,8 @@
 	import BusinessType from "./components/businessType.vue";
 	import towInOne from "../warehousing/components/towInOne.vue";
 	import stockLook from "./components/stockLook.vue";
-	@Component
+	import SettingConfig from "../saleOrder/components/settingConfig.vue";
+	@Component({ components: { SettingConfig } })
 	export default class OrderTask extends Vue {
 		// 左边
 		tabType : any = 'all';
@@ -611,6 +614,13 @@
 								}
 							}
 						},
+						{
+							name: '参数配置', icon: 'el-icon-setting', audit: [''], event: {
+								click: () => {
+									(this as any).configuration()
+								}
+							}
+						},
 					]
 				},
 				table: {
@@ -786,6 +796,10 @@
 				this.getDataList()
 			}, 500)
 		}
+		// 参数配置
+		configuration() {
+			(this as any).$refs.setForm.openSetting();
+		}
 		// 引单
 		citationOrder() {
 			let parentData : any = (this as any).$refs.bill.getSourceTableSelectData(0);

+ 14 - 6
src/views/audit/productClassification/index.vue

@@ -131,6 +131,7 @@
 					field: 'name',
 					isDetail: true,
 				}, {
+					width: 300,
 					title: '简称',
 					field: 'shortName'
 				}, {
@@ -140,6 +141,7 @@
 					component: Assembly,
 				},
 				{
+					width: 300,
 					title: '备注',
 					field: 'remark',
 				}, {
@@ -195,7 +197,8 @@
 								defaultExpandAll: true
 							},
 							request: {
-								url: '/maindata/maindataMaterialCategory/treeList'
+								url: '/maindata/maindataMaterialCategory/treeList',
+								method: 'GET'
 							}
 						}
 					},
@@ -246,10 +249,12 @@
 		}
 		//点击树获取数据
 		onChangeTree(e : any) {
-			console.log(e);
 			let data : any = {};
 			e.isContain ? data.ids = e.id : data.parentId = e.id;
-			this.parentIds = e.id;
+			this.parentIds = (this as any).$lodash.cloneDeep(e.id);
+			this.parentIds.shift();
+			data.pageSize = 20;
+			data.pageNo = 1;
 			let loading = this.$loading({ target: '.main-container' });
 			api.childrenTreeList(data, 'maindataMaterialCategory').then((res : any) => {
 				loading.close();
@@ -301,9 +306,9 @@
 			}
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
-			if (this.parentIds) query.parentIds = this.parentIds;
+			if (this.parentIds.length > 0) query.parentIds = this.parentIds;
 			console.log('表单字段 ==> ', query);
-			this.getPageList(query)
+			this.getPageList(query);
 		}
 		getPageList(query : any) {
 			let loading = this.$loading({ target: '.main-container' });
@@ -329,7 +334,10 @@
 			this.popTitle = '新增'
 			this.dialogFormVisible = true;
 			this.radio = 0
-			this.$nextTick(() => (this as any).$refs.addFormId.setValue());
+			setTimeout(() => {
+				(this as any).$refs.addFormId.setValue();
+				(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+			}, 0)
 		}
 		// 打开编辑
 		openEdit(e : any) {

+ 17 - 5
src/views/audit/productManagement/index.vue

@@ -85,13 +85,13 @@
 									<div style="display: flex;margin: 20px 0;" v-else key='item8'>
 										<div class="flex-item">
 											<label>规格:</label>
-											<div class="el-input el-input--small" style="width: 250px;">
+											<div class="el-input el-input--small" style="width: 250px;margin-right: 16px;">
 												<input type="text" v-model="norms" placeholder="请输入规格" class="el-input__inner">
 											</div>
 										</div>
 										<div class="flex-item">
 											<label>规格值:</label>
-											<div class="el-input el-input--small" style="width: 250px;">
+											<div class="el-input el-input--small" style="width: 250px;margin-right: 16px;">
 												<input type="text" v-model="normsValue" placeholder="请输入规格值" class="el-input__inner">
 											</div>
 										</div>
@@ -689,6 +689,7 @@
 							attr: {
 								label: 'name',
 								clearable: true,
+								placeholder: '请选择物料分类',
 								retConfig: {
 									categoryName: 'name',
 									categoryId: 'id'
@@ -715,6 +716,7 @@
 							attr: {
 								label: 'name',
 								clearable: true,
+								placeholder: '请选择虚拟分类',
 								retConfig: {
 									vmCategoryName: 'name',
 									vmCategoryId: 'id'
@@ -736,6 +738,7 @@
 							attr: {
 								label: 'name',
 								clearable: true,
+								placeholder: '请选择机构商品分类',
 								retConfig: {
 									organizationCategoryName: 'name',
 									organizationCategoryId: 'id'
@@ -986,7 +989,11 @@
 		onChangeTree(e : any) {
 			this.categoryIds = e.id;
 			let loading = this.$loading({ target: '.main-container' });
-			api.byCategoryPage({ categoryId: e.id }, 'maindataMaterialCategory').then((res : any) => {
+			api.byCategoryPage({
+				categoryId: e.id,
+				pageSize: 20,
+				pageNo: 1,
+			}, 'maindataMaterialCategory').then((res : any) => {
 				loading.close();
 				if (res.code === 200) {
 					(this.$refs.moduleView as any).setTableValue(res.data.records);
@@ -1229,8 +1236,10 @@
 							loading.close()
 						}).catch(() => loading.close());
 					}).catch(() => loading.close());
+				} else {
+					loading.close();
+					this.$message.error('该数据没有物料分类id')
 				}
-
 			}).catch(() => loading.close());
 		}
 		// 同步到财务系统
@@ -1514,7 +1523,10 @@
 		}
 		// 获取物料属性
 		getAttribute() {
-			api.pageList({}, 'maindataMaterialAttribute').then((res : any) => {
+			api.pageList({
+				pageSize: 999,
+				status: 0
+			}, 'maindataMaterialAttribute').then((res : any) => {
 				if (res.code === 200) {
 					this.selectList = res.data.records
 				} else this.$message.error(res.msg);

+ 538 - 0
src/views/audit/saleOrder/components/settingConfig.vue

@@ -0,0 +1,538 @@
+<template>
+	<!-- 配置弹窗 -->
+	<vxe-modal v-model="setValue" width="60%" height="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>
+			<by-form v-if="type=='setCForm'" key="setCForm" :propConfig="setCForm" ref="setCForm"></by-form>
+		</template>
+		<template #footer>
+			<div class="btn">
+				<el-button type="primary" size="small" @click="determine">保存</el-button>
+			</div>
+		</template>
+	</vxe-modal>
+</template>
+
+<script lang="ts">
+	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+	import VueViews from '@/benyun/compVue/VueViews'
+	import api from "@/api/order";
+	@Component
+	export default class SettingConfig extends VueViews {
+		setValue : any = false
+		baseInfo : any = ""
+		get getDepId() {
+			return this.$store.state.settings.depId;
+		}
+		@Prop()
+		type : any;
+		@Prop()
+		title : any;
+		setXForm : any = {
+			attr: {
+				size: 'medium',
+			},
+			columns: [
+				[
+					{
+						span: 8,
+						label: '单据类型',
+						prop: 'FBillTypeID',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入单据类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入单据类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '客户',
+						prop: 'FCustId',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入客户', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入客户',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '收货方',
+						prop: 'FReceiveId',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入收货方', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入收货方',
+								clearable: true
+							}
+						}
+					},
+				],
+				[
+					{
+						span: 8,
+						label: '结算方',
+						prop: 'FSettleId',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入结算方', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入结算方',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '付款方',
+						prop: 'FNAME',
+						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: 'FSettleCurrId',
+						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: 'FOwnerTypeId',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入货主类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入货主类型',
+								clearable: true
+							}
+						}
+					},
+				],
+				[
+					{
+						span: 8,
+						label: 'BOM版本',
+						prop: 'FBomId',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入BOM版本', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入BOM版本',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '预留类型',
+						prop: 'FReserveType',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入预留类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入预留类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '超发控制',
+						prop: 'FOUTLMTUNIT',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入超发控制', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入超发控制',
+								clearable: true
+							}
+						}
+					}
+				]
+			]
+		}
+		setCForm : any = {
+			attr: {
+				size: 'medium',
+			},
+			columns: [
+				[
+					{
+						span: 8,
+						label: '单据类型',
+						prop: 'FBillTypeID',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入单据类型', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入单据类型',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '客户',
+						prop: 'FCustomerID',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入客户', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入客户',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '收货方',
+						prop: 'FReceiverID',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入收货方', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入收货方',
+								clearable: true
+							}
+						}
+					},
+				],
+				[
+					{
+						span: 8,
+						label: '结算方',
+						prop: 'FSettleID',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入结算方', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入结算方',
+								clearable: true
+							}
+						}
+					},
+					{
+						span: 8,
+						label: '付款方',
+						prop: 'FPayerID',
+						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: 'FExchangeRate',
+						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: 'FRowType',
+						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: 'FLocalCurrID',
+						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: 'FStockStatusID',
+						component: 'by-input',
+						rules:[
+						  { required: true, message: '请输入库存状态', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入库存状态',
+								clearable: true
+							}
+						}
+
+					}
+				]
+			]
+		}
+		// 打开弹窗
+		openSetting() {
+			this.setValue = true;
+			let loading = this.$loading({ target: '.main-container' });
+			api.single({ id: 1 }, "supplyFinanceSetting").then((res : any) => {
+				loading.close();
+				if (res.data) {
+					this.baseInfo = res.data;
+					if (this.type == "setXForm") {
+						setTimeout(() => {
+							if (res.data.saleorderSetting && res.data.saleorderSetting.indexOf(this.getDepId) != -1) {
+								(this as any).$refs.setXForm.setValue(JSON.parse(res.data.saleorderSetting)[this.getDepId]);
+							}
+						}, 0)
+					} else if (this.type == "setCForm") {
+						setTimeout(() => {
+							if (res.data.outorderSetting && res.data.outorderSetting.indexOf(this.getDepId) != -1) {
+								(this as any).$refs.setCForm.setValue(JSON.parse(res.data.outorderSetting)[this.getDepId]);
+							}
+						}, 0)
+					}
+				}
+			}).catch(() => {
+				loading.close();
+				this.setValue = false;
+			})
+		}
+		created() {
+
+		}
+		determine() {
+			let value : any = "";
+			let data : any = {}
+			if (this.type == "setXForm") {
+				value = (this as any).$refs.setXForm.getValue();
+				if (this.baseInfo.saleorderSetting) {
+					let obj : any = JSON.parse(this.baseInfo.saleorderSetting);
+					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 {
+					data.saleorderSetting = JSON.stringify({ [this.getDepId]: value })
+				}
+			} else if (this.type == "setCForm") {
+				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 {
+					data.outorderSetting = JSON.stringify({ [this.getDepId]: value })
+				}
+			}
+			if (this.baseInfo) data.id = this.baseInfo.id;
+			console.log(data);
+			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());
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.orderType {
+		.typeText {
+			width: 40px;
+			height: 18px;
+			line-height: 18px;
+			text-align: center;
+			background-color: #0089ff;
+			border-radius: 12px;
+			color: #fff;
+			font-size: 12px;
+			margin-left: -10px;
+		}
+
+		.typeText2 {
+			background-color: #E6A23C;
+		}
+	}
+</style>

+ 20 - 3
src/views/audit/saleOrder/index.vue

@@ -3,9 +3,10 @@
 		<by-bill :propConfig="config" @search="search" ref="bill" @resert="resert" @detail="openEdit" @onRefresh="resert"
 			@pagination="pagination" @clickTab="clickTab" @onOrder="onOrder" @onSave="onSave">
 		</by-bill>
+		<!-- 拆单弹窗 -->
 		<vxe-modal v-model="vxeValue" width="90%" height="90%" show-zoom resize transfer show-footer>
 			<template #title>
-				<!-- <span>拆单</span> -->
+				<span>拆单</span>
 			</template>
 			<template #default>
 				<div class="fl" style="width: 45%;margin-right: 10%;">
@@ -25,6 +26,7 @@
 				</div>
 			</template>
 		</vxe-modal>
+		<SettingConfig ref="setForm" type="setXForm" title="销售订单" />
 	</div>
 </template>
 
@@ -32,8 +34,9 @@
 	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 	import api from "@/api/order";
 	import OrderType from "./components/orderType.vue";
+	import SettingConfig from "./components/settingConfig.vue";
 	import Assembly from "@/components/Assembly/saleOrder.vue";
-	@Component
+	@Component({ components: { SettingConfig } })
 	export default class SaleOrder extends Vue {
 		vxeValue = false
 		isCitation = false
@@ -41,6 +44,7 @@
 		timer : any = null
 		baseInfo : any = {} // 订单数据
 		regularData : any = [] // 固定值
+		
 		leftTableConfig : any = {
 			attr: {
 				size: 'mini',
@@ -465,12 +469,19 @@
 								}
 							}
 						},
+						{
+							name: '参数配置', icon: 'el-icon-setting', audit: [''], event: {
+								click: () => {
+									(this as any).configuration()
+								}
+							}
+						},
 					]
 				},
 				table: {
 					attr: {
 						size: 'mini',
-					triggerRowCheck: 'row',
+						triggerRowCheck: 'row',
 						align: 'left',
 						radio: true
 					},
@@ -480,10 +491,12 @@
 							title: '单据编号',
 							field: 'orderNumber',
 							isDetail: true,
+							fixed:'left'
 						},
 						{
 							width: 50,
 							component: OrderType,
+							fixed:'left'
 						},
 						{
 							width: 180,
@@ -687,6 +700,10 @@
 				this.getDataList()
 			}, 500)
 		}
+		// 参数配置
+		configuration() {
+			(this as any).$refs.setForm.openSetting();
+		}
 		// 引单
 		citationOrder() {
 			let parentData : any = (this as any).$refs.bill.getSourceTableSelectData(0);

+ 1 - 0
src/views/audit/virtually/index.vue

@@ -346,6 +346,7 @@
 						if (res.code === 200) {
 							data.parentName = res.data.name;
 							this.dialogFormVisible = true;
+							console.log(data,'data');
 							setTimeout(() => { (this as any).$refs.addFormId.setValue(data) }, 0);
 						}
 					})