物料完成

src/views/audit/agencyGoods/index.vue

@@ -3,7 +3,8 @@
 		<div class="bill-left">
 			<div class="bill-tab">
 				<div class="title">导航</div>
-				<el-tree :data="data" :props="props" @node-click="handleNodeClick"></el-tree>
+				<el-tree :data="data" node-key="id" :default-expanded-keys="expandedKeys" :props="props"
+					@node-click="handleNodeClick"></el-tree>
 			</div>
 		</div>
 		<div class="bill-main">
@@ -40,7 +41,8 @@
 	export default class AgencyGoods extends Vue {
 		// 左边
 		data : any = []
-		parentId:any=''
+		expandedKeys : any = []
+		parentId : any = ''
 		props = {
 			label: 'name',
 			children: 'children'
@@ -236,6 +238,10 @@
 			api.treeList('maindataMaterialOrganizationCategory').then((res : any) => {
 				if (res.code === 200) {
 					this.data = res.data;
+					this.expandedKeys.push(res.data[0].id)
+					res.data[0].children.map((v : any) => {
+						this.expandedKeys.push(v.id)
+					})
 				} else this.failHandle(res)
 			})
 		}
@@ -282,7 +288,7 @@
 			clearInterval(this.timer)
 			let query = (this.$refs.moduleView as any).getQuery();
 			query.parentId = this.parentId;
-			let newData:any = {}
+			let newData : any = {}
 			for (let key in query) {
 				if (query[key].toString()) {
 					newData[key] = query[key]
@@ -322,8 +328,8 @@
 			this.popTitle = '编辑'
 			this.dialogFormVisible = true;
 			this.radio = e.status
-			api.single({id:e.parentId},'maindataMaterialOrganizationCategory').then((res:any) =>{
-				if(res.code===200){
+			api.single({ id: e.parentId }, 'maindataMaterialOrganizationCategory').then((res : any) => {
+				if (res.code === 200) {
 					e.parentName = res.data.name
 					setTimeout(() => {
 						if ((this as any).$refs.addFormId) (this as any).$refs.addFormId.setValue(e);
@@ -396,7 +402,7 @@
 		}
 		// 导航切换
 		handleNodeClick(e : any) {
-			this.parentId=e.id
+			this.parentId = e.id
 			api.childrenTreeList({ id: e.id }, 'maindataMaterialOrganizationCategory').then((res : any) => {
 				if (res.code === 200) {
 					(this.$refs.moduleView as any).setTableValue(res.data);

src/views/audit/attribute/index.vue

@@ -79,7 +79,7 @@
 						label: '名称',
 						prop: 'name',
 						component: 'by-input',
-						labelWidth: '70px',
+						labelWidth: '80px',
 						compConfig: {
 							attr: {
 								placeholder: '请输入名称',
@@ -92,7 +92,7 @@
 						label: '状态',
 						prop: 'status',
 						component: 'by-select',
-						labelWidth: '70px',
+						labelWidth: '80px',
 						compConfig: {
 							attr: {
 								placeholder: '请选择数据',
@@ -195,27 +195,30 @@
 					name: [{
 						required: true, message: '请输入名称', trigger: 'blur'
 					}],
+					attributeType: [{
+						required: true, message: '请输入销售属性', trigger: 'blur'
+					}],
 				}
 			},
 			columns: [
 				[
 					{
 						span: 23,
-						labelWidth: '70px',
+						labelWidth: '80px',
 						label: '名称',
 						prop: 'name',
 						component: 'by-input',
 					},
 					{
 						span: 23,
-						labelWidth: '70px',
+						labelWidth: '80px',
 						label: '显示状态',
 						slot: true,
 						prop: 'status',
 					},
 					{
 						span: 23,
-						labelWidth: '70px',
+						labelWidth: '80px',
 						label: '属性类型',
 						slot: true,
 						prop: 'attributeType',
@@ -236,7 +239,7 @@
 					},
 					{
 						span: 23,
-						labelWidth: '70px',
+						labelWidth: '80px',
 						label: '属性值',
 						slot: true,
 						prop: 'attributeValue',

src/views/audit/brand/index.vue

@@ -270,7 +270,7 @@
 			this.dialogFormVisible = true;
 			this.radio = 0
 			setTimeout(() => {
-				if ((this as any).$refs.addFormId) (this as any).$refs.addFormId.setValue({});
+				if ((this as any).$refs.addFormId) (this as any).$refs.addFormId.setValue('');
 			}, 0)
 		}
 		// 打开编辑

src/views/audit/materialAdd/index.vue

@@ -1,385 +0,0 @@
-<template>
-	<div class="detil">
-		<by-tool :propConfig="toolConfig" />
-		<div class="box-shadow">
-			<by-form :propConfig="config" ref="form">
-				<template v-slot:description>
-					<el-input type="textarea" :rows="5" placeholder="请输入内容" v-model="textarea">
-					</el-input>
-				</template>
-				<template v-slot:radio>
-					<el-radio v-model="radio" :label="1">单规格</el-radio>
-					<el-radio v-model="radio" :label="2">多规格</el-radio>
-				</template>
-
-				<template v-slot:status>
-					<el-radio v-model="radioStatus" :label="1">启用</el-radio>
-					<el-radio v-model="radioStatus" :label="2">备用</el-radio>
-					<el-radio v-model="radioStatus" :label="3">禁用</el-radio>
-				</template>
-				<template v-slot:ismakeup>
-					<el-radio v-model="ismakeup" :label="1">是</el-radio>
-					<el-radio v-model="ismakeup" :label="2">否</el-radio>
-				</template>
-				<template v-slot:issued>
-					<el-radio v-model="issued" :label="1">是</el-radio>
-					<el-radio v-model="issued" :label="2">否</el-radio>
-				</template>
-			</by-form>
-		</div>
-	</div>
-</template>
-
-<script lang="ts">
-	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-	import api from '@/api/currency'
-	@Component
-	export default class DemoForm extends Vue {
-		baseURL : any = process.env.VUE_APP_BASE_API
-		radio : any = 1
-		radioStatus : any = 1
-		ismakeup : any = 1
-		issued : any = 1
-		textarea : any = ''
-		toolConfig = {
-			customTools: [
-				{
-					name: '保存', icon: 'el-icon-plus', audit: [''], event: {
-						click: () => {
-							(this as any).getFormData()
-						}
-					}
-				}
-			]
-		}
-		config = {
-			attr: {
-				size: 'small',
-				rules: {
-					name: [{
-						required: true, message: '请输入名称', trigger: 'blur'
-					}],
-					shortName: [{
-						required: true, message: '请输入简称', trigger: 'blur'
-					}]
-				}
-			},
-			columns: [
-				[
-					{
-						span: 6,
-						label: '名称',
-						prop: 'name',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入名称',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '简称',
-						prop: 'shortName',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入简称',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '财务编号',
-						prop: 'accountingCode',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入财务编号',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '国际码',
-						prop: 'nsCode',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入国际码',
-								clearable: true
-							}
-						}
-					},
-				],
-				[
-					{
-						span: 6,
-						label: '基本售价',
-						prop: 'basePrice',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入基本售价',
-								clearable: true
-							}
-						}
-					}, {
-						span: 6,
-						label: '市场价格',
-						prop: 'markPrice',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入市场价格',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '价格',
-						prop: 'price',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入价格(成交、成本价)',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '单位',
-						prop: 'unit',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入单位',
-								clearable: true
-							}
-						}
-					},
-				],
-
-				[
-					{
-						span: 6,
-						label: '重量',
-						prop: 'weight',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入重量',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '保质期(天)',
-						prop: 'shelfLife',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入保质期(天)',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '库存',
-						prop: 'stock',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入库存',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '安全库存',
-						prop: 'warningStock',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入安全库存',
-								clearable: true
-							}
-						}
-					}
-				],
-				[
-					{
-						span: 6,
-						label: '货号',
-						prop: 'itemNumber',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入货号',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '分类',
-						prop: 'select',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					},
-					{
-						span: 6,
-						label: '虚拟分类',
-						prop: 'select',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					},
-					{
-						span: 6,
-						label: '厂家物料',
-						prop: 'factoryId',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					}
-				],
-				[
-					{
-						span: 6,
-						label: '机构商品分类',
-						prop: 'select',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					},
-					{
-						span: 6,
-						label: '物料属性表',
-						prop: 'select',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					}
-				],
-				[
-					{
-						span: 30,
-						label: '描述',
-						slot: true,
-						prop: 'description',
-					}
-				],
-				[
-					{
-						span: 20,
-						label: '商品规格',
-						slot: true,
-						prop: 'radio',
-					}
-				],
-				[
-					{
-						span: 20,
-						label: '物料状态',
-						slot: true,
-						prop: 'status',
-					}
-				],
-				[
-					{
-						span: 20,
-						label: '是否组合商品',
-						slot: true,
-						prop: 'ismakeup',
-					}
-				],
-				[
-					{
-						span: 20,
-						label: '是否公布',
-						slot: true,
-						prop: 'issued',
-					}
-				],
-			],
-		}
-		created() {
-			// 获取机构商品分类
-			// api.institutionList({}).then((res : any) => {
-			// 	console.log('机构商品分类 ==> ', res);
-			// })
-		}
-		doSave() {
-			this.getFormData()
-		}
-		getFormData() {
-			(this as any).$refs.form.validate().then(() => {
-				let data : any = (this as any).$refs.form.getValue();
-				data.description = this.textarea;
-				data.status = this.radioStatus;
-				data.ismakeup = this.ismakeup;
-				data.issued = this.issued;
-				api.saveList(data,'maindataMaterial').then((res : any) => {
-					if (res.code === 200) {
-						(this as any).$tab.closeOpenPage('/materialFile/productManagement')
-						this.$message({ type: 'success', message: res.msg })
-					}
-				})
-			});
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.detil {
-		padding: 20px;
-
-		.box-shadow {
-			box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-			padding: 20px;
-			border-radius: 4px;
-			border: 1px solid #e6ebf5;
-			background-color: #fff;
-			overflow: hidden;
-			color: #303133;
-			-webkit-transition: .3s;
-			transition: .3s;
-			margin-top: 20px;
-		}
-	}
-</style>

src/views/audit/materialEdit/index.vue

@@ -1,379 +0,0 @@
-<template>
-	<div class="detil">
-		<by-tool :propConfig="toolConfig" />
-		<div class="box-shadow">
-			<by-form :propConfig="config" ref="form">
-				<template v-slot:description="option">
-					<el-input type="textarea" :rows="5" placeholder="请输入内容" v-model="textarea">
-					</el-input>
-				</template>
-				<template v-slot:radio="option">
-					<el-radio v-model="radio" :label="1">单规格</el-radio>
-					<el-radio v-model="radio" :label="2">多规格</el-radio>
-				</template>
-				<template v-slot:status="option">
-					<el-radio v-model="radioStatus" :label="1">启用</el-radio>
-					<el-radio v-model="radioStatus" :label="2">备用</el-radio>
-					<el-radio v-model="radioStatus" :label="3">禁用</el-radio>
-				</template>
-				<template v-slot:ismakeup="option">
-					<el-radio v-model="ismakeup" :label="1">是</el-radio>
-					<el-radio v-model="ismakeup" :label="2">否</el-radio>
-				</template>
-				<template v-slot:issued="option">
-					<el-radio v-model="issued" :label="1">是</el-radio>
-					<el-radio v-model="issued" :label="2">否</el-radio>
-				</template>
-			</by-form>
-		</div>
-	</div>
-</template>
-
-<script lang="ts">
-	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-	import api from '@/api/currency'
-	@Component
-	export default class MaterialEdit extends Vue {
-		baseURL : any = process.env.VUE_APP_BASE_API
-		radio : any = 1
-		radioStatus : any = 1
-		ismakeup : any = 1
-		issued : any = 1
-		textarea : any = ''
-		toolConfig = {
-			customTools: [
-				{
-					name: '保存', icon: 'el-icon-plus', audit: [''], event: {
-						click: () => {
-							(this as any).getFormData()
-						}
-					}
-				}
-			]
-		}
-		config = {
-			attr: {
-				size: 'small',
-				rules: {
-					name: [{
-						required: true, message: '请输入名称', trigger: 'blur'
-					}],
-					shortName: [{
-						required: true, message: '请输入简称', trigger: 'blur'
-					}]
-				}
-			},
-			columns: [
-				[
-					{
-						span: 6,
-						label: '名称',
-						prop: 'name',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入名称',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '简称',
-						prop: 'shortName',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入简称',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '财务编号',
-						prop: 'accountingCode',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入财务编号',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '国际码',
-						prop: 'nsCode',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入国际码',
-								clearable: true
-							}
-						}
-					},
-				],
-				[
-					{
-						span: 6,
-						label: '基本售价',
-						prop: 'basePrice',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入基本售价',
-								clearable: true
-							}
-						}
-					}, {
-						span: 6,
-						label: '市场价格',
-						prop: 'markPrice',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入市场价格',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '价格',
-						prop: 'price',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入价格(成交、成本价)',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '单位',
-						prop: 'unit',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入单位',
-								clearable: true
-							}
-						}
-					},
-				],
-
-				[
-					{
-						span: 6,
-						label: '重量',
-						prop: 'weight',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入重量',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '保质期(天)',
-						prop: 'shelfLife',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入保质期(天)',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '库存',
-						prop: 'stock',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入库存',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '安全库存',
-						prop: 'warningStock',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入安全库存',
-								clearable: true
-							}
-						}
-					}
-				],
-				[
-					{
-						span: 6,
-						label: '货号',
-						prop: 'itemNumber',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入货号',
-								clearable: true
-							}
-						}
-					},
-					{
-						span: 6,
-						label: '分类',
-						prop: 'select',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					},
-					{
-						span: 6,
-						label: '虚拟分类',
-						prop: 'select',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					},
-					{
-						span: 6,
-						label: '厂家物料',
-						prop: 'factoryId',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					}
-				],
-				[
-					{
-						span: 6,
-						label: '机构商品分类',
-						prop: 'select',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					},
-					{
-						span: 6,
-						label: '物料属性表',
-						prop: 'select',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择数据',
-								clearable: true,
-							},
-							request: '/maindata/maindataMaterialCategory/treeList'
-						},
-					}
-				],
-				[
-					{
-						span: 30,
-						label: '描述',
-						slot: true,
-						prop: 'description',
-					}
-				],
-				[
-					{
-						span: 20,
-						label: '商品规格',
-						slot: true,
-						prop: 'radio',
-					}
-				],
-				[
-					{
-						span: 20,
-						label: '物料状态',
-						slot: true,
-						prop: 'status',
-					}
-				],
-				[
-					{
-						span: 20,
-						label: '是否组合商品',
-						slot: true,
-						prop: 'ismakeup',
-					}
-				],
-				[
-					{
-						span: 20,
-						label: '是否公布',
-						slot: true,
-						prop: 'issued',
-					}
-				],
-			],
-		}
-		mounted() {
-			setTimeout(() => {
-				if (this.$route.params) (this as any).$refs.form.setValue(this.$route.params.baseInfo)
-			}, 300)
-		}
-		getMaterialData(e : any) {
-			console.log(e);
-		}
-		getFormData() {
-			(this as any).$refs.form.validate().then(() => {
-				let data = (this as any).$refs.form.getValue();
-				api.updateList(data,'maindataMaterial').then((res : any) => {
-					if (res.code === 200) {
-						(this as any).$tab.closeOpenPage('/materialFile/productManagement')
-						this.$message({ type: 'success', message: res.msg })
-					}
-				})
-			});
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.detil {
-		padding: 20px;
-
-		.box-shadow {
-			box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-			padding: 20px;
-			border-radius: 4px;
-			border: 1px solid #e6ebf5;
-			background-color: #fff;
-			overflow: hidden;
-			color: #303133;
-			-webkit-transition: .3s;
-			transition: .3s;
-			margin-top: 20px;
-		}
-	}
-</style>

src/views/audit/productClassification/index.vue

@@ -3,7 +3,8 @@
 		<div class="bill-left">
 			<div class="bill-tab">
 				<div class="title">导航</div>
-				<el-tree :data="data" :props="props" @node-click="handleNodeClick"></el-tree>
+				<el-tree :data="data" node-key="id" :default-expanded-keys="expandedKeys" :props="props"
+					@node-click="handleNodeClick"></el-tree>
 			</div>
 		</div>
 		<div class="bill-main">
@@ -34,6 +35,7 @@
 	export default class ProductClassification extends Vue {
 		// 左边
 		data : any = []
+		expandedKeys : any = []
 		parentId : any = ''
 		props = {
 			label: 'name',
@@ -115,7 +117,7 @@
 					seq: true,
 					align: 'center',
 					checkbox: false,
-					height: 600
+					height: 600,
 				},
 				columns: [{
 					width: 300,
@@ -163,6 +165,9 @@
 					name: [{
 						required: true, message: '请输入名称', trigger: 'blur'
 					}],
+					parentName: [{
+						required: true, message: '请选择父级', trigger: 'blur'
+					}],
 				}
 			},
 			columns: [
@@ -179,6 +184,7 @@
 								clearable: true,
 								retConfig: {
 									parentId: 'id',
+									parentName: 'name',
 								}
 							},
 							request: {
@@ -228,9 +234,12 @@
 		// 获取树型导航数据
 		getTreeList() {
 			api.treeList('maindataMaterialCategory').then((res : any) => {
-				// console.log(res.data[0]);
 				if (res.code === 200) {
 					this.data = res.data;
+					this.expandedKeys.push(res.data[0].id)
+					res.data[0].children.map((v : any) => {
+						this.expandedKeys.push(v.id)
+					})
 				} else this.failHandle(res)
 			})
 		}

src/views/audit/virtually/index.vue

@@ -3,7 +3,7 @@
 		<div class="bill-left">
 			<div class="bill-tab">
 				<div class="title">导航</div>
-				<el-tree :data="data" :props="props" @node-click="handleNodeClick"></el-tree>
+				<el-tree :data="data" node-key="id" :default-expanded-keys="expandedKeys" :props="props" @node-click="handleNodeClick"></el-tree>
 			</div>
 		</div>
 		<div class="bill-main">
@@ -34,6 +34,7 @@
 	export default class Virtually extends Vue {
 		// 左边
 		data : any = []
+		expandedKeys : any = []
 		parentId:any=''
 		props = {
 			label: 'name',
@@ -231,6 +232,10 @@
 				// console.log(res.data[0]);
 				if (res.code === 200) {
 					this.data = res.data;
+					this.expandedKeys.push(res.data[0].id)
+					res.data[0].children.map((v : any) => {
+						this.expandedKeys.push(v.id)
+					})
 				} else this.failHandle(res)
 			})
 		}