Browse Source

ggg

master
Bobi 3 months ago
parent
commit
1dc43d2442
12 changed files with 282 additions and 68 deletions
  1. +45
    -5
      api/api.js
  2. +48
    -0
      components/work/Collection.vue
  3. +14
    -1
      pages/index/index.vue
  4. +10
    -4
      pages_order/order/FavoriteList.vue
  5. +17
    -6
      pages_order/order/HelpCenter.vue
  6. +18
    -7
      pages_order/order/PrivacyAgreement.vue
  7. +29
    -9
      pages_order/order/ProcessCardOne.vue
  8. +17
    -1
      pages_order/order/ProcessCardThree.vue
  9. +20
    -2
      pages_order/order/ProcessCardTo.vue
  10. +36
    -17
      pages_order/order/WorkOrders.vue
  11. +2
    -0
      pages_order/order/Worknotice.vue
  12. +26
    -16
      pages_order/order/memberList.vue

+ 45
- 5
api/api.js View File

@ -19,15 +19,15 @@ const config = {
method: 'GET', method: 'GET',
limit: 500 limit: 500
}, },
//轮播图-轮播图列表 //轮播图-轮播图列表
queryBannerList: { queryBannerList: {
url: '/workorder/banner/queryBannerList', url: '/workorder/banner/queryBannerList',
method: 'GET', method: 'GET',
}, },
//工单信息-查询工单列表 //工单信息-查询工单列表
queryTemplateList: { queryTemplateList: {
url: '/workorder/template/queryTemplateList', url: '/workorder/template/queryTemplateList',
@ -43,7 +43,47 @@ const config = {
url: '/workorder/news/queryNewsById', url: '/workorder/news/queryNewsById',
method: 'GET', method: 'GET',
}, },
// 配置信息-帮助中心
helpInfo: {
url: '/workorder/config/helpInfo',
method: 'GET',
},
// 配置信息-隐私协议
privacyInfo: {
url: '/workorder/config/privacyInfo',
method: 'GET',
},
//用户列表
queryUserList: {
url: '/workorder/user/queryUserList',
method: 'GET',
},
//工单信息-工序卡1(选配)详情
queryStepOne: {
url: '/workorder/template/queryStepOne',
method: 'GET',
},
//工单信息-工序卡2详情
queryStepTwo: {
url: '/workorder/template/queryStepTwo',
method: 'GET',
},
//收藏信息-我的收藏
queryCollectionList: {
url: '/workorder/collection/queryCollectionList',
method: 'GET',
},
//工单信息-根据id查询工单详情
queryTemplateById: {
url: '/workorder/template/queryTemplateById',
method: 'GET',
},
//工单信息-工序卡3详情
queryStepThree: {
url: '/workorder/template/queryStepThree',
method: 'GET',
},
} }


+ 48
- 0
components/work/Collection.vue View File

@ -0,0 +1,48 @@
<template>
<view class="Urgent-Work-List" @click="$emit('click')">
<view class="Work-List">
任务号
</view>
<view class="Work-List">
担当信息
</view>
<view class="Work-List">
机型信息
</view>
<view class="Work-List">
数量
</view>
<view class="Work-List">
工单状态
</view>
</view>
</template>
<script>
export default {
name: "Collection",
props : {
obj : {}
},
data() {
return {
};
}
}
</script>
<style scoped lang="scss">
.Urgent-Work-List{
margin-top: 20rpx;
border: 6rpx solid $uni-color;
border-radius: 25rpx;
padding: 15rpx;
background-color: #fff;
.Work-List{
margin: 15rpx 0rpx;
letter-spacing: 2px
}
}
</style>

+ 14
- 1
pages/index/index.vue View File

@ -53,7 +53,7 @@
v-for="(item,index) in list" v-for="(item,index) in list"
:obj="item" :obj="item"
:key="index" :key="index"
@click="$utils.navigateTo('/pages_order/order/WorkOrders')"
@click="$utils.navigateTo('/pages_order/order/WorkOrders?id=' + item.id)"
/> />
</view> </view>
@ -78,10 +78,12 @@
tabber, tabber,
PrivacyAgreementPoup, PrivacyAgreementPoup,
WorkOrderitem, WorkOrderitem,
}, },
data() { data() {
return { return {
bannerList: [], bannerList: [],
CollectionList:[],
mixinsListApi : 'queryTemplateList', mixinsListApi : 'queryTemplateList',
baseList: [ baseList: [
{ {
@ -104,8 +106,10 @@
onLoad() { onLoad() {
this.queryBannerList() this.queryBannerList()
this.queryNewsList() this.queryNewsList()
this.queryCollectionList()
}, },
methods: { methods: {
//
queryBannerList(){ queryBannerList(){
this.$api('queryBannerList', res =>{ this.$api('queryBannerList', res =>{
if(res.code == 200){ if(res.code == 200){
@ -113,6 +117,7 @@
} }
}) })
}, },
//
queryNewsList(){ queryNewsList(){
this.$api('queryNewsList', res =>{ this.$api('queryNewsList', res =>{
if(res.code == 200){ if(res.code == 200){
@ -124,6 +129,14 @@
} }
}) })
}, },
//-
queryCollectionList(){
this.$api('queryCollectionList', res =>{
if(res.code == 200){
this.CollectionList = res.result.records
}
})
},
toNotice(index){ toNotice(index){
console.log(this.NewsList[index]); console.log(this.NewsList[index]);
// @click="$utils.navigateTo('/pages_order/order/Worknotice')" // @click="$utils.navigateTo('/pages_order/order/Worknotice')"


+ 10
- 4
pages_order/order/FavoriteList.vue View File

@ -20,9 +20,10 @@
</view> </view>
<view class="Urgent-Work-Order"> <view class="Urgent-Work-Order">
<WorkOrderitem
<Collection
v-for="(item,index) in list" v-for="(item,index) in list"
:obj="item" :obj="item"
:key="index"
/> />
</view> </view>
@ -32,16 +33,20 @@
<script> <script>
import tabber from '@/components/base/tabbar.vue' import tabber from '@/components/base/tabbar.vue'
import WorkOrderitem from '@/components/work/WorkOrderitem.vue'
import Collection from '@/components/work/Collection.vue'
import mixinsList from '@/mixins/list.js' import mixinsList from '@/mixins/list.js'
import {
mapGetters
} from 'vuex'
export default { export default {
mixins: [mixinsList], mixins: [mixinsList],
components: { components: {
tabber, tabber,
WorkOrderitem,
Collection,
}, },
data() { data() {
return { return {
mixinsListApi : 'queryTemplateList',
tabs: [{ tabs: [{
name: '所有', name: '所有',
}, { }, {
@ -53,7 +58,7 @@
}, { }, {
name: '挂机中' name: '挂机中'
}], }],
mixinsListApi : 'queryTemplateList',
mixinsListApi : 'queryCollectionList',
} }
}, },
computed: { computed: {
@ -65,6 +70,7 @@
click(item) { click(item) {
console.log('item', item); console.log('item', item);
}, },
} }
} }
</script> </script>


+ 17
- 6
pages_order/order/HelpCenter.vue View File

@ -5,11 +5,10 @@
title="帮助中心" title="帮助中心"
leftClick leftClick
@leftClick="$utils.navigateBack"/> @leftClick="$utils.navigateBack"/>
<view class="box">
<view class="center">
<h2>帮助中心</h2>
</view>
<view style="padding: 20rpx;">
<uv-parse :content="help.parmValue"></uv-parse>
</view> </view>
</view> </view>
</template> </template>
@ -18,10 +17,20 @@
export default { export default {
data() { data() {
return { return {
help:{},
} }
}, },
onLoad() {
this.helpInfo()
},
methods: { methods: {
helpInfo(){
this.$api('helpInfo', res =>{
if(res.code == 200){
this.help = res.result
}
})
},
} }
} }
@ -29,9 +38,11 @@
<style scoped lang="scss"> <style scoped lang="scss">
.page{ .page{
.box{margin-top: 150rpx;
.Box{
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 80rpx;
} }
} }


+ 18
- 7
pages_order/order/PrivacyAgreement.vue View File

@ -5,11 +5,11 @@
title="隐私协议" title="隐私协议"
leftClick leftClick
@leftClick="$utils.navigateBack"/> @leftClick="$utils.navigateBack"/>
<view class="box">
<view class="center">
<h2>隐私协议</h2>
</view>
<view style="padding: 20rpx;">
<uv-parse :content="privacy.parmValue"></uv-parse>
</view> </view>
</view> </view>
</template> </template>
@ -18,20 +18,31 @@
export default { export default {
data() { data() {
return { return {
privacy:{}
} }
}, },
onLoad() {
this.privacyInfo()
},
methods: { methods: {
privacyInfo(){
this.$api('privacyInfo', res =>{
if(res.code == 200){
this.privacy = res.result
}
})
},
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.page{ .page{
.box{margin-top: 150rpx;
.Box{
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 80rpx;
} }
} }


+ 29
- 9
pages_order/order/ProcessCardOne.vue View File

@ -1,26 +1,46 @@
<template> <template>
<view>
<navbar
title="工序卡3"
leftClick
@leftClick="$utils.navigateBack"/>
<view class="page">
<navbar title="工序卡1" leftClick @leftClick="$utils.navigateBack" />
<view class="">
{{StepOne.operator}}
</view> </view>
</view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
id: 0,
StepOne: {},
} }
}, },
onLoad(arg) {
this.id = arg.id
console.log(arg);
this.queryStepOne()
},
methods: { methods: {
queryStepOne() {
this.$api('queryStepOne', {
templateId: this.id
}, res => {
if (res.code == 200) {
this.StepOne = res.result.workorderGeneralStepone
}
})
},
} }
} }
</script> </script>
<style> <style>
</style>
</style>

+ 17
- 1
pages_order/order/ProcessCardThree.vue View File

@ -12,11 +12,27 @@
export default { export default {
data() { data() {
return { return {
StepThree :{}
} }
}, },
onLoad(arg) {
this.id = arg.id
console.log(arg);
this.queryStepThree()
},
methods: { methods: {
queryStepThree() {
this.$api('queryStepThree', {
templateId: this.id
}, res => {
if (res.code == 200) {
this.StepThree = res.result
}
})
},
} }
} }
</script> </script>


+ 20
- 2
pages_order/order/ProcessCardTo.vue View File

@ -12,11 +12,29 @@
export default { export default {
data() { data() {
return { return {
id: 0,
StepTwo:{},
} }
}, },
onLoad(arg) {
this.id = arg.id
console.log(arg);
this.queryStepTwo()
},
methods: { methods: {
queryStepTwo(){
this.$api('queryStepTwo',{
templateId: this.id
},res =>{
if(res.code == 200){
this.StepTwo = res.result
}
})
},
} }
} }
</script> </script>


+ 36
- 17
pages_order/order/WorkOrders.vue View File

@ -15,7 +15,7 @@
任务号 任务号
</view> </view>
<view class="index"> <view class="index">
GY1269103AC0
{{TemplateById.taskNo}}
</view> </view>
</view> </view>
<view class="work-box"> <view class="work-box">
@ -23,15 +23,15 @@
担当信息 担当信息
</view> </view>
<view class="index"> <view class="index">
李林珠-15197216688
{{TemplateById.responsibler}}
</view> </view>
</view> </view>
<view class="work-box">
<view class="work-boxx">
<view class="works"> <view class="works">
机型信息 机型信息
</view> </view>
<view class="index">
BSZ24861768
<view class="inde">
{{TemplateById.model}}
</view> </view>
</view> </view>
<view class="work-box"> <view class="work-box">
@ -39,7 +39,7 @@
数量 数量
</view> </view>
<view class="index"> <view class="index">
88
{{TemplateById.number}}
</view> </view>
</view> </view>
<view class="work-box"> <view class="work-box">
@ -47,7 +47,7 @@
状态 状态
</view> </view>
<view class="index"> <view class="index">
本体加工
{{TemplateById.remark}}
</view> </view>
</view> </view>
<view class="work-boxx"> <view class="work-boxx">
@ -55,24 +55,23 @@
备注 备注
</view> </view>
<view class="indexx"> <view class="indexx">
备料已完成等待本体加工进入下一步气
密检测55555555
</view> </view>
</view> </view>
</view> </view>
<view class="working-procedure"> <view class="working-procedure">
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardOne')">
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardOne?id=' + id)" >
中试压缩机试作工序卡1选配 中试压缩机试作工序卡1选配
</view> </view>
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardTo')">
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardTo?id=' + id)">
中试压缩机试作工序卡2 中试压缩机试作工序卡2
</view> </view>
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardThree')">
中试压缩机试作工序卡2
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardThree?id=' + id)">
中试压缩机试作工序卡3
</view> </view>
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardFour')">
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardFour?id=' + id)">
中试压缩机试作工序卡4(总成) 中试压缩机试作工序卡4(总成)
</view> </view>
</view> </view>
@ -90,11 +89,29 @@
export default { export default {
data() { data() {
return { return {
id : 0,
TemplateById : {},
} }
}, },
onLoad(args) {
this.id = args.id
this.queryTemplateById()
console.log(args)
},
methods: { methods: {
// id
queryTemplateById(){
this.$api('queryTemplateById', {
templateId : this.id
}, res =>{
if(res.code == 200){
this.TemplateById = res.result
}
})
},
} }
} }
</script> </script>
@ -113,11 +130,13 @@
font-size: 35rpx; font-size: 35rpx;
} }
.work-boxx { .work-boxx {
padding: 0rpx 30rpx; padding: 0rpx 30rpx;
margin: 15rpx 0rpx; margin: 15rpx 0rpx;
display: flex; display: flex;
flex-wrap: wrap;
font-size: 35rpx; font-size: 35rpx;
.indexx { .indexx {
@ -147,7 +166,7 @@
} }
.modify{ .modify{
text-align: center; text-align: center;
margin-top: 380rpx;
margin-top: 150rpx;
display: flex; display: flex;
align-items: center; align-items: center;


+ 2
- 0
pages_order/order/Worknotice.vue View File

@ -22,8 +22,10 @@
onLoad(args) { onLoad(args) {
this.id = args.id this.id = args.id
this.queryNewsById() this.queryNewsById()
}, },
methods: { methods: {
//-id
queryNewsById(){ queryNewsById(){
this.$api('queryNewsById', { this.$api('queryNewsById', {
newsId : this.id newsId : this.id


+ 26
- 16
pages_order/order/memberList.vue View File

@ -8,39 +8,32 @@
<uv-search placeholder="输入员工姓名进行搜索" bgColor="#fff" height="80"></uv-search> <uv-search placeholder="输入员工姓名进行搜索" bgColor="#fff" height="80"></uv-search>
</view> </view>
<view class="Memberinformation">
<view class="box" v-for="(item,index) in 10 ">
<view class="Memberinformation" >
<view class="box" v-for="(item,index) in list" :key="index">
<view class="Top"> <view class="Top">
<view class="userName">
李晓春
<view class="userName" >
{{item.name}}
</view> </view>
<view class="modify"
@click="$utils.navigateTo('/pages_order/order/ModifyMembers')">
<view class="modify" @click="$utils.navigateTo('/pages_order/order/ModifyMembers')">
修改 修改
</view> </view>
</view> </view>
<view class="AccountPassword"> <view class="AccountPassword">
<view class="Account"> <view class="Account">
账号李小春
账号{{item.name}}
</view> </view>
<view class="password"> <view class="password">
密码123456lixiaochun
密码{{item.password}}
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="itemm"> <view class="itemm">
创建时间2024.11.23
创建时间{{item.createTime}}
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -49,13 +42,29 @@
</template> </template>
<script> <script>
import mixinsList from '@/mixins/list.js'
import {
mapGetters
} from 'vuex'
export default { export default {
mixins: [mixinsList],
data() { data() {
return { return {
mixinsListApi : 'queryUserList',
} }
}, },
onLoad() {
this.queryUserList()
},
methods: { methods: {
queryUserList() {
this.$api('queryUserList', res => {
if (res.code == 200) {
this.item = res.result.records
}
})
},
} }
} }
@ -101,6 +110,7 @@
.AccountPassword { .AccountPassword {
margin-top: 40rpx; margin-top: 40rpx;
.password { .password {
margin-top: 20rpx; margin-top: 20rpx;
} }


Loading…
Cancel
Save