修改包材出库页面

src/views/wms/outorder/index.vue

@@ -6,14 +6,14 @@
 				<el-input v-model="queryParams.produceCode" placeholder="请输入出库单号" clearable
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
-			<el-form-item label="型号编码" prop="materialCode">
+			<el-form-item label="批次号" prop="materialCode">
-				<el-input v-model="queryParams.materialCode" placeholder="请输入型号编码" clearable
+				<el-input v-model="queryParams.userDefined1" placeholder="请输入型号编码" clearable
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
-			<el-form-item label="型号名称" prop="materialDesc">
+			<!-- <el-form-item label="型号名称" prop="materialDesc">
 				<el-input v-model="queryParams.materialDesc" placeholder="请输入型号名称" clearable
 					@keyup.enter.native="handleQuery" />
-			</el-form-item>
+			</el-form-item> -->
 
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -27,8 +27,7 @@
 					v-hasPermi="['wms:outorder:add']">新增</el-button>
 			</el-col>
 			<el-col :span="1.5">
-				<el-button type="success" plain icon="el-icon-edit" size="mini"  @click="handleSAP"
+				<el-button type="success" plain icon="el-icon-edit" size="mini" @click="handleSAP">过账</el-button>
-					>过账</el-button>
 			</el-col>
 			<!--	<el-col :span="1.5">
           <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
@@ -40,10 +39,10 @@
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
-
+		<el-table v-loading="loading" :data="outorderList" @selection-change="handleSelectionChange"
-		<el-table v-loading="loading" :data="outorderList" @selection-change="handleSelectionChange">
+			:tree-props="{ children: 'list', hasChildren: 'hasChildren' }" row-key="id" border :default-expand-all="false">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="序号" type="index" :index='indexMethod'> </el-table-column>
+			<el-table-column label="序号" type="index" />
 			<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
 			<el-table-column label="ID" align="center" prop="ID" v-if="false" />
 			<el-table-column label="出库单号" align="center" prop="produceCode" />
@@ -181,7 +180,94 @@ export default {
 			// 总条数
 			total: 0,
 			// 包材出库单表格数据
-			outorderList: [],
+			outorderList: [
+				{
+					createBy: 'admin',
+					siteCode: '1000',
+					produceCode: '000100305998',
+					materialCode: '000000040000015127',
+					materialDesc: '榄菊蚊香小盘Ф134mm×H100mm 36圈内增高塑料筒（有字盖）(2201)',
+					planDate: '2023-12-25',
+					planNumber: 3000.0,
+					outNumber: 3000.0,
+					locCode: 'WH02',
+					productionLineCode: 'LJ8',
+					orderStatus: '3',
+					userDefined1: '20231225154549',
+					userDefined2: '00001',
+					userDefined3: '',
+					userDefined10: '1',
+					createDate: '2023-12-25',
+					id: '18d2af6969e0405ba202a5c09bc14f33',
+					active: '1',
+					unit: 'ST',
+					list: [
+						{
+							createBy: 'admin',
+							siteCode: '1000',
+							produceCode: '000100305998',
+							materialCode: '000000040000015127',
+							materialDesc: '榄菊蚊香小盘Ф134mm×H100mm 36圈内增高塑料筒（有字盖）(2201)',
+							planDate: '2023-12-25',
+							planNumber: 3000.0,
+							outNumber: 3000.0,
+							locCode: 'WH02',
+							productionLineCode: 'LJ8',
+							orderStatus: '3',
+							userDefined1: '20231225154549',
+							userDefined2: '00001',
+							userDefined3: '',
+							userDefined10: '1',
+							createDate: '2023-12-25',
+							id: '18d2af6969e0405ba202a5c09bc14f331',
+							active: '1',
+							unit: 'ST',
+						},
+						{
+							createBy: 'admin',
+							siteCode: '1000',
+							produceCode: '000100305998',
+							materialCode: '000000040000015127',
+							materialDesc: '榄菊蚊香小盘Ф134mm×H100mm 36圈内增高塑料筒（有字盖）(2201)',
+							planDate: '2023-12-25',
+							planNumber: 3000.0,
+							outNumber: 3000.0,
+							locCode: 'WH02',
+							productionLineCode: 'LJ8',
+							orderStatus: '3',
+							userDefined1: '20231225154549',
+							userDefined2: '00001',
+							userDefined3: '',
+							userDefined10: '1',
+							createDate: '2023-12-25',
+							id: '18d2af6969e0405ba202a5c09bc14f332',
+							active: '1',
+							unit: 'ST',
+						},
+					],
+				},
+				{
+					createBy: 'admin',
+					siteCode: '1000',
+					produceCode: '000100305998',
+					materialCode: '000000040000015127',
+					materialDesc: '榄菊蚊香小盘Ф134mm×H100mm 36圈内增高塑料筒（有字盖）(2201)',
+					planDate: '2023-12-25',
+					planNumber: 3000.0,
+					outNumber: 3000.0,
+					locCode: 'WH02',
+					productionLineCode: 'LJ8',
+					orderStatus: '3',
+					userDefined1: '20231225154549',
+					userDefined2: '00001',
+					userDefined3: '',
+					userDefined10: '1',
+					createDate: '2023-12-25',
+					id: '18d2af6969e0405ba202a5c09bc14f32',
+					active: '1',
+					unit: 'ST',
+				},
+			],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -306,12 +392,18 @@ export default {
 			return index + 1;
 		},
 		getList() {
-			this.loading = true;
-			listOutorder(this.queryParams).then(response => {
-				this.outorderList = response.rows;
-				this.total = response.total;
 			this.loading = false;
+			this.outorderList.forEach((item, index) => {
+				item.index = index + 1
 			});
+			// listOutorder(this.queryParams).then(response => {
+			// 	this.outorderList = response.rows;
+			// 	this.outorderList.forEach((item,index) => {
+			// 		item.index = index+1
+			// 	});
+			// 	this.total = response.total;
+			// 	this.loading = false;
+			// });
 		},
 		getList1() {
 			this.loading = true;

vue.config.js

@@ -35,8 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
+        target: `http://localhost:8080`,
         // target: `http://192.168.3.93:8080`,
-        target: `http://192.168.3.158:8080`,
+        // target: `http://192.168.3.158:8080`,
         // target: `http://192.168.202.34:30000`,
         changeOrigin: true,
         pathRewrite: {