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

修改数据库

Browse Source
dev
username 2 months ago
parent 200dc4d42c
commit f5749df751
3 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File

4
README.md
Unescape View File

@ -1,3 +1,3 @@
# bs-jxc # welfare
保税进销存 福利采购

10
bs-admin/src/main/resources/application-druid.yml
Unescape View File

@ -6,12 +6,12 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
#url: jdbc:mysql://124.71.134.146:63306/bs-jxc-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true url: jdbc:mysql://124.71.134.146:63306/welfare?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
#username: root
#password: fastrise@chain
url: jdbc:mysql://localhost:3306/my-base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
username: root username: root
password: abcd123 password: fastrise@chain
# url: jdbc:mysql://localhost:3306/welfare?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
# username: root
# password: root
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

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 }) {

Write Preview
Loading…
Cancel
Save