xiaozhan
/
tobacco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

保税修改成烟草

Browse Source
dev
username 2 months ago
parent 318aa3ffbf
commit 1762b676b6
8 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File

2
bs-admin/src/main/java/com/bs/web/core/config/SwaggerConfig.java
Unescape View File

@ -113,7 +113,7 @@ public class SwaggerConfig
// 用ApiInfoBuilder进行定制 // 用ApiInfoBuilder进行定制
return new ApiInfoBuilder() return new ApiInfoBuilder()
// 设置标题 // 设置标题
.title("标题：保税仓库管理系统_接口文档") .title("标题：烟草管理系统_接口文档")
// 描述 // 描述
.description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
// 作者信息 // 作者信息

4
bs-ui/.env.development
Unescape View File

@ -1,10 +1,10 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 保税仓库管理系统 VUE_APP_TITLE = 烟草管理系统
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 保税仓库管理系统/开发环境 # 烟草管理系统/开发环境
#VUE_APP_BASE_API = 'http://124.71.134.146:8096/prod-api' #VUE_APP_BASE_API = 'http://124.71.134.146:8096/prod-api'
VUE_APP_BASE_API = 'http://localhost:8080' VUE_APP_BASE_API = 'http://localhost:8080'
# VUE_APP_BASE_API = 'http://tanjunwei.test.jiutianda.cn' # VUE_APP_BASE_API = 'http://tanjunwei.test.jiutianda.cn'

4
bs-ui/.env.production
Unescape View File

@ -1,8 +1,8 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 保税仓库管理系统 VUE_APP_TITLE = 烟草管理系统
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
# 保税仓库管理系统/生产环境 # 烟草管理系统/生产环境
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/prod-api'

4
bs-ui/.env.staging
Unescape View File

@ -1,10 +1,10 @@
# 页面标题 # 页面标题
VUE_APP_TITLE = 保税仓库管理系统 VUE_APP_TITLE = 烟草管理系统
NODE_ENV = production NODE_ENV = production
# 测试环境配置 # 测试环境配置
ENV = 'staging' ENV = 'staging'
# 保税仓库管理系统/测试环境 # 烟草管理系统/测试环境
VUE_APP_BASE_API = '/stage-api' VUE_APP_BASE_API = '/stage-api'

4
bs-ui/package.json
Unescape View File

@ -1,8 +1,8 @@
{ {
"name": "bs", "name": "bs",
"version": "3.8.6", "version": "3.8.6",
"description": "保税仓库管理系统", "description": "烟草管理系统",
"author": "保税仓库", "author": "烟草",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",

148
bs-ui/src/views/indexs/warehouse/index.vue
Unescape View File

@ -26,77 +26,77 @@
</div> </div>
</el-col> </el-col>
</el-row> --> </el-row> -->
<el-card class="box-card" :body-style="{ padding: '0px' }"> <!-- <el-card class="box-card" :body-style="{ padding: '0px' }">-->
<div slot="header" class="clearfix"> <!-- <div slot="header" class="clearfix">-->
<span>即将过期货物列表</span> <!-- <span>即将过期货物列表</span>-->
<el-button style="float: right; padding: 3px 0" type="text" @click="goMoreCargo">查看所有货物</el-button> <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="goMoreCargo">查看所有货物</el-button>-->
</div> <!-- </div>-->
<el-table v-if="cargoList.length" v-loading="cargoLoading" :data="cargoList" :show-header="true" <!-- <el-table v-if="cargoList.length" v-loading="cargoLoading" :data="cargoList" :show-header="true"-->
:row-class-name="tableRowClassName" @row-dblclick="cargoClick" height="400"> <!-- :row-class-name="tableRowClassName" @row-dblclick="cargoClick" height="400">-->
<el-table-column width="100" label="有效期至" prop="expiryDate" align="center"></el-table-column> <!-- <el-table-column width="100" label="有效期至" prop="expiryDate" align="center"></el-table-column>-->
<el-table-column width="100" label="货物" prop="cargoName" align="center"></el-table-column> <!-- <el-table-column width="100" label="货物" prop="cargoName" align="center"></el-table-column>-->
<el-table-column width="100" label="项号" prop="bookNumber" align="center"></el-table-column> <!-- <el-table-column width="100" label="项号" prop="bookNumber" align="center"></el-table-column>-->
<!-- <el-table-column width="100" label="库场" prop="stockName" align="center"></el-table-column>--> <!--&lt;!&ndash; <el-table-column width="100" label="库场" prop="stockName" align="center"></el-table-column>&ndash;&gt;-->
<el-table-column width="200" label="货主" show-overflow-tooltip prop="custName"></el-table-column> <!-- <el-table-column width="200" label="货主" show-overflow-tooltip prop="custName"></el-table-column>-->
<el-table-column width="150" label="船舶" prop="vesselName"></el-table-column> <!-- <el-table-column width="150" label="船舶" prop="vesselName"></el-table-column>-->
</el-table> <!-- </el-table>-->
<el-empty v-else> <!-- <el-empty v-else>-->
<el-button type="none" plain @click="getCargoList">刷新</el-button> <!-- <el-button type="none" plain @click="getCargoList">刷新</el-button>-->
</el-empty> <!-- </el-empty>-->
<el-pagination layout="prev, pager, next, jumper" :total="cargoTotal" small hide-on-single-page <!-- <el-pagination layout="prev, pager, next, jumper" :total="cargoTotal" small hide-on-single-page-->
:current-page.sync="cargoParam.pageNum" :page-size.sync="cargoParam.pageSize" @current-change="getCargoList" /> <!-- :current-page.sync="cargoParam.pageNum" :page-size.sync="cargoParam.pageSize" @current-change="getCargoList" />-->
</el-card> <!-- </el-card>-->
<el-card class="box-card" :body-style="{ padding: '0px' }"> <!-- <el-card class="box-card" :body-style="{ padding: '0px' }">-->
<div slot="header" class="clearfix"> <!-- <div slot="header" class="clearfix">-->
<span>出库提离即将到期单据列表</span> <!-- <span>出库提离即将到期单据列表</span>-->
<el-button style="float: right; padding: 3px 0" type="text" @click="goMoreBillCargo">查看所有出库单据</el-button> <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="goMoreBillCargo">查看所有出库单据</el-button>-->
</div> <!-- </div>-->
<el-table v-if="outBillCargoList.length" v-loading="outBillCargoLoading" :data="outBillCargoList" :show-header="true" <!-- <el-table v-if="outBillCargoList.length" v-loading="outBillCargoLoading" :data="outBillCargoList" :show-header="true"-->
:row-class-name="tableRowClassName" @row-dblclick="outBillCargoClick" height="400"> <!-- :row-class-name="tableRowClassName" @row-dblclick="outBillCargoClick" height="400">-->
<el-table-column width="100" label="有效期至" prop="expiryDate" align="center"></el-table-column> <!-- <el-table-column width="100" label="有效期至" prop="expiryDate" align="center"></el-table-column>-->
<el-table-column width="100" label="报关单号" prop="customsNo" align="center"></el-table-column> <!-- <el-table-column width="100" label="报关单号" prop="customsNo" align="center"></el-table-column>-->
<el-table-column width="100" label="货物" prop="cargoName" align="center"></el-table-column> <!-- <el-table-column width="100" label="货物" prop="cargoName" align="center"></el-table-column>-->
<el-table-column width="100" label="项号" prop="bookNumber" align="center"></el-table-column> <!-- <el-table-column width="100" label="项号" prop="bookNumber" align="center"></el-table-column>-->
<el-table-column width="100" label="单据编号" prop="billNumber" align="center"></el-table-column> <!-- <el-table-column width="100" label="单据编号" prop="billNumber" align="center"></el-table-column>-->
<el-table-column width="100" label="货物流向" prop="cargoFlow" align="center"></el-table-column> <!-- <el-table-column width="100" label="货物流向" prop="cargoFlow" align="center"></el-table-column>-->
<el-table-column width="200" label="货主" show-overflow-tooltip prop="custName"></el-table-column> <!-- <el-table-column width="200" label="货主" show-overflow-tooltip prop="custName"></el-table-column>-->
<el-table-column width="150" label="船舶" prop="vesselName"></el-table-column> <!-- <el-table-column width="150" label="船舶" prop="vesselName"></el-table-column>-->
</el-table> <!-- </el-table>-->
<el-empty v-else> <!-- <el-empty v-else>-->
<el-button type="none" plain @click="getOutBillCargo">刷新</el-button> <!-- <el-button type="none" plain @click="getOutBillCargo">刷新</el-button>-->
</el-empty> <!-- </el-empty>-->
<el-pagination layout="prev, pager, next, jumper" :total="outBillCargoTotal" small hide-on-single-page <!-- <el-pagination layout="prev, pager, next, jumper" :total="outBillCargoTotal" small hide-on-single-page-->
:current-page.sync="outBillCargoParam.pageNum" :page-size.sync="outBillCargoParam.pageSize" @current-change="getOutBillCargo" /> <!-- :current-page.sync="outBillCargoParam.pageNum" :page-size.sync="outBillCargoParam.pageSize" @current-change="getOutBillCargo" />-->
</el-card> <!-- </el-card>-->
<el-card class="box-card" :body-style="{ padding: '0px' }"> <!-- <el-card class="box-card" :body-style="{ padding: '0px' }">-->
<div slot="header" class="clearfix"> <!-- <div slot="header" class="clearfix">-->
<span>即将过期仓库列表</span> <!-- <span>即将过期仓库列表</span>-->
<el-button style="float: right; padding: 3px 0" type="text" @click="goMoreStock">查看所有仓库</el-button> <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="goMoreStock">查看所有仓库</el-button>-->
</div> <!-- </div>-->
<el-table v-if="stockList.length" v-loading="stockLoading" :data="stockList" :row-class-name="tableRowClassName" <!-- <el-table v-if="stockList.length" v-loading="stockLoading" :data="stockList" :row-class-name="tableRowClassName"-->
@row-dblclick="stockClick" height="400"> <!-- @row-dblclick="stockClick" height="400">-->
<el-table-column width="100" label="有效期至" prop="validityEnd" align="center"></el-table-column> <!-- <el-table-column width="100" label="有效期至" prop="validityEnd" align="center"></el-table-column>-->
<el-table-column width="150" label="仓库代码" prop="stockCode" align="center"></el-table-column> <!-- <el-table-column width="150" label="仓库代码" prop="stockCode" align="center"></el-table-column>-->
<el-table-column label="仓库" prop="stockName" align="center"></el-table-column> <!-- <el-table-column label="仓库" prop="stockName" align="center"></el-table-column>-->
<el-empty slot="empty"> <!-- <el-empty slot="empty">-->
<el-button type="none" plain @click="getStockList">刷新</el-button> <!-- <el-button type="none" plain @click="getStockList">刷新</el-button>-->
</el-empty> <!-- </el-empty>-->
</el-table> <!-- </el-table>-->
<el-empty v-else> <!-- <el-empty v-else>-->
<el-button type="none" plain @click="getCargoList">刷新</el-button> <!-- <el-button type="none" plain @click="getCargoList">刷新</el-button>-->
</el-empty> <!-- </el-empty>-->
<el-pagination layout="prev, pager, next, jumper" :total="stockTotal" small hide-on-single-page <!-- <el-pagination layout="prev, pager, next, jumper" :total="stockTotal" small hide-on-single-page-->
:current-page.sync="stockParam.pageNum" :page-size.sync="stockParam.pageSize" @current-change="getStockList" /> <!-- :current-page.sync="stockParam.pageNum" :page-size.sync="stockParam.pageSize" @current-change="getStockList" />-->
</el-card> <!-- </el-card>-->
<el-dialog title="查看即将过期货物详情" width="70%" :visible.sync="openCargo" append-to-body> <!-- <el-dialog title="查看即将过期货物详情" width="70%" :visible.sync="openCargo" append-to-body>-->
<CargoDesc :cargo-stock-id="cargoStock.id"></CargoDesc> <!-- <CargoDesc :cargo-stock-id="cargoStock.id"></CargoDesc>-->
</el-dialog> <!-- </el-dialog>-->
<el-dialog title="查看即将过期仓库详情" :visible.sync="openStock" append-to-body> <!-- <el-dialog title="查看即将过期仓库详情" :visible.sync="openStock" append-to-body>-->
<StockDesc :stock-id="warehouse.id"></StockDesc> <!-- <StockDesc :stock-id="warehouse.id"></StockDesc>-->
</el-dialog> <!-- </el-dialog>-->
<el-dialog title="查看出库提离即将到期单据详情" :visible.sync="openOutBillCargo" append-to-body> <!-- <el-dialog title="查看出库提离即将到期单据详情" :visible.sync="openOutBillCargo" append-to-body>-->
<OutBillCargoDesc :out-bill-cargo-id="outBillCargo.id"></OutBillCargoDesc> <!-- <OutBillCargoDesc :out-bill-cargo-id="outBillCargo.id"></OutBillCargoDesc>-->
</el-dialog> <!-- </el-dialog>-->
</div> </div>
</template> </template>
@ -160,9 +160,9 @@ export default {
}, },
created() { created() {
// this.getmsg(); // this.getmsg();
this.getStockList(); // this.getStockList();
this.getCargoList(); // this.getCargoList();
this.getOutBillCargo(); // this.getOutBillCargo();
}, },
methods: { methods: {
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {

2
bs-ui/src/views/register.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<div class="register"> <div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form"> <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">保税仓库管理系统</h3> <h3 class="title">烟草管理系统</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号"> <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" /> <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

4
bs-ui/vue.config.js
Unescape View File

@ -7,9 +7,9 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '保税仓库管理系统' // 网页标题 const name = process.env.VUE_APP_TITLE || '烟草管理系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 8080 // 端口
// vue.config.js 配置说明 // vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions

Write Preview
Loading…
Cancel
Save