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

projects/mescc/zhp #108

Merged
juzi merged 3 commits from projects/mescc/zhp into projects/mescc/develop 2024-07-26 11:17:35 +08:00
Conversation 0 Commits 3 Files Changed 3 +14 -6
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd36d33be9 - Show all commits

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'
# 蔡 # 蔡

6
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:06:58
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -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'

8
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:05:17
* @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>
@ -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) {