bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

材料站问题修复

This commit is contained in:
hongchao 2025-09-23 15:59:28 +08:00
parent 9eda31bea2
commit 7439c1bf82
11 changed files with 191 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/store/index.js
View File

@ -7,6 +7,9 @@ import tagsView from './modules/tagsView'
import permission from './modules/permission'
import settings from './modules/settings'
import getters from './getters'
import clzOutBound from './modules/clzOutBound'
import clzApply from './modules/clzApply'
import clzBack from './modules/clzBack'
Vue.use(Vuex)
const store = new Vuex.Store({
@ -16,7 +19,10 @@ const store = new Vuex.Store({
user,
tagsView,
permission,
settings
settings,
clzOutBound,
clzApply,
clzBack
},
getters
})

33
src/store/modules/clzApply.js Normal file
View File

@ -0,0 +1,33 @@
const state = {
clzApplyQueryParams: {
pageNum: 1,
pageSize: 10,
time: [], //申请时间
keyWord: '',
taskStatus: null, //申请时间
impUnitName:'',//分公司
departName:'',//项目部
subUnitName:'',//分包单位
proName:'',//领料工程
teamName:'',//领料班组
maTypeNames:''//领料工器具类型
}
}
const mutations = {
setClzApplyQueryParams(state, queryParams) {
state.clzApplyQueryParams = queryParams
}
}
const actions = {}
const getters = {}
export default {
namespaced: true,
state,
mutations,
actions,
getters
}

40
src/store/modules/clzBack.js Normal file
View File

@ -0,0 +1,40 @@
const state = {
clzBackQueryParams: {
pageNum: 1,
pageSize: 10,
keyWord: '', //关键字
teamId: '', //班组id
lotId: '', //工程id
status: '', //状态
typeId: '', //工机具类型
time: '',
agreementCode: '', //协议
startTime: '',
endTime: '',
proId: null,
impUnitName:'',//分公司
departName:'',//项目部
subUnitName:'',//分包单位
teamName:'',//班组
proName:'',//工程
typeName:''//工器具类型
}
}
const mutations = {
setClzBackQueryParamsQueryParams(state, queryParams) {
state.clzBackQueryParams = queryParams
}
}
const actions = {}
const getters = {}
export default {
namespaced: true,
state,
mutations,
actions,
getters
}

33
src/store/modules/clzOutBound.js Normal file
View File

@ -0,0 +1,33 @@
const state = {
clzOutBoundQueryParams: {
pageNum: 1,
pageSize: 10,
time: [], //申请时间
keyWord: '',
taskStatus: null, //申请时间
impUnitName:'',//分公司
departName:'',//项目部
proName:'',//领料工程
subUnitName:'',//分包单位
teamName:'',//领料班组
maTypeNames:''//领料工器具类型
}
}
const mutations = {
setClzOutBoundQueryParamsQueryParams(state, queryParams) {
state.clzOutBoundQueryParams = queryParams
}
}
const actions = {}
const getters = {}
export default {
namespaced: true,
state,
mutations,
actions,
getters
}

2
src/views/business-examine/direct-rotation-apply/index.vue
View File

@ -65,7 +65,7 @@
<el-tag v-if="scope.row.flowStatus == '0'" type="warning" size="mini">待审核</el-tag>
<el-tag v-else-if="scope.row.flowStatus == '1'" size="mini">审核中</el-tag>
<el-tag v-else-if="scope.row.flowStatus == '2'" type="success" size="mini">已通过</el-tag>
<el-tag v-else-if="scope.row.flowStatus == '3'" type="error" size="mini">已驳回</el-tag>
<el-tag v-else-if="scope.row.flowStatus == '3'" type="danger" size="mini">已驳回</el-tag>
</template>
</el-table-column>
<!-- 操作 -->

30
src/views/materialsStation/toolsBack/back/component/home.vue
View File

@ -409,6 +409,11 @@ export default {
this.getList()
this.initSelectData()
},
beforeDestroy() {
this.$store.commit('clzBack/setClzBackQueryParams', this.queryParams)
},
methods: {
format(date) {
const y = date.getFullYear()
@ -650,11 +655,28 @@ export default {
let start = new Date()
start.setMonth(start.getMonth() - 1)
this.queryParams.time = [this.format(start), this.format(end)]
// this.resetForm("queryForm");
this.queryParams.teamId = ''
this.projectId = null
this.queryParams.proId = ''
this.$refs.queryForm.resetFields()
this.queryParams = {
pageNum: 1,
pageSize: 10,
keyWord: '', //关键字
teamId: '', //班组id
lotId: '', //工程id
status: '', //状态
typeId: '', //工机具类型
time: '',
agreementCode: '', //协议
startTime: '',
endTime: '',
proId: null,
impUnitName:'',//分公司
departName:'',//项目部
subUnitName:'',//分包单位
teamName:'',//班组
proName:'',//工程
typeName:''//工器具类型
}
this.$store.commit('clzBack/clzBackQueryParams', this.queryParams)
this.getImpUnitOptions()
this.handleImpUnitChange()
this.handleDepartChange()

3
src/views/materialsStation/toolsBack/back/index.vue
View File

@ -2,6 +2,8 @@
<!-- 退料申请 -->
<div class="app-container">
<PageHeader v-if="isShowComponent !== 'Home'" :pageContent="pageContent" @goBack="goBack" />
<keep-alive include="Home">
<component
:is="isShowComponent"
:backId="backId"
@ -12,6 +14,7 @@
@queryReturn="queryReturn"
@goBackPage="goBack"
/>
</keep-alive>
</div>
</template>

24
src/views/materialsStation/toolsLease/apply/component/homeApply.vue
View File

@ -403,10 +403,10 @@ export default {
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
queryParams: this.$store.state.clzApply.clzApplyQueryParams || {
pageNum: 1,
pageSize: 10,
time: null, //申请时间
time: [], //申请时间
keyWord: '',
taskStatus: null, //申请时间
impUnitName:'',//分公司
@ -452,6 +452,11 @@ export default {
this.getDeviceType()
this.getList()
},
beforeDestroy() {
this.$store.commit('clzApply/setClzApplyQueryParams', this.queryParams)
},
methods: {
format(date) {
const y = date.getFullYear()
@ -498,7 +503,20 @@ export default {
start.setMonth(start.getMonth() - 1)
this.queryParams.time = [this.format(start), this.format(end)]
this.resetForm('queryForm')
this.queryParams.keyWord = ''
this.queryParams = {
pageNum: 1,
pageSize: 10,
time: [], //申请时间
keyWord: '',
taskStatus: null, //申请时间
impUnitName:'',//分公司
departName:'',//项目部
subUnitName:'',//分包单位
proName:'',//领料工程
teamName:'',//领料班组
maTypeNames:''//领料工器具类型
}
this.$store.commit('clzApply/clzApplyQueryParams', this.queryParams)
this.getImpUnitOptions()
this.handleImpUnitChange()
this.handleDepartChange()

2
src/views/materialsStation/toolsLease/apply/index.vue
View File

@ -2,6 +2,7 @@
<!-- 新购工机具管理 -->
<div class="app-container">
<PageHeaderApply v-if="isShowComponent != 'Home'" :pageContent="pageContent" @goBack="goBack" />
<keep-alive include="Home">
<component
:is="isShowComponent"
:isEdit="isEdit"
@ -16,6 +17,7 @@
@addToolsSuccess="addToolsSuccess"
@queryTools="queryTools"
/>
</keep-alive>
</div>
</template>

25
src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
View File

@ -391,10 +391,10 @@ export default {
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
queryParams: this.$store.state.clzOutBound.clzOutBoundQueryParams || {
pageNum: 1,
pageSize: 10,
time: null, //申请时间
time: [], //申请时间
keyWord: '',
taskStatus: null, //申请时间
impUnitName:'',//分公司
@ -438,6 +438,11 @@ export default {
this.getDeviceType()
this.getList()
},
beforeDestroy() {
this.$store.commit('clzOutBound/setClzOutBoundQueryParams', this.queryParams)
},
methods: {
handleShow(row) {
// createTime 距离当前时间 3天内 可以删除
@ -492,8 +497,20 @@ export default {
let start = new Date()
start.setMonth(start.getMonth() - 1)
this.queryParams.time = [this.format(start), this.format(end)]
this.resetForm('queryForm')
this.queryParams.keyWord = ''
this.queryParams = {
pageNum: 1,
pageSize: 10,
time: [], //申请时间
keyWord: '',
taskStatus: null, //申请时间
impUnitName:'',//分公司
departName:'',//项目部
proName:'',//领料工程
subUnitName:'',//分包单位
teamName:'',//领料班组
maTypeNames:''//领料工器具类型
}
this.$store.commit('clzOutBoubnd/clzOutBoundQueryParams', this.queryParams)
this.getImpUnitOptions()
this.handleImpUnitChange()
this.handleDepartChange()

4
src/views/materialsStation/toolsLease/outBound/index.vue
View File

@ -2,6 +2,8 @@
<!-- 新购工机具管理 -->
<div class="app-container">
<PageHeaderApply v-if="isShowComponent != 'Home'" :pageContent="pageContent" @goBack="goBack" />
<keep-alive include="Home">
<component
:is="isShowComponent"
:isEdit="isEdit"
@ -16,6 +18,8 @@
@addToolsSuccess="addToolsSuccess"
@queryTools="queryTools"
/>
</keep-alive>
</div>
</template>