xiaol 8 months ago
parent
commit
93fe623e00
6 changed files with 1203 additions and 673 deletions
  1. 407 165
      package-lock.json
  2. 363 0
      src/pages/erp/in/addInList.vue
  3. 53 98
      src/pages/erp/in/index.vue
  4. 51 90
      src/pages/erp/out/index.vue
  5. 9 0
      src/router/modules/erp.js
  6. 320 320
      yarn.lock

File diff suppressed because it is too large
+ 407 - 165
package-lock.json


+ 363 - 0
src/pages/erp/in/addInList.vue

@@ -0,0 +1,363 @@
+<template>
+	<div class="form-submit">
+		<div class="i-layout-page-header">
+			<PageHeader class="product_tabs" hidden-breadcrumb>
+				<div slot="title">
+					<router-link :to="{ path: `${roterPre}/erp/in_list` }">
+						<!-- <Button icon="ios-arrow-back" size="small" class="mr20"
+              >返回</Button
+            > -->
+						<div class="font-sm after-line">
+							<span class="iconfont iconfanhui"></span>
+							<span class="pl10">返回</span>
+						</div>
+					</router-link>
+					<span v-text="
+              $route.params.id !== '0' ? '添加入库单' : '添加入库单'
+            " class="mr20 ml16"></span>
+				</div>
+			</PageHeader>
+		</div>
+		<Card :bordered="false" dis-hover class="ivu-mt">
+			<Form class="formValidate mt20" ref="formValidate" :model="formValidate"
+				:label-width="labelWidth" :label-position="labelPosition" @submit.native.prevent>
+				<Row :gutter="24" type="flex">
+					<Col span="24">
+						<FormItem label="采购单号:" prop="orderNumber">
+							<Input v-model="formValidate.orderNumber" placeholder="请输入采购单号" v-width="'400'" @keyup.enter.native="getGoods" @submit.native.prevent />
+						</FormItem>
+					</Col>
+					<Col span="24">
+						<FormItem label="运费:" prop="freight">
+							<Input v-model="formValidate.freight" placeholder="请输入运费" v-width="'400'" />
+						</FormItem>
+					</Col>
+					<Col span="24" v-if="goodsList.length > 0">
+						<FormItem label="商品:">
+							<Table :columns="columns" :data="goodsList" ref="table" :loading="loading"
+								no-userFrom-text="暂无数据" no-filtered-userFrom-text="暂无筛选结果">
+								<template slot-scope="{ row,index }" slot="product_name">{{row.product_name}}</template>
+								<template slot-scope="{ row,index }" slot="unit_name">{{row.unit_name}}</template>
+								<template slot-scope="{ row,index }" slot="price">{{row.price}}</template>
+								<template slot-scope="{ row,index }" slot="pur_num">
+									<Input v-model="goodsList[index].pur_num" placeholder="请输入数量" v-width="'150'" type="number"/>
+								</template>
+								<template slot-scope="{ row,index }" slot="tare_weight">
+									<Input v-if="row.is_weigh == 1" v-model="goodsList[index].tare_weight" :placeholder="'请输入商品毛重('+row.p_unit_name+')'" v-width="'150'" type="number"/>
+									<div v-else>/</div>
+								</template>
+								<template slot-scope="{ row,index }" slot="net_weight">
+									<Input v-if="row.is_weigh == 1" v-model="goodsList[index].net_weight" :placeholder="'请输入商品净重('+row.p_unit_name+')'" v-width="'150'" type="number"/>
+									<div v-else>/</div>
+								</template>
+								<template slot-scope="{ row,index }" slot="timeValue">
+									<el-date-picker v-model="row.timeValue" type="date" size="mini" style="width: 150px;"
+									placeholder="选择日期" @change="changeTime($event,row,index)" ></el-date-picker>
+								</template>
+								<template slot-scope="{ row,index }" slot="bin_number">
+									<div v-if="row.bin_number">{{goodsList[index].bin_number}}</div>
+									<div v-else>
+										<Select v-model="goodsList[index].bin_number_value" style="width:150px">
+											<Option v-for="item in binList" :value="item.bin_number" :key="item.bin_number">
+												{{ item.bin_number }}</Option>
+										</Select>
+									</div>
+								</template>
+							</Table>
+						</FormItem>
+					</Col>
+				</Row>
+			</Form>
+		</Card>
+		<Card :bordered="false" dis-hover class="fixed-card"
+			:style="{ left: `${!menuCollapse ? '200px' : isMobile ? '0' : '80px'}` }">
+			<Form>
+				<FormItem>
+					<Button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</Button>
+				</FormItem>
+			</Form>
+		</Card>
+	</div>
+</template>
+
+<script>
+	import { mapState,mapMutations } from "vuex";
+	import Setting from "@/setting";
+	import { getPurchaseId,batch_save,position,createRuku } from "@/api/erp";
+	import { formatDate } from "@/utils/validate";
+	export default {
+		name: "addInList",
+		data() {
+			return {
+				loading: false,
+				roterPre: Setting.roterPre,
+				columns: [{
+						title: '商品名称',
+						key: 'product_name',
+						minWidth: 180
+					},
+					{
+						title: '单位',
+						slot: 'unit_name',
+						minWidth: 90
+					},
+					{
+						title: '单价',
+						slot: 'price',
+						minWidth: 90
+					},
+					{
+						title: '数量',
+						slot: 'pur_num',
+						minWidth: 150
+					},
+					
+					{
+						title: '毛重',
+						slot: 'tare_weight',
+						minWidth: 150
+					},
+					{
+						title: '净重',
+						slot: 'net_weight',
+						minWidth: 150
+					},
+					{
+						title: '批次',
+						slot: 'timeValue',
+						minWidth: 150
+					},
+					{
+						title: '仓位',
+						slot: 'bin_number',
+						minWidth: 150
+					},
+				],
+				formValidate: {
+					id: 0,
+					orderNumber:'',
+					freight:'',
+					goods: [],
+				},
+				info:'',//采购单信息
+				goodsList:[],//采购单商品
+				binList:[],//仓位列表
+			};
+		},
+		computed: {
+			...mapState("admin/layout", ["isMobile", "menuCollapse"]),
+			labelWidth() {
+				return this.isMobile ? undefined : 120;
+			},
+			labelPosition() {
+				return this.isMobile ? "top" : "right";
+			},
+		},
+		created() {
+			this.getGodownList()
+			let data = {
+				pid: 0
+			}
+		},
+		mounted() {
+			if (this.$route.query.id != 0) {
+				// this.getWantInfo(this.$route.query.id)
+			}
+		},
+		methods: {
+			//提交数据
+			handleSubmit(name) {
+				if(this.formValidate.id == 0) {
+					if(!this.formValidate.freight){
+						this.$Message.error("请输入运费");
+						return;
+					}
+					for (var i = 0; i < this.goodsList.length; i ++) {
+						if(this.goodsList[i].is_weigh == 1){
+							if(this.goodsList[i].tare_weight == '' || this.goodsList[i].tare_weight == null){
+								this.$Message.error("请输入商品毛重");
+								return;
+							}
+							if(this.goodsList[i].net_weight == ''|| this.goodsList[i].net_weight == null){
+								this.$Message.error("请输入商品净重");
+								return;
+							}
+						}
+					}
+				}else {
+					
+				}
+				let list = []
+				let total_num = 0
+				let total_price = 0
+				this.goodsList.forEach(item => {
+					total_num += Number(item.net_weight)
+					total_price += Number(item.total_price)
+					list.push({
+						batch_code:item.batch_code,
+						bin_number:item.bin_number,
+						bar_code:item.bar_code,
+						net_weight:item.net_weight,
+						product_code:item.product_code,
+						product_id:item.product_id,
+						product_name:item.product_name,
+						product_num:item.pur_num,
+						tare_weight:item.tare_weight,
+						unit_name:item.unit_name,
+						unit_type:item.unit_type,
+						wid:item.wid,
+						price:item.price,
+						total_price:item.total_price,
+						is_weigh:item.is_weigh,
+						rate:item.unit_type == 1?item.p_unit_rate_1:item.unit_type == 2?item.p_unit_rate_2:1,
+						shelf_life:item.shelf_life,
+					})
+				})
+				createRuku({
+					info:list,
+					total_num:total_num,
+					total_price:total_price,
+					freight:this.formValidate.freight,
+					purchase_order_id:this.formValidate.orderNumber,
+					wid:this.info.wid
+				},0).then(res => {
+					if(res.status == 200){
+						this.$Message.success(res.msg);
+						this.$router.push({
+							path: this.roterPre + "/erp/in_list"
+						});
+					}
+				}).catch(err => {
+					this.$Message.error(err.msg);
+				})
+			},
+			//根据采购单号获取商品
+			getGoods() {
+				getPurchaseId(this.formValidate.orderNumber).then(res => {
+					if(res.status == 200){
+						this.info = res.data
+						this.info.info.forEach(item => {
+							item.batch_code = ''
+							item.tare_weight = ''
+							item.net_weight = ''
+							item.timeValue = ''
+							item.bin_number_value = ''
+						})
+						this.goodsList = this.info.info
+						this.getBin()
+						console.log(this.goodsList,'this.goodsList')
+					}else{
+						this.$Message.error(res.msg);
+					}
+				})
+			},
+			//选择批次的时间
+			changeTime(value,row,index){
+				console.log(value,row,index,'value,row,index')
+				let time = formatDate(value, "yyyy-MM-dd")
+				this.goodsList[index].timeValue = time
+				console.log(this.goodsList[index].timeValue,'this.goodsList[index].timeValue')
+				batch_save({
+					product_id:row.product_id,
+					bar_code:row.bar_code,
+					production_date:time
+				}).then(res => {
+					if(res.status == 200){
+						this.goodsList[index].batch_code = res.data.batch_code
+					}else{
+						this.$Message.error(res.msg);
+					}
+				})
+			},
+			//获取仓位列表
+			getBin(){
+				position({
+					page:1,
+					limit:10000,
+					wid:this.info.wid,
+					not_used:1
+				}).then(res => {
+					if(res.status == 200){
+						this.binList = res.data.data
+					}else{
+						this.$Message.error(res.msg);
+					}
+				})
+			},
+		},
+	};
+</script>
+
+<style scoped lang="stylus">
+	.table {
+		/deep/.ivu-table-header table {
+			border: 0 !important;
+		}
+
+		/deep/.ivu-table-header thead tr th:nth-of-type(1) {
+			padding-left: 16px;
+		}
+
+		/deep/.ivu-table td:nth-of-type(1) {
+			padding-left: 16px;
+		}
+
+		/deep/.ivu-table-cell {
+			padding: 0 !important;
+		}
+
+		/deep/.ivu-table-border th,
+		/deep/.ivu-table-border td {
+			border-right: unset;
+		}
+
+		/deep/.ivu-table td {
+			height: 59px;
+		}
+	}
+
+	.form-submit {
+		/deep/.ivu-card {
+			border-radius: 0;
+		}
+
+		margin-bottom: 79px;
+
+		.fixed-card {
+			position: fixed;
+			right: 0;
+			bottom: 0;
+			left: 200px;
+			z-index: 99;
+			box-shadow: 0 -1px 2px rgb(240, 240, 240);
+
+			/deep/ .ivu-card-body {
+				padding: 15px 16px 14px;
+			}
+
+			.ivu-form-item {
+				margin-bottom: 0;
+			}
+
+			/deep/ .ivu-form-item-content {
+				margin-right: 124px;
+				text-align: center;
+			}
+
+			.ivu-btn {
+				height: 36px;
+				padding: 0 20px;
+			}
+		}
+	}
+
+	.after-line {
+		display: inline-block;
+		position: relative;
+		margin-right: 16px;
+	}
+
+	.ml16 {
+		margin-left: 16px;
+	}
+</style>

+ 53 - 98
src/pages/erp/in/index.vue

@@ -8,49 +8,23 @@
 				<!-- 查询条件 -->
 				<Form ref="tableFrom" inline :model="tableFrom" :label-width="labelWidth"
 					:label-position="labelPosition" @submit.native.prevent>
-					<!-- <FormItem label="创建时间:" label-for="user_time">
-            <DatePicker
-                :editable="false"
-                @on-change="onchangeTime"
-                :value="timeVal"
-                format="yyyy/MM/dd"
-                type="datetimerange"
-                placement="bottom-start"
-                placeholder="自定义时间"
-                class="mr20 input-add"
-                :options="options"
-            ></DatePicker>
-          </FormItem> -->
-					<!-- <FormItem label="上架状态:">
-            <Select
-                placeholder="请选择"
-                clearable
-                class="input-add"
-                v-model="tableFrom.is_show"
-            >
-              <Option value="1">上架</Option>
-              <Option value="0">下架</Option>
-            </Select>
-          </FormItem> -->
-					<FormItem label="仓位搜索:" label-for="store_name">
-						<Input class="input-add mr14" placeholder="请输入仓位名称" v-model="tableFrom.key" />
-						<Button type="primary" @click="tableSearchs()">查询</Button>
+					<FormItem label="状态:" label-for="status">
+						<Select v-model="tableFrom.status" placeholder="请选择" clearable @on-change="userSearchs"
+							class="input-add">
+							<Option value="-3">全部</Option>
+							<Option value="0">待审核</Option>
+							<Option value="1">通过</Option>
+							<Option value="2">部分完成</Option>
+							<Option value="3">完成</Option>
+							<Option value="-1">拒绝</Option>
+						</Select>
 					</FormItem>
-					<!-- <Button
-            v-auth="['marketing-store_seckill-create']"
-            type="primary"
-            icon="md-add"
-            @click="addMore"
-            class="mr10"
-            >批量添加积分商品</Button
-          > -->
-					<!--<Button v-auth="['export-storeSeckill']" class="export" icon="ios-share-outline" @click="exports">导出</Button>-->
 				</Form>
 			</div>
 		</Card>
 		<Card :bordered="false" dis-hover class="ivu-mt">
 			<!-- 操作 -->
-			<Button v-auth="['admin-erp-add_position']" type="primary" @click="add" class="mr10">创建入库单</Button>
+			<Button v-auth="['marketing-store_seckill-create']" type="primary" @click="add" class="mr10">创建入库单</Button>
 			<!-- 积分商品-表格 -->
 			<Table :columns="columns1" :data="tableList" :loading="loading" highlight-row no-userFrom-text="暂无数据"
 				no-filtered-userFrom-text="暂无筛选结果" class="ivu-mt">
@@ -100,17 +74,24 @@
 					<div>手机:{{row.tstore.phone}}</div>
 					<!-- <div>地址:{{row.tstore.detailed_address}}</div> -->
 				</template>
+				<template slot-scope="{ row, index }" slot="status">
+					<Tag color="default" v-if="row.status == 0">待审核</Tag>
+					<Tag color="primary" v-if="row.status == 1">通过</Tag>
+					<Tag color="success" v-if="row.status == 3">完成</Tag>
+					<Tag color="error" v-if="row.status == -1">拒绝</Tag>
+					<Tag color="warning" v-if="row.status == 2">部分完成</Tag>
+				</template>
 				<template slot-scope="{ row, index }" slot="create_time">
-					<div>{{row.create_time|formatDate}}</div>
+					<div>{{row.create_time | formatDate}}</div>
 				</template>
-				<template slot-scope="{ row, index }" slot="action">
+				<!-- <template slot-scope="{ row, index }" slot="action">
 					<a @click="edit(row)">编辑</a>
 					<Divider type="vertical" />
 					<a @click="del(row, '删除仓位', index)">删除</a>
-				</template>
+				</template> -->
 			</Table>
 			<div class="acea-row row-right page">
-				<Page :total="total" :current="tableFrom.page" show-elevator show-total @on-change="pageChange"
+				<Page :total="tableFrom.total" :current="tableFrom.page" show-elevator show-total @on-change="pageChange"
 					:page-size="tableFrom.limit" />
 			</div>
 		</Card>
@@ -118,23 +99,9 @@
 </template>
 
 <script>
-	import {
-		mapState
-	} from "vuex";
-	import {
-		integralProductListApi,
-		integralIsShowApi,
-		storeSeckillApi,
-	} from "@/api/marketing";
-	import {
-		getPositionList,
-		getUserInfo,
-		getInList,
-		getOutSimpleList
-	} from "@/api/erp";
-	import {
-		formatDate
-	} from "@/utils/validate";
+	import { mapState } from "vuex";
+	import { getInList } from "@/api/erp";
+	import { formatDate } from "@/utils/validate";
 	import timeOptions from "@/utils/timeOptions";
 	import Setting from "@/setting";
 	export default {
@@ -143,7 +110,7 @@
 			formatDate(time) {
 				if (time !== 0) {
 					let date = new Date(time * 1000);
-					return formatDate(date, "yyyy-MM-dd hh:mm");
+					return formatDate(date, "yyyy-MM-dd");
 				}
 			},
 		},
@@ -183,6 +150,11 @@
 						key: "total_price",
 						minWidth: 90,
 					},
+					{
+						title: "审核状态",
+						slot: "status",
+						minWidth: 200,
+					},
 					{
 						title: "创建时间",
 						slot: "create_time",
@@ -196,24 +168,13 @@
 					},
 				],
 				tableList: [],
-				timeVal: [],
-				grid: {
-					xl: 7,
-					lg: 10,
-					md: 12,
-					sm: 24,
-					xs: 24,
-				},
 				tableFrom: {
-					// integral_time: "",
-					// is_show: "",
-					// store_name: "",
-					type: 0,
 					key: '',
 					page: 1,
 					limit: 10,
+					status:-3,
+					total: 0,
 				},
-				total: 0,
 			};
 		},
 		computed: {
@@ -229,16 +190,30 @@
 			this.getList();
 		},
 		methods: {
-			onClickTab(e) {
-				console.log(e);
-				this.current = e
-				this.tableList = []
-				this.getList()
+			// 列表
+			getList() {
+				this.loading = true;
+				getInList(this.tableFrom)
+					.then(async (res) => {
+						let data = res.data;
+						this.tableList = data.data;
+						this.tableFrom.total = data.count;
+						this.loading = false;
+					})
+					.catch((res) => {
+						this.loading = false;
+						this.$Message.error(res.msg);
+					});
+			},
+			userSearchs(e) {
+				this.tableFrom.status = e
+				this.tableFrom.page = 1;
+				this.getList();
 			},
 			// 添加
 			add() {
 				this.$router.push({
-					path: this.roterPre + "/erp/add_position?id=0"
+					path: this.roterPre + "/erp/add_inList?id=0"
 				});
 			},
 			addMore() {
@@ -305,21 +280,6 @@
 						this.$Message.error(res.msg);
 					});
 			},
-			// 列表
-			getList() {
-				this.loading = true;
-				getInList(this.tableFrom)
-					.then(async (res) => {
-						let data = res.data;
-						this.tableList = data.data;
-						this.total = data.count;
-						this.loading = false;
-					})
-					.catch((res) => {
-						this.loading = false;
-						this.$Message.error(res.msg);
-					});
-			},
 			pageChange(index) {
 				this.tableFrom.page = index;
 				this.getList();
@@ -329,11 +289,6 @@
 				this.tableFrom.page = 1;
 				this.getList();
 			},
-			// 具体日期
-			onchangeTime(e) {
-				this.timeVal = e;
-				this.tableFrom.integral_time = this.timeVal[0] ? this.timeVal.join("-") : "";
-			},
 			// 修改是否显示
 			onchangeIsShow(row) {
 				let data = {

+ 51 - 90
src/pages/erp/out/index.vue

@@ -8,43 +8,18 @@
 				<!-- 查询条件 -->
 				<Form ref="tableFrom" inline :model="tableFrom" :label-width="labelWidth"
 					:label-position="labelPosition" @submit.native.prevent>
-					<!-- <FormItem label="创建时间:" label-for="user_time">
-            <DatePicker
-                :editable="false"
-                @on-change="onchangeTime"
-                :value="timeVal"
-                format="yyyy/MM/dd"
-                type="datetimerange"
-                placement="bottom-start"
-                placeholder="自定义时间"
-                class="mr20 input-add"
-                :options="options"
-            ></DatePicker>
-          </FormItem> -->
-					<!-- <FormItem label="上架状态:">
-            <Select
-                placeholder="请选择"
-                clearable
-                class="input-add"
-                v-model="tableFrom.is_show"
-            >
-              <Option value="1">上架</Option>
-              <Option value="0">下架</Option>
-            </Select>
-          </FormItem> -->
-					<FormItem label="仓位搜索:" label-for="store_name">
-						<Input class="input-add mr14" placeholder="请输入仓位名称" v-model="tableFrom.key" />
-						<Button type="primary" @click="tableSearchs()">查询</Button>
-					</FormItem>
-					<!-- <Button
-            v-auth="['marketing-store_seckill-create']"
-            type="primary"
-            icon="md-add"
-            @click="addMore"
-            class="mr10"
-            >批量添加积分商品</Button
-          > -->
-					<!--<Button v-auth="['export-storeSeckill']" class="export" icon="ios-share-outline" @click="exports">导出</Button>-->
+					<Form ref="tableFrom" inline :model="tableFrom" :label-width="labelWidth"
+						:label-position="labelPosition" @submit.native.prevent>
+						<FormItem label="状态:" label-for="status">
+							<Select v-model="tableFrom.status" placeholder="请选择" clearable @on-change="userSearchs"
+								class="input-add">
+								<Option value="-3">全部</Option>
+								<Option value="0">待审核</Option>
+								<Option value="1">通过</Option>
+								<Option value="-1">拒绝</Option>
+							</Select>
+						</FormItem>
+					</Form>
 				</Form>
 			</div>
 		</Card>
@@ -52,8 +27,8 @@
 			<div class="new_tab">
 			  <Tabs v-model="currentTab" @on-click="onClickTab">
 			    <TabPane label="门店订单" name="0" />
-			    <TabPane label="库间流转" name="1" />
-				<TabPane label="商品在途" name="2" />
+			    <TabPane label="库间流转" name="2" />
+				<TabPane label="商品在途" name="1" />
 			  </Tabs>
 			</div>
 			<!-- 操作 -->
@@ -125,23 +100,9 @@
 </template>
 
 <script>
-	import {
-		mapState
-	} from "vuex";
-	import {
-		integralProductListApi,
-		integralIsShowApi,
-		storeSeckillApi,
-	} from "@/api/marketing";
-	import {
-		getPositionList,
-		getUserInfo,
-		getOutList,
-		getOutSimpleList
-	} from "@/api/erp";
-	import {
-		formatDate
-	} from "@/utils/validate";
+	import {mapState} from "vuex";
+	import {getOutSimpleList,getReceiveList} from "@/api/erp";
+	import {formatDate} from "@/utils/validate";
 	import timeOptions from "@/utils/timeOptions";
 	import Setting from "@/setting";
 	export default {
@@ -223,19 +184,8 @@
 					},
 				],
 				tableList: [],
-				timeVal: [],
-				grid: {
-					xl: 7,
-					lg: 10,
-					md: 12,
-					sm: 24,
-					xs: 24,
-				},
 				tableFrom: {
-					// integral_time: "",
-					// is_show: "",
-					// store_name: "",
-					type: 0,
+					status:-3,
 					key: '',
 					page: 1,
 					limit: 10,
@@ -256,12 +206,44 @@
 			this.getList();
 		},
 		methods: {
+			//切换订单  
 			onClickTab(e) {
 				console.log(e);
-				this.current = e
+				this.currentTab = e //current0 门店收货  2库建流转 1商品在途
 				this.tableList = []
 				this.getList()
 			},
+			//切换状态
+			userSearchs(e) {
+				this.tableFrom.status = e
+				this.tableFrom.page = 1;
+				this.getList();
+			},
+			// 列表
+			getList() {
+				this.loading = true;
+				let getList = getReceiveList;
+				console.log(this.currentTab,'this.currentTab')
+				if(this.currentTab == 1 || this.currentTab == 2) {
+					this.tableFrom.type = this.currentTab
+					getList = getOutSimpleList
+				}
+				if(this.currentTab == 0){
+					getList = getReceiveList
+				}
+				console.log(this.tableFrom,'this.tableFrom')
+				getList(this.tableFrom)
+					.then(async (res) => {
+						let data = res.data;
+						this.tableList = data.data;
+						this.total = data.count;
+						this.loading = false;
+					})
+					.catch((res) => {
+						this.loading = false;
+						this.$Message.error(res.msg);
+					});
+			},
 			// 添加
 			add() {
 				this.$router.push({
@@ -332,27 +314,6 @@
 						this.$Message.error(res.msg);
 					});
 			},
-			// 列表
-			getList() {
-				this.loading = true;
-				let getList = getOutList;
-				this.tableFrom.type = this.current
-				if(this.current == 1 || this.current == 2) {
-					getList = getOutSimpleList
-					
-				}
-				getList(this.tableFrom)
-					.then(async (res) => {
-						let data = res.data;
-						this.tableList = data.data;
-						this.total = data.count;
-						this.loading = false;
-					})
-					.catch((res) => {
-						this.loading = false;
-						this.$Message.error(res.msg);
-					});
-			},
 			pageChange(index) {
 				this.tableFrom.page = index;
 				this.getList();

+ 9 - 0
src/router/modules/erp.js

@@ -93,6 +93,15 @@ export default {
 			},
 			component: () => import('@/pages/erp/in/index')
 		},
+		{
+			path:'add_inList',
+			name: `${pre}add_inList`,
+			meta: {
+				auth: ['admin-erp-add_inList'],
+				title: '添加入库'
+			},
+			component: () => import('@/pages/erp/in/addInList')
+		},
 		{
 			path:'adjust_list',
 			name: `${pre}in_list`,

File diff suppressed because it is too large
+ 320 - 320
yarn.lock


Some files were not shown because too many files changed in this diff