admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: 冲突解决

Browse Source
This commit is contained in:
kun 2024-04-26 18:37:04 +08:00
commit ee18682dab
4 changed files with 295 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/projectEnd/qualityManage/taskList.vue
View File

@ -11,11 +11,11 @@
待整改 待整改
</view> </view>
<view class="info-item b-right"> <view class="info-item b-right">
<text>{{ statisticsData.checkNum }}</text> <text>{{ statisticsData.reviewNum }}</text>
待复查 待复查
</view> </view>
<view class="info-item b-right"> <view class="info-item b-right">
<text>{{ statisticsData.reviewNum }}</text> <text>{{ statisticsData.checkNum }}</text>
待核验 待核验
</view> </view>
<view class="info-item"> <view class="info-item">

50
pages/projectEnd/ukashManage/lookDetails.vue Normal file
View File

@ -0,0 +1,50 @@
<template>
<view class="projectList">
<headers class="fixedheader" :themeType="true" :showBack="true">
<view class="headerName">
查看明细
</view>
</headers>
<view class="details">
</view>
</view>
</template>
<script>
import headers from '../../../components/headers/headers.vue'
export default {
data() {
return {
}
},
onShow() {
},
onLoad(vai) {
},
onReachBottom() {
},
onPullDownRefresh() {
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.projectList{
min-height: 100%;
background: #f4f5fd;
.details{
margin: 10px;
background-color: #fff;
}
}
</style>

241
pages/projectEnd/ukashManage/materials.vue
View File

@ -1,130 +1,133 @@
<template> <template>
<view class="projectList"> <view class="projectList">
<headers class="fixedheader" :themeType="true" :showBack="true"> <headers class="fixedheader" :themeType="true" :showBack="true">
<view class="headerName"> <view class="headerName">
材料入场管理 材料入场管理
</view> </view>
</headers> </headers>
<view> <view>
<view class="ukashList"> <view class="ukashList">
<view class="ukashList-what"> <view class="ukashList-what">
<span style="font-size: 14px;font-weight: 700;">0000</span> <span style="font-size: 14px;font-weight: 700;">0000</span>
<span class="ukashList-look">查看明细</span> <span class="ukashList-look">查看明细</span>
</view> </view>
<view class="ukashList-time">型号: 2222s</view> <view class="ukashList-time">型号: 2222s</view>
<view class="ukashList-time">规格: 2222s</view> <view class="ukashList-time">规格: 2222s</view>
<view class="ukashList-time">单位: 2222s</view> <view class="ukashList-time">单位: 2222s</view>
<view class="ukashList-time">数量: 2222s</view> <view class="ukashList-time">数量: 2222s</view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import headers from '../../../components/headers/headers.vue' import headers from '../../../components/headers/headers.vue'
export default { export default {
data() { data() {
return { return {
search:'', search: '',
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
isLoadMore:false, isLoadMore: false,
dataList:[], dataList: [],
id:'' id: ''
} }
}, },
onShow() { onShow() {
this.queryList() this.queryList()
}, },
onLoad(vai) { onLoad(vai) {
console.log(vai.itemS); console.log(vai.itemS);
this.id = vai.itemS this.id = vai.itemS
}, },
onReachBottom() { onReachBottom() {
console.log(99999); console.log(99999);
if (!this.isLoadMore) { // if (!this.isLoadMore) {
this.isLoadMore = true // this.isLoadMore = true
this.pageNo + 1 // this.pageNo + 1
this.queryList() // this.queryList()
} // }
}, },
onPullDownRefresh() { onPullDownRefresh() {
console.log(222); console.log(222);
this.pageNo = 1 this.pageNo = 1
this.dataList = [] this.dataList = []
this.queryList() this.queryList()
}, },
methods: { methods: {
queryList() { queryList() {
let data = { let data = {
id:this.id id:this.id
} }
let _this = this let _this = this
this.sendRequest({ this.sendRequest({
url: 'xmgl/xzMaterial/queryById', url: 'xmgl/xzMaterialDetail/queryById',
method: 'post', method: 'post',
data: data, data: data,
success: res => { success: res => {
console.log(res); console.log(res);
// this.dataList =res.result.records // this.dataList =res.result.records
// if (res.result.records.length < this.pageSize) { // if (res.result.records.length < this.pageSize) {
// //判断接口返回数据量小于请求数据量，则表示此为最后一页 // //判断接口返回数据量小于请求数据量，则表示此为最后一页
// this.isLoadMore = true // this.isLoadMore = true
// this.loadStatus = 'nomore' // this.loadStatus = 'nomore'
// } else { // } else {
// this.isLoadMore = false // this.isLoadMore = false
// // that.loadStatus='more' // // that.loadStatus='more'
// } // }
// uni.stopPullDownRefresh() // uni.stopPullDownRefresh()
// // console.log(res.result) // // console.log(res.result)
} }
}) })
}, },
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.projectList{ .projectList {
min-height: 100%; min-height: 100%;
background: #f4f5fd; background: #f4f5fd;
.uni-input { .uni-input {
border-radius: 10px; border-radius: 10px;
margin: 10px 10px; margin: 10px 10px;
background-color: #e6e7ef; background-color: #e6e7ef;
height: 35px; height: 35px;
line-height: 30px; line-height: 30px;
padding: 0 20px; padding: 0 20px;
font-size: 14px; font-size: 14px;
} }
.ukashList{
height: 163px; .ukashList {
background-color: #fff; height: 163px;
margin: 10px 10px; background-color: #fff;
border-radius: 15px; margin: 10px 10px;
.ukashList-what{ border-radius: 15px;
display: flex;
justify-content: space-between; .ukashList-what {
margin: 0 15px; display: flex;
padding-top: 10px; justify-content: space-between;
.ukashList-look{ margin: 0 15px;
background-color: #5081f7; padding-top: 10px;
border-radius: 10px;
padding: 0 4px; .ukashList-look {
font-size: 12px; background-color: #5081f7;
text-align: center; border-radius: 10px;
color: #fff; padding: 0 4px;
} font-size: 12px;
} text-align: center;
.ukashList-time{ color: #fff;
margin-top: 15px; }
margin-left: 15px; }
font-size: 12px;
color: #b9bbc9; .ukashList-time {
} margin-top: 15px;
} margin-left: 15px;
} font-size: 12px;
color: #b9bbc9;
}
}
}
</style> </style>

239
pages/projectEnd/ukashManage/ukashManage.vue
View File

@ -1,129 +1,132 @@
<template> <template>
<view class="projectList"> <view class="projectList">
<headers class="fixedheader" :themeType="true" :showBack="true"> <headers class="fixedheader" :themeType="true" :showBack="true">
<view class="headerName"> <view class="headerName">
材料入场管理 材料入场管理
</view> </view>
</headers> </headers>
<input class="uni-input" name="searchName" v-model="search" placeholder="请搜索" /> <input class="uni-input" name="searchName" v-model="search" placeholder="请搜索" />
<view> <view>
<view class="ukashList" v-for="item in dataList" :key="item.id" @click="jobMaterials(item.id)"> <view class="ukashList" v-for="item in dataList" :key="item.id" @click="jobMaterials(item.id)">
<view class="ukashList-what"> <view class="ukashList-what">
<span style="font-size: 14px;font-weight: 700;">{{item.name}}</span> <span style="font-size: 14px;font-weight: 700;">{{item.name}}</span>
<span class="ukashList-look">查看明细</span> <span class="ukashList-look">查看明细</span>
</view> </view>
<view class="ukashList-time">入场时间: {{item.entryTime}}</view> <view class="ukashList-time">入场时间: {{item.entryTime}}</view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import headers from '../../../components/headers/headers.vue' import headers from '../../../components/headers/headers.vue'
export default { export default {
data() { data() {
return { return {
search:'', search: '',
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
isLoadMore:false, isLoadMore: false,
dataList:[] dataList: []
} }
}, },
onShow() { onShow() {
this.queryList() this.queryList()
}, },
onReachBottom() { onReachBottom() {
console.log(99999); console.log(99999);
if (!this.isLoadMore) { if (!this.isLoadMore) {
this.isLoadMore = true this.isLoadMore = true
this.pageNo + 1 this.pageNo + 1
this.queryList() this.queryList()
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
console.log(222); console.log(222);
this.pageNo = 1 this.pageNo = 1
this.dataList = [] this.dataList = []
this.queryList() this.queryList()
}, },
methods: { methods: {
queryList() { queryList() {
let data = { let data = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize pageSize: this.pageSize
} }
let _this = this let _this = this
this.sendRequest({ this.sendRequest({
url: 'xmgl/xzMaterial/page', url: 'xmgl/xzMaterial/page',
method: 'post', method: 'post',
data: data, data: data,
success: res => { success: res => {
console.log(res); console.log(res);
this.dataList =res.result.records this.dataList = res.result.records
if (res.result.records.length < this.pageSize) { if (res.result.records.length < this.pageSize) {
//判断接口返回数据量小于请求数据量，则表示此为最后一页 //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.isLoadMore = true this.isLoadMore = true
this.loadStatus = 'nomore' this.loadStatus = 'nomore'
} else { } else {
this.isLoadMore = false this.isLoadMore = false
// that.loadStatus='more' // that.loadStatus='more'
} }
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
// console.log(res.result) // console.log(res.result)
} }
}) })
}, },
jobMaterials(id){ jobMaterials(id) {
uni.navigateTo({ uni.navigateTo({
url: './materials?itemS=' + id url: './materials?itemS=' + id
}) })
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.projectList{ .projectList {
min-height: 100%; min-height: 100%;
background: #f4f5fd; background: #f4f5fd;
.uni-input { .uni-input {
border-radius: 10px; border-radius: 10px;
margin: 10px 10px; margin: 10px 10px;
background-color: #e6e7ef; background-color: #e6e7ef;
height: 35px; height: 35px;
line-height: 30px; line-height: 30px;
padding: 0 20px; padding: 0 20px;
font-size: 14px; font-size: 14px;
} }
.ukashList{
height: 90px; .ukashList {
background-color: #fff; height: 90px;
margin: 10px 10px; background-color: #fff;
border-radius: 15px; margin: 10px 10px;
.ukashList-what{ border-radius: 15px;
display: flex;
justify-content: space-between; .ukashList-what {
margin: 0 20px; display: flex;
padding-top: 10px; justify-content: space-between;
.ukashList-look{ margin: 0 20px;
background-color: #5081f7; padding-top: 10px;
border-radius: 10px;
padding: 0 4px; .ukashList-look {
font-size: 12px; background-color: #5081f7;
text-align: center; border-radius: 10px;
color: #fff; padding: 0 4px;
} font-size: 12px;
} text-align: center;
.ukashList-time{ color: #fff;
margin-top: 20px; }
margin-left: 20px; }
font-size: 12px;
color: #b9bbc9; .ukashList-time {
} margin-top: 20px;
} margin-left: 20px;
} font-size: 12px;
color: #b9bbc9;
}
}
}
</style> </style>