mt-fe-group/yudao-init
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/mescc/zhp' (#108) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #108
This commit is contained in:
朱菊兰 2024-07-26 11:17:35 +08:00
commit 9e3c9fff6d
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.dev
View File

@ -1,7 +1,7 @@
### ###
# @Author: zhp # @Author: zhp
# @Date: 2024-04-28 13:42:51 # @Date: 2024-04-28 13:42:51
# @LastEditTime: 2024-07-25 15:43:42 # @LastEditTime: 2024-07-26 10:50:10
# @LastEditors: zhp # @LastEditors: zhp
# @Description: # @Description:
### ###
@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.1.70:30307' # VUE_APP_BASE_API = 'http://192.168.1.70:30307'
# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
# 闫阳 # 闫阳
# VUE_APP_BASE_API = 'http://192.168.1.81:48080' # VUE_APP_BASE_API = 'http://192.168.1.81:48080'
# 徐 # 徐
@ -21,7 +21,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
# 郭 # 郭
# VUE_APP_BASE_API = 'http://192.168.1.61:48080' # VUE_APP_BASE_API = 'http://192.168.1.61:48080'
# sara # sara
VUE_APP_BASE_API = 'http://192.168.1.63:8080' # VUE_APP_BASE_API = 'http://192.168.1.63:8080'
# 张一丁 # 张一丁
# VUE_APP_BASE_API = 'http://192.168.4.139:48080' # VUE_APP_BASE_API = 'http://192.168.4.139:48080'
# 蔡 # 蔡

22
src/views/cost/accounting.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-15 10:49:13 * @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-26 10:32:14 * @LastEditTime: 2024-07-26 11:14:37
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -30,12 +30,12 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> --> <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData" <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
:max-height="tableH"> :max-height="tableH">
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
:method-list="tableBtn" @clickBtn="handleClick" /> --> :method-list="tableBtn" @clickBtn="handleClick" /> -->
</base-table> </base-table>
<pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total" <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@pagination="getDataList" /> @pagination="getDataList" />
</div> </div>
@ -101,8 +101,8 @@ export default {
// selectedValues: [], // selectedValues: [],
options, options,
listQuery: { listQuery: {
// size: 10, pageSize: 20,
// current: 1, pageNo: 1,
total: 0, total: 0,
center: undefined, center: undefined,
start: undefined, start: undefined,
@ -394,6 +394,10 @@ export default {
this.listQuery.yearPhaseEnd = this.listQuery.end ? this.listQuery.end.slice(0, 6) : undefined this.listQuery.yearPhaseEnd = this.listQuery.end ? this.listQuery.end.slice(0, 6) : undefined
if (this.listQuery.end && this.listQuery.start) { if (this.listQuery.end && this.listQuery.start) {
if (this.listQuery.end.slice(0, 4) - this.listQuery.start.slice(0, 4) > 10) { if (this.listQuery.end.slice(0, 4) - this.listQuery.start.slice(0, 4) > 10) {
this.listQuery.end = undefined
this.listQuery.start = undefined
this.listQuery.yearPhaseStart = undefined
this.listQuery.yearPhaseEnd = undefined
return this.$message({ return this.$message({
message: '起止年份不能超过十年', message: '起止年份不能超过十年',
type: 'warning' type: 'warning'
@ -505,8 +509,8 @@ export default {
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined; this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.current = 1; this.listQuery.pageNo = 1;
this.listQuery.size = 10; this.listQuery.pageSize = 10;
this.getDataList(); this.getDataList();
break; break;
case 'export': case 'export':
@ -519,8 +523,8 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.listQuery; const queryParams = this.listQuery;
queryParams.current = 1 // queryParams.current = 1
queryParams.size = 999 // queryParams.size = 999
// if (this.facType === 0) { // if (this.facType === 0) {
this.$modal.confirm('是否确认导出所有数据项?').then(() => { this.$modal.confirm('是否确认导出所有数据项?').then(() => {
this.exportLoading = true; this.exportLoading = true;

22
src/views/warehouse/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-15 10:49:13 * @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-26 10:28:53 * @LastEditTime: 2024-07-26 11:14:34
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -10,7 +10,7 @@
<div class="app-container" style="height: auto; flex-grow: 1;"> <div class="app-container" style="height: auto; flex-grow: 1;">
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip"> <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
<el-form-item label="快捷查询" prop="mDType"> <el-form-item label="快捷查询" prop="mDType">
<el-select size="small" v-model="listQuery.mDType" clearable> <el-select size="small" v-model="listQuery.mDType" clearable @change="handleChange">
<el-option v-for="item in mDTypeList" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in mDTypeList" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
@ -54,12 +54,12 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> --> <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData" <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
:max-height="tableH"> :max-height="tableH">
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
:method-list="tableBtn" @clickBtn="handleClick" /> --> :method-list="tableBtn" @clickBtn="handleClick" /> -->
</base-table> </base-table>
<pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total" <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@pagination="getDataList" /> @pagination="getDataList" />
</div> </div>
@ -100,8 +100,8 @@ export default {
start: undefined, start: undefined,
end: undefined, end: undefined,
listQuery: { listQuery: {
size: 10, pageSize: 20,
current: 1, pageNo: 1,
total: 0, total: 0,
mDType:0, mDType:0,
wDType: 0, wDType: 0,
@ -283,6 +283,10 @@ export default {
// this.changeTime() // this.changeTime()
}, },
methods: { methods: {
handleChange() {
this.listQuery.materialCode = undefined
this.listQuery.materialName = undefined
},
async getDataList() { async getDataList() {
await getStockRealTimePage(this.listQuery).then(res => { await getStockRealTimePage(this.listQuery).then(res => {
if (res.code === 0) { if (res.code === 0) {
@ -295,8 +299,8 @@ export default {
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined; this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.current = 1; this.listQuery.pageNo = 1;
this.listQuery.size = 10; this.listQuery.pageSize = 10;
this.getDataList(); this.getDataList();
break; break;
case 'export': case 'export':
@ -309,8 +313,6 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.listQuery; const queryParams = this.listQuery;
queryParams.current = 1
queryParams.size = 999
// if (this.facType === 0) { // if (this.facType === 0) {
this.$modal.confirm('是否确认导出所有数据项?').then(() => { this.$modal.confirm('是否确认导出所有数据项?').then(() => {
this.exportLoading = true; this.exportLoading = true;