1

.env.development

@@ -6,6 +6,7 @@ ENV = 'development'
 
 # SaaS协同平台/开发环境
 VUE_APP_BASE_API = '/dev-api'
+# VUE_APP_BASE_API = '/prod-api'
 
 # 用户 "应用中心" 地址
 VUE_APP_CENTERURL = https://user.lzlxylsf.com/app

src/components/skuModal/productModal.vue

@@ -61,7 +61,7 @@ export default class ProductModal extends Vue {
         {
           span:8,
           label:'商品名称',
-          prop:'skuTitle',
+          prop:'name',
           component:'by-input',
           labelWidth:'120px',
           compConfig:{
@@ -78,7 +78,7 @@ export default class ProductModal extends Vue {
             component: 'by-input',
             compConfig: {
               attr: {
-                placeholder: '69码-商品条码',
+                placeholder: '物料编码',
                 clearable: true
               }
             }

src/router/index.ts

@@ -19,11 +19,11 @@ export const constantRoutes: Array<any> = [
   //   // which is lazy-loaded when the route is visited.
   //   component: () => import(/* webpackChunkName: "about" */ '../views/AboutView.vue')
   // },
-  // {
-  //   path: '/login',
-  //   component: () => import('../views/login.vue'),
-  //   hidden: true
-  // },
+  {
+    path: '/login',
+    component: () => import('../views/login.vue'),
+    hidden: true
+  },
   // {
   //   path: '/register',
   //   component: () => import('@/views/register.vue'),

src/views/audit/orderTask/components/productModal.vue

@@ -39,7 +39,7 @@
 					[{
 						span: 6,
 						label: '标题',
-						prop: 'skuTitle',
+						prop: 'name',
 						component: 'by-input',
 						compConfig: {
 							attr: {
@@ -47,7 +47,31 @@
 								placeholder: '请输入名称'
 							}
 						}
-					}]
+					},{
+            span: 8,
+            label: '物料编码',
+            prop: 'skuCode',
+            labelWidth: '130px',
+            component: 'by-input',
+            compConfig: {
+              attr: {
+                placeholder: '物料编码',
+                clearable: true
+              }
+            }
+          },{
+            span: 8,
+            label: '69码-商品条码',
+            prop: 'barCode',
+            labelWidth: '130px',
+            component: 'by-input',
+            compConfig: {
+              attr: {
+                placeholder: '69码-商品条码',
+                clearable: true
+              }
+            }
+          }]
 				]
 			},
 			tool: {
@@ -78,24 +102,28 @@
 							width: 250
 						},
 						{
-							width: 250,
-							title: '财务编号',
-							field: 'financialCode',
+							title:'物料编码',
+							field:'skuCode',
+							width:140
+						},{
+							title:'69码',
+							field:'barCode',
+							width:140
 						},
 						{
-							title: '规格',
-							field: 'materialSpec',
-							width: 250
+							width: 150,
+							title: '财务编号',
+							field: 'financialCode',
 						},
 						{
 							title: '单位',
 							field: 'unit',
-							width: 250
+							width: 90
 						},
 						{
 							title: '单价',
 							field: 'price',
-							width: 250
+							width: 70
 						},
 					]
 			},

src/views/audit/productManagement/components/productModal.vue

@@ -40,7 +40,7 @@
 					[{
 						span: 6,
 						label: '标题',
-						prop: 'skuTitle',
+						prop: 'name',
 						component: 'by-input',
 						compConfig: {
 							attr: {
@@ -48,7 +48,31 @@
 								placeholder: '请输入名称'
 							}
 						}
-					}]
+					},{
+            span: 8,
+            label: '物料编码',
+            prop: 'skuCode',
+            labelWidth: '130px',
+            component: 'by-input',
+            compConfig: {
+              attr: {
+                placeholder: '物料编码',
+                clearable: true
+              }
+            }
+          },{
+            span: 8,
+            label: '69码-商品条码',
+            prop: 'barCode',
+            labelWidth: '130px',
+            component: 'by-input',
+            compConfig: {
+              attr: {
+                placeholder: '69码-商品条码',
+                clearable: true
+              }
+            }
+          }]
 				]
 			},
 			tool: {
@@ -79,24 +103,28 @@
 							width: 250
 						},
 						{
-							width: 250,
-							title: '财务编号',
-							field: 'financialCode',
+							title:'物料编码',
+							field:'skuCode',
+							width:140
+						},{
+							title:'69码',
+							field:'barCode',
+							width:140
 						},
 						{
-							title: '规格',
-							field: 'materialSpec',
-							width: 250
+							width: 150,
+							title: '财务编号',
+							field: 'financialCode',
 						},
 						{
 							title: '单位',
 							field: 'unit',
-							width: 250
+							width: 90
 						},
 						{
 							title: '单价',
 							field: 'price',
-							width: 250
+							width: 70
 						},
 					]
 			},

src/views/audit/sku/index.vue

@@ -289,7 +289,7 @@
 						{
 							span: 6,
 							label: '商品名称',
-							prop: 'skuTitle',
+							prop: 'name',
 							component: 'by-input',
 							compConfig: {
 								attr: {

src/views/audit/store/index.vue

@@ -34,7 +34,7 @@
 						// {
 						// 	span: 6,
 						// 	label: '标题',
-						// 	prop: 'skuTitle',
+						// 	prop: 'name',
 						// 	component: 'by-input',
 						// 	// labelWidth: '70px',
 						// 	compConfig: {
@@ -309,14 +309,14 @@
 		search() {
 			let searchID : any = (this as any).$refs.moduleView.searchID;
 			let value = (this as any).$refs.moduleView.$refs[searchID].value;
-			if (value.skuTitle) {
+			if (value.name) {
 				if (value.skuCode) {
-					// let newData = this.tableInfo.filter((v : any) => v.skuCode == value.skuCode && v.skuTitle == value.skuTitle);
-					let newData = this.tableInfo.filter((v : any) => v.skuCode.indexOf(value.skuCode)>-1 && v.skuTitle.indexOf(value.skuTitle)>-1);
+					// let newData = this.tableInfo.filter((v : any) => v.skuCode == value.skuCode && v.name == value.name);
+					let newData = this.tableInfo.filter((v : any) => v.skuCode.indexOf(value.skuCode)>-1 && v.name.indexOf(value.name)>-1);
 					(this.$refs.moduleView as any).setTableValue(newData);
 				} else {
-					// let newData = this.tableInfo.filter((v : any) => v.skuTitle == value.skuTitle);
-					let newData = this.tableInfo.filter((v : any) => v.skuTitle.indexOf(value.skuTitle)>-1);
+					// let newData = this.tableInfo.filter((v : any) => v.name == value.name);
+					let newData = this.tableInfo.filter((v : any) => v.name.indexOf(value.name)>-1);
 					(this.$refs.moduleView as any).setTableValue(newData);
 				}
 			} else {

src/views/audit/warehousing/index.vue

@@ -1264,9 +1264,9 @@
 					for (const t_item of nowData) {
 						if (item.id == t_item.materialSku) {
 							if (!names) {
-								names = item.skuTitle
+								names = item.name
 							} else {
-								names = names + ',' + item.skuTitle
+								names = names + ',' + item.name
 							}
 							t = false;
 							break;