shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2024-12-29 11:33:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

备份

Browse source
This commit is contained in:
shawnzhang 2019-03-11 09:38:45 +08:00
parent 2f32a796a9
commit 0e0d15d87f
4 changed files with 37 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lang/zh.js
View file

@ -358,6 +358,19 @@ export default {
createName: '登记人',
createTime: '登记日期'
},
Stockenter: {
title: '入库单主题',
sourceNumber: '源单编号',
enterNumber: '入库单编号',
deliveryPersonId: '交货人',
acceptPersonId: '验收人',
enterDeptId: '入库部门',
enterRepositoryId: '入库门店',
receiptStat: '单据状态',
beginTime: '开始时间',
endTime: '结束时间',
repositoryId: '仓库'
},
public: {
uploadimage: '上传',
address: '地址',

2
src/router/index.js
View file

@ -449,7 +449,7 @@ export const asyncRouterMap = [
path: 'Stockenterlist',
component: () => import('@/views/Stockenter/Stockenterlist'),
name: 'Stockenterlist',
meta: { title: 'Stockenterlist', noCache: false }
meta: { title: 'Stockenterlist', noCache: true }
}
]
},

29
src/views/BasicSettings/components/MyDialog.vue
View file

@ -14,7 +14,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('BasicSettings.type3')" prop="type" style="width: 40%;margin-top:1%">
<el-select v-model="personalForm.type" placeholder="请选择单据类型" filterable style="width: 100%;">
<el-select v-model="personalForm.type" placeholder="请选择单据类型" filterable style="width: 100%;" disabled>
<el-option v-for="(item, index) in categorys" :key="index" :value="item.id" :label="item.categoryName"/>
</el-select>
</el-form-item>
@ -24,35 +24,12 @@
<el-option label="不发送" value="2"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('BasicSettings.process_name')" prop="process_name" style="width: 40%;margin-top:1%">
<el-form-item :label="$t('BasicSettings.effect_region')" prop="process_name" style="width: 40%;margin-top:1%">
<el-input v-model="personalForm.regionName" disabled/>
</el-form-item>
<el-form-item :label="$t('BasicSettings.effect_region')" style="width: 40%;margin-top: 1%">
<el-cascader
:options="regions"
:props="props"
v-model="region"
:show-all-levels="false"
placeholder="请选择区域"
change-on-select
filterable
clearable
style="width: 100%;"
@change="handlechange4"
/>
</el-form-item>
<el-form-item :label="$t('BasicSettings.process_name')" prop="process_name" style="width: 40%;margin-top:1%">
<el-form-item :label="$t('BasicSettings.effect_repository')" prop="process_name" style="width: 40%;margin-top:1%">
<el-input v-model="personalForm.repositoryName" disabled/>
</el-form-item>
<el-form-item :label="$t('BasicSettings.effect_repository')" style="width: 40%;margin-top: 1%">
<el-select v-model="personalForm.effect_repository" placeholder="请选择门店" style="width: 100%;">
<el-option
v-for="(item, index) in repositories"
:key="index"
:label="item.repositoryName"
:value="item.id"/>
</el-select>
</el-form-item>
</el-form>
</div>
<!--辅助信息-->

51
src/views/Stockenter/Stockenterlist.vue
View file

@ -2,16 +2,10 @@
<div class="ERP-container">
<div class="filter-container">
<!-- 搜索条件栏目 -->
<el-input v-model="getemplist.id" :placeholder="$t('Supplier.id')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.supplierName" :placeholder="$t('Supplier.supplierName')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-select v-model="getemplist.typeId" :value="getemplist.typeId" placeholder="请选择供应商" class="filter-item" clearable>
<el-option
v-for="(item, index) in typeIds"
:key="index"
:label="item.categoryName"
:value="item.id"
/>
</el-select>
<el-input v-model="getemplist.title" :placeholder="$t('Stockenter.title')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.enterNumber" :placeholder="$t('Stockenter.enterNumber')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.deliveryPersonId" :placeholder="$t('Stockenter.deliveryPersonId')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.acceptPersonId" :placeholder="$t('Stockenter.acceptPersonId')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<!-- 更多搜索条件下拉栏 -->
<el-popover
placement="bottom"
@ -54,9 +48,9 @@
</el-dropdown-menu>
</el-dropdown>
<!-- 新建分组 -->
<el-button v-waves class="filter-item" type="primary" style="width: 100px" @click="handleGroup">{{ $t('Supplier.supplierGroup') }}</el-button>
<el-button v-waves class="filter-item" type="primary" style="width: 100px" @click="handleGroup">{{ $t('Stockenter.StockenterGroup') }}</el-button>
<el-dialog :visible.sync="GroupVisible" title="新建分组" width="35%">
<el-input v-model="groupName" :placeholder="$t('Supplier.groupName')" class="filter-item" style="width: 40%;margin-left: -1px;float: left" clearable @keyup.enter.native="handleAddGroup"/>
<el-input v-model="groupName" :placeholder="$t('Stockenter.groupName')" class="filter-item" style="width: 40%;margin-left: -1px;float: left" clearable @keyup.enter.native="handleAddGroup"/>
<el-button v-waves class="filter-item" type="success" style="width: 86px;float: left" @click="handleAddGroup">{{ $t('public.add') }}</el-button>
<el-table :data="groupData" border>
<el-table-column property="id" label="编号" align="center" width="150"/>
@ -90,47 +84,47 @@
type="selection"
width="55"
align="center"/>
<el-table-column :label="$t('Supplier.id')" :resizable="false" prop="id" align="center" width="150">
<el-table-column :label="$t('Stockenter.id')" :resizable="false" prop="id" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.id }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('Supplier.supplierName')" :resizable="false" prop="supplierName" align="center" width="150">
<el-table-column :label="$t('Stockenter.StockenterName')" :resizable="false" prop="StockenterName" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.supplierName }}</span>
<span>{{ scope.row.StockenterName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('Supplier.supplierShortName')" :resizable="false" prop="supplierShortName" align="center" width="150">
<el-table-column :label="$t('Stockenter.StockenterShortName')" :resizable="false" prop="StockenterShortName" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.supplierShortName }}</span>
<span>{{ scope.row.StockenterShortName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('Supplier.typeId')" :resizable="false" align="center" width="150">
<el-table-column :label="$t('Stockenter.typeId')" :resizable="false" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.typeName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('Supplier.regionId')" :resizable="false" prop="regionName" align="center" width="150">
<el-table-column :label="$t('Stockenter.regionId')" :resizable="false" prop="regionName" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.regionName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('Supplier.buyerId')" :resizable="false" prop="buyerName" align="center" width="150">
<el-table-column :label="$t('Stockenter.buyerId')" :resizable="false" prop="buyerName" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.buyerName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('Supplier.levelId')" :resizable="false" prop="levelName" align="center" width="150">
<el-table-column :label="$t('Stockenter.levelId')" :resizable="false" prop="levelName" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.levelName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('Supplier.createId')" :resizable="false" prop="createId" align="center" width="150">
<el-table-column :label="$t('Stockenter.createId')" :resizable="false" prop="createId" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.createName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('Supplier.createTime')" :resizable="false" prop="createTime" align="center" width="150">
<el-table-column :label="$t('Stockenter.createTime')" :resizable="false" prop="createTime" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
@ -195,13 +189,8 @@ export default {
tableKey: 0,
// 加载表格
listLoading: true,
// 供应商列表查询加展示参数
// 采购入库单列表查询加展示参数
getemplist: {
id: '',
supplierName: '',
typeId: '',
regionId: '',
levelId: '',
pagenum: 1,
pagesize: 10
},
@ -395,7 +384,7 @@ export default {
},
// 新增数据
handleAdd() {
this.$router.push('/EmployeeInformation/Supplier')
this.$router.push('/EmployeeInformation/Stockenter')
},
// 新建分组
handleGroup() {
@ -461,7 +450,7 @@ export default {
this.downloadLoading = true
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['供应商编号', '供应商名称', '供应商简称', '供应商类别', '所在区域', '采购员', '供应商优质级别', '建档人', '建档日期']
const filterVal = ['id', 'supplierName', 'supplierShortName', 'typeName', 'regionName', 'buyerName', 'levelName', 'createName', 'createTime']
const filterVal = ['id', 'StockenterName', 'StockenterShortName', 'typeName', 'regionName', 'buyerName', 'levelName', 'createName', 'createTime']
const data = this.formatJson(filterVal, this.list)
excel.export_json_to_excel({
header: tHeader,