1.机构档案优化

2.商品管理优化

src/views/audit/Information/index.vue

@@ -147,6 +147,8 @@
 						prop: 'contacts',
 						component: 'by-input',
 					},
+				],
+				[
 					{
 						span: 6,
 						label: '手机号码',
@@ -194,7 +196,7 @@
 				],
 				[
 					{
-						span: 18,
+						span: 24,
 						label: 'URL地址',
 						slot: true,
 						prop: 'k3ServerUrl',
@@ -229,11 +231,13 @@
 						prop: 'k3AppSec',
 						component: 'by-input',
 					},
+				],
+				[
 					{
 						span: 6,
 						label: '纳税人识别号',
 						slot: true,
-						prop: 'txNum',
+						prop: 'taxnum',
 						component: 'by-input',
 					},
 				],
@@ -259,7 +263,7 @@
 				}],
 				[
 					{
-						span: 18,
+						span: 24,
 						label: '详细地址',
 						slot: true,
 						prop: 'address',

src/views/audit/distributor/index.vue

@@ -159,11 +159,11 @@
 					field: 'telephone',
 					width: 150,
 				},
-				{
-					width: 300,
-					title: '财务系统类型',
-					field: 'financeType2',
-				},
+				// {
+				// 	width: 300,
+				// 	title: '财务系统类型',
+				// 	field: 'financeType2',
+				// },
 				{
 					width: 80,
 					title: '状态',
@@ -207,9 +207,9 @@
 					telephone: [{
 						required: true, message: '请输入手机号码', trigger: 'blur'
 					}],
-					financeType: [{
-						required: true, message: '请输入财务系统类型', trigger: 'change'
-					}],
+					// financeType: [{
+					// 	required: true, message: '请输入财务系统类型', trigger: 'change'
+					// }],
 					province: [{
 						required: true, message: '请选择地址', trigger: 'change'
 					}],
@@ -254,17 +254,28 @@
 					},
 					{
 						span: 6,
-						label: '手机号码',
-						prop: 'telephone',
+						label: '机构代码',
+						prop: 'organizationCode',
 						component: 'by-input',
 					}
 				],
 				[{
+						span: 6,
+						label: '手机号码',
+						prop: 'telephone',
+						component: 'by-input',
+					},{
 						span: 6,
 						label: '联系电话',
 						prop: 'phonenum',
 						component: 'by-input',
 					},
+					{
+						span: 6,
+						label: '电子邮箱',
+						prop: 'email',
+						component: 'by-input',
+					},
 				],
 				[
 					{

src/views/audit/manufacturer/index.vue

@@ -201,6 +201,9 @@
 					name: [{
 						required: true, message: '请输入名称', trigger: 'blur'
 					}],
+					organizationCode: [{
+						required: true, message: '请输入机构代码', trigger: 'blur'
+					}],
 					contacts: [{
 						required: true, message: '请输入负责人', trigger: 'blur'
 					}],
@@ -249,25 +252,38 @@
 						prop: 'name',
 						component: 'by-input',
 					},
+					{
+						span: 6,
+						label: '机构代码',
+						prop: 'organizationCode',
+						component: 'by-input',
+					},
 					{
 						span: 6,
 						label: '负责人',
 						prop: 'contacts',
 						component: 'by-input',
 					},
+				],
+				[
 					{
 						span: 6,
 						label: '手机号码',
 						prop: 'telephone',
 						component: 'by-input',
 					},
-				],
-				[{
+					{
 						span: 6,
 						label: '联系电话',
 						prop: 'phonenum',
 						component: 'by-input',
 					},
+					{
+						span: 6,
+						label: '电子邮箱',
+						prop: 'email',
+						component: 'by-input',
+					},
 				],
 				[
 					{
@@ -297,7 +313,7 @@
 				],
 				[
 					{
-						span: 18,
+						span: 24,
 						label: 'URL地址',
 						slot: true,
 						prop: 'k3ServerUrl',
@@ -333,6 +349,15 @@
 						component: 'by-input',
 					},
 				],
+				[
+					{
+						span: 6,
+						label: '纳税人识别号',
+						slot: true,
+						prop: 'taxnum',
+						component: 'by-input',
+					},
+				],
 				
 				[{
 					span: 18,
@@ -355,7 +380,7 @@
 				}],
 				[
 					{
-						span: 18,
+						span: 24,
 						label: '详细地址',
 						slot: true,
 						prop: 'address',

src/views/audit/productManagement/index.vue

@@ -1994,20 +1994,24 @@
 		}
 		// 删除表格数据
 		doDeleteTable(item : any) {
-			this.$confirm('确定删除吗！', '注意', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-				center: true
-			}).then(() => {
-				// console.log(this.tableList);
-				(this as any).tableList.map((v : any) => {
-					if (v.dataIndex === item.dataIndex) v.isDeleted = 1;
-				})
-				let filterList = this.tableList.filter((v : any) => v.isDeleted !== 1);
-				(this as any).$refs.table.setValue(filterList); // 设置表格数据
-				this.$message.success('删除成功');
-			}).catch(() => this.$message.info('已取消删除'));
+			if((this as any).tableList.length>1){
+				this.$confirm('确定删除吗！', '注意', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning',
+					center: true
+				}).then(() => {
+					// console.log(this.tableList);
+					(this as any).tableList.map((v : any) => {
+						if (v.dataIndex === item.dataIndex) v.isDeleted = 1;
+					})
+					let filterList = this.tableList.filter((v : any) => v.isDeleted !== 1);
+					(this as any).$refs.table.setValue(filterList); // 设置表格数据
+					this.$message.success('删除成功');
+				}).catch(() => this.$message.info('已取消删除'));
+			}else{
+				this.$message.warning('物料属性不能为空，无法删除！')
+			}
 		}
 		// 获取物料属性
 		getAttribute() {

src/views/audit/supplier/index.vue

@@ -157,11 +157,11 @@
 					field: 'telephone',
 					width: 150,
 				},
-				{
-					width: 300,
-					title: '财务系统类型',
-					field: 'financeType2',
-				},
+				// {
+				// 	width: 300,
+				// 	title: '财务系统类型',
+				// 	field: 'financeType2',
+				// },
 				{
 					width: 80,
 					title: '状态',
@@ -205,9 +205,9 @@
 					telephone: [{
 						required: true, message: '请输入手机号码', trigger: 'blur'
 					}],
-					financeType: [{
-						required: true, message: '请输入财务系统类型', trigger: 'change'
-					}],
+					// financeType: [{
+					// 	required: true, message: '请输入财务系统类型', trigger: 'change'
+					// }],
 					province: [{
 						required: true, message: '请选择地址', trigger: 'change'
 					}],
@@ -252,82 +252,94 @@
 					},
 					{
 						span: 6,
-						label: '手机号码',
-						prop: 'telephone',
-						component: 'by-input',
-					},
-				],
-				[{
-						span: 6,
-						label: '联系电话',
-						prop: 'phonenum',
+						label: '机构代码',
+						prop: 'organizationCode',
 						component: 'by-input',
 					},
 				],
 				[
 					{
 						span: 6,
-						labelWidth: '110px',
-						label: '财务系统类型',
-						prop: 'financeType',
-						component: 'by-select',
-						compConfig: {
-							attr: {
-								placeholder: '请选择财务系统类型',
-								clearable: true,
-								size: 'small',
-								data: [
-									{
-										value: 'kingdee',
-										label: '金蝶K3'
-									},
-									// {
-									// 	value: 'yonbip',
-									// 	label: '用友U8'
-									// },
-								]
-							}
-						}
-					},
-				],
-				[
-					{
-						span: 18,
-						label: 'URL地址',
-						slot: true,
-						prop: 'k3ServerUrl',
-					},
-				],
-				[
-					{
-						span: 6,
-						label: '登录授权ID',
-						slot: true,
-						prop: 'k3AppId',
-						component: 'by-input',
-					},
-					{
-						span: 6,
-						label: '用户名称',
-						slot: true,
-						prop: 'k3UserName',
+						label: '手机号码',
+						prop: 'telephone',
 						component: 'by-input',
-					},
-					{
+					},{
 						span: 6,
-						label: '数据中心ID',
-						slot: true,
-						prop: 'k3AcctId',
+						label: '联系电话',
+						prop: 'phonenum',
 						component: 'by-input',
 					},
 					{
 						span: 6,
-						label: '应用秘钥',
-						slot: true,
-						prop: 'k3AppSec',
+						label: '电子邮箱',
+						prop: 'email',
 						component: 'by-input',
 					},
 				],
+				// [
+				// 	{
+				// 		span: 6,
+				// 		labelWidth: '110px',
+				// 		label: '财务系统类型',
+				// 		prop: 'financeType',
+				// 		component: 'by-select',
+				// 		compConfig: {
+				// 			attr: {
+				// 				placeholder: '请选择财务系统类型',
+				// 				clearable: true,
+				// 				size: 'small',
+				// 				data: [
+				// 					{
+				// 						value: 'kingdee',
+				// 						label: '金蝶K3'
+				// 					},
+				// 					// {
+				// 					// 	value: 'yonbip',
+				// 					// 	label: '用友U8'
+				// 					// },
+				// 				]
+				// 			}
+				// 		}
+				// 	},
+				// ],
+				// [
+				// 	{
+				// 		span: 18,
+				// 		label: 'URL地址',
+				// 		slot: true,
+				// 		prop: 'k3ServerUrl',
+				// 	},
+				// ],
+				// [
+				// 	{
+				// 		span: 6,
+				// 		label: '登录授权ID',
+				// 		slot: true,
+				// 		prop: 'k3AppId',
+				// 		component: 'by-input',
+				// 	},
+				// 	{
+				// 		span: 6,
+				// 		label: '用户名称',
+				// 		slot: true,
+				// 		prop: 'k3UserName',
+				// 		component: 'by-input',
+				// 	},
+				// 	{
+				// 		span: 6,
+				// 		label: '数据中心ID',
+				// 		slot: true,
+				// 		prop: 'k3AcctId',
+				// 		component: 'by-input',
+				// 	},
+				// 	{
+				// 		span: 6,
+				// 		label: '应用秘钥',
+				// 		slot: true,
+				// 		prop: 'k3AppSec',
+				// 		component: 'by-input',
+				// 	},
+				// ],
 				[{
 					span: 18,
 					label: '地址',
@@ -349,7 +361,7 @@
 				}],
 				[
 					{
-						span: 18,
+						span: 24,
 						label: '详细地址',
 						slot: true,
 						prop: 'address',