Browse Source

上传

master
前端-胡立永 6 months ago
parent
commit
54d9f4c370
13 changed files with 868 additions and 84 deletions
  1. +48
    -6
      api/api.js
  2. +97
    -0
      components/work/WorkOrderTotalItem.vue
  3. +3
    -0
      pages.json
  4. +1
    -1
      pages/index/index.vue
  5. +1
    -1
      pages_order/order/ModifyWorkOrder.vue
  6. +360
    -10
      pages_order/order/ProcessCardFour.vue
  7. +12
    -0
      pages_order/order/ProcessCardOne.vue
  8. +237
    -14
      pages_order/order/ProcessCardThree.vue
  9. +30
    -44
      pages_order/order/ProcessCardTo.vue
  10. +72
    -0
      pages_order/order/WorkOrderTotalList.vue
  11. +4
    -5
      pages_order/order/WorkOrders.vue
  12. +1
    -1
      uni_modules/uv-steps/components/uv-steps-item/props.js
  13. +2
    -2
      uni_modules/uv-steps/components/uv-steps-item/uv-steps-item.vue

+ 48
- 6
api/api.js View File

@ -46,6 +46,18 @@ const config = {
method: 'GET', method: 'GET',
auth : true, auth : true,
}, },
//工单信息-工序卡3详情
queryStepThree: {
url: '/workorder/template/queryStepThree',
method: 'GET',
auth : true,
},
//工单信息-工序卡4(总成)详情
queryStepFour: {
url: '/workorder/template/queryStepFour',
method: 'GET',
auth : true,
},
//收藏信息-我的收藏 //收藏信息-我的收藏
queryCollectionList: { queryCollectionList: {
url: '/workorder/collection/queryCollectionList', url: '/workorder/collection/queryCollectionList',
@ -66,12 +78,6 @@ const config = {
auth : true, auth : true,
showLoading : true, showLoading : true,
}, },
//工单信息-工序卡3详情
queryStepThree: {
url: '/workorder/template/queryStepThree',
method: 'GET',
auth : true,
},
//工单信息-修改常规参数-工序卡1(选配) //工单信息-修改常规参数-工序卡1(选配)
updateGeneralStepOne: { updateGeneralStepOne: {
url: '/workorder/template/updateGeneralStepOne', url: '/workorder/template/updateGeneralStepOne',
@ -84,6 +90,42 @@ const config = {
method: 'POST', method: 'POST',
auth : true, auth : true,
}, },
//工单信息-修改常规参数-工序卡2
updateGeneralStepTwo: {
url: '/workorder/template/updateGeneralStepTwo',
method: 'POST',
auth : true,
},
//工单信息-修改工序参数-工序卡2
updateParamStepTwo: {
url: '/workorder/template/updateParamStepTwo',
method: 'POST',
auth : true,
},
//工单信息-修改常规参数-工序卡3
updateGeneralStepThree: {
url: '/workorder/template/updateGeneralStepThree',
method: 'POST',
auth : true,
},
//工单信息-修改工序参数-工序卡3
updateParamStepThree: {
url: '/workorder/template/updateParamStepThree',
method: 'POST',
auth : true,
},
//工单信息-修改常规参数-工序卡4(总成)
updateGeneralStepFour: {
url: '/workorder/template/updateGeneralStepFour',
method: 'POST',
auth : true,
},
//工单信息-修改工序参数-工序卡4(总成)
updateParamStepFour: {
url: '/workorder/template/updateParamStepFour',
method: 'POST',
auth : true,
},
} }


+ 97
- 0
components/work/WorkOrderTotalItem.vue View File

@ -0,0 +1,97 @@
<template>
<view class="Urgent-Work-List" @click="$emit('click')">
<!-- <view class="Work-List">
<view class="label">
任务号
</view>
<view class="text">
{{ obj.taskNo }}
</view>
</view>
<view class="Work-List">
<view class="label">
担当信息
</view>
<view class="text">
{{ obj.responsibler }}
</view>
</view> -->
<view class="title">
<view class="">
{{ obj.taskNo }}
</view>
<view class="">
{{ obj.responsibler }}
</view>
</view>
<view class="steps">
<uv-steps activeColor="#5ac725"
:current="stepsCurrent" dot>
<uv-steps-item
:title="item.name"
:key="index"
v-if="item.id"
v-for="(item, index) in statusList">
</uv-steps-item>
</uv-steps>
</view>
</view>
</template>
<script>
import { mapState } from 'vuex'
export default {
name: "WorkOrderitem",
props : {
obj : {}
},
computed: {
...mapState(['statusList']),
stepsCurrent(){
let index = 0
this.statusList.forEach((n, i) => {
if(n.id == this.obj.statusId){
index = i
}
})
return index
},
},
data() {
return {
};
}
}
</script>
<style scoped lang="scss">
.Urgent-Work-List{
padding: 15rpx;
background-color: #fff;
font-size: 28rpx;
margin-top: 20rpx;
box-shadow: 0 0 6rpx 6rpx #00000009;
.Work-List{
display: flex;
padding: 20rpx 0rpx;
.label{
width: 150rpx;
flex-shrink: 0;
}
}
.title{
font-size: 26rpx;
padding: 20rpx 0rpx;
display: flex;
justify-content: space-between;
}
.steps {
}
}
</style>

+ 3
- 0
pages.json View File

@ -33,6 +33,9 @@
{ {
"path": "mine/help" "path": "mine/help"
}, },
{
"path": "order/WorkOrderTotalList"
},
{ {
"path": "order/WorkOrders" "path": "order/WorkOrders"
}, },


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

@ -92,7 +92,7 @@
{ {
name: 'lock', name: 'lock',
title: '汇总列表', title: '汇总列表',
url : '/pages_order/order/WorkOrderList',
url : '/pages_order/order/WorkOrderTotalList',
}, },
], ],
NewsList : [],// NewsList : [],//


+ 1
- 1
pages_order/order/ModifyWorkOrder.vue View File

@ -117,7 +117,7 @@
this.id = args.id this.id = args.id
}, },
onShow() { onShow() {
if(args.id){
if(this.id){
this.querydetail() this.querydetail()
} }
}, },


+ 360
- 10
pages_order/order/ProcessCardFour.vue View File

@ -1,9 +1,137 @@
<template> <template>
<view>
<navbar
title="工序卡4"
leftClick
@leftClick="$utils.navigateBack"/>
<view class="page">
<navbar :title="title" leftClick @leftClick="$utils.navigateBack" />
<view class="info">
<view class="Work-List">
<view class="label">
部件名
</view>
<view class="text">
<input type="text" v-model="StepOne.component"/>
</view>
</view>
<view class="Work-List">
<view class="label">
研发确认
</view>
<view class="text">
<input type="text" v-model="StepOne.comfirmDevelop"/>
</view>
</view>
<view class="Work-List">
<view class="label">
品质确认
</view>
<view class="text">
<input type="text" v-model="StepOne.comfirmQuality"/>
</view>
</view>
<view class="Work-List">
<view class="label">
中试确认
</view>
<view class="text">
<input type="text" v-model="StepOne.comfirmTrial"/>
</view>
</view>
<!-- <view class="Work-List">
<view class="label">
备注
</view>
<view class="text">
<input type="text" v-model="StepOne.remark"/>
</view>
</view> -->
</view>
<view class="list">
<view class="item-box"
:key="stepIndex"
v-for="(step, stepIndex) in stepList">
<view class="title">
{{ step.name }}
</view>
<view class="list-box"
:key="cIndex"
v-for="(c, cIndex) in step.workorderItemCheckList">
<view class="title">
{{ c.name }}
</view>
<view class="item-input"
:key="wi"
v-for="(w, wi) in c.workorderParamStepfourList"
>
<!-- <uv-upload
:fileList="w.fileList"
:maxCount="10"
multiple
width="150rpx"
height="150rpx"
@delete="e => deleteImage(e, w)"
@afterRead="e => afterRead(e, w)"
:previewFullImage="true"></uv-upload> -->
<view class="image-box">
<view class="image"
:key="xi"
v-for="(x, xi) in 10">
<image
v-if="w['param' + (xi + 1)]"
:src="w['param' + (xi + 1)]"
@click="previewImage([w['param' + (xi + 1)]], 0)"
mode="aspectFill"></image>
<view class="add-image"
v-else
@click="upload(w, 'param' + (xi + 1))">
<uv-icon
size="40rpx"
name="plus"
color="#00000022"
></uv-icon>
</view>
<view class="delete"
@click="del(w, 'param' + (xi + 1))"
v-if="w['param' + (xi + 1)]">
x
</view>
</view>
</view>
<view class="Work-List"
>
<view class="label">
作业员
</view>
<view class="text">
<input type="text"
style="width: 450rpx;"
v-model="w.operator"/>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="uni-color-btn"
@click="submit">
保存
</view>
</view> </view>
</template> </template>
@ -11,15 +139,237 @@
export default { export default {
data() { data() {
return { return {
id: 0,
StepOne: {},
stepList : [],
index : 1,
title : '',
} }
}, },
onLoad(arg) {
this.id = arg.id
this.index = arg.index || 2
this.title = arg.name
this.queryStepFour()
this.queryTemplateById()
},
methods: { methods: {
queryStepFour() {
this.$api('queryStepFour', {
templateId: this.id
}, res => {
if (res.code == 200) {
this.StepOne = res.result.workorderGeneralStepfour
}
})
},
// id
queryTemplateById(){
this.$api('queryTemplateById', {
templateId : this.id
}, res =>{
if(res.code == 200){
let p = res.result.workorderStepList[this.index]
// for(let i = 0;i < p.workorderProcessList.length;i++){
// let step = p.workorderProcessList[i]
// for(let j = 0;j < step.workorderItemCheckList.length;j++){
// let check = step.workorderItemCheckList[j]
// for(let k = 0;k < check.workorderParamStepfourList.length;k++){
// let params = check.workorderParamStepfourList[k]
// params.fileList = []
// for(let p = 0;p < 10;p++){
// let url = params['param' + (p + 1)]
// if(url){
// params.fileList.push({
// url
// })
// }
// }
// }
// }
// }
this.stepList = p.workorderProcessList
}
})
},
//--1()
updateParamStepOne(item){
return new Promise((success, error) => {
let data = JSON.parse(JSON.stringify(item))
delete data.updateBy
delete data.updateTime
delete data.createBy
delete data.createTime
this.$api('updateParamStepThree', data, res => {
if(res.code == 200){
success(res)
}else{
error(res)
}
})
})
},
async submit(){
console.log(this.stepList);
let StepOne = JSON.parse(JSON.stringify(this.StepOne))
delete StepOne.updateBy
delete StepOne.updateTime
delete StepOne.createBy
delete StepOne.createTime
//
this.$api('updateGeneralStepThree', StepOne, res => {
})
uni.showToast({
title: '保存中...',
icon: 'none'
})
//
let tasks = []
for(let i = 0;i < this.stepList.length;i++){
let step = this.stepList[i]
for(let j = 0;j < step.workorderItemCheckList.length;j++){
let check = step.workorderItemCheckList[j]
for(let k = 0;k < check.workorderParamStepfourList.length;k++){
let params = check.workorderParamStepfourList[k]
//
tasks.push(this.updateParamStepOne(params))
}
}
}
//
await Promise.all(tasks)
uni.showToast({
title: '保存成功',
icon: 'none'
})
setTimeout(uni.navigateBack, 1000, -1)
},
upload(w, key){
this.$Oss.ossUploadImage({
success : url => {
w[key] = url
}
})
},
del(w, key){
w[key] = ''
},
// deleteImage(e, w){
// w.fileList.splice(e.index, 1)
// },
// afterRead(e, w){
// let self = this
// e.file.forEach(file => {
// self.$Oss.ossUpload(file.url).then(url => {
// w.fileList.push({
// url
// })
// })
// })
// },
} }
} }
</script> </script>
<style>
</style>
<style scoped lang="scss">
.page{
padding-bottom: 200rpx;
.Work-List{
display: flex;
padding: 16rpx 0rpx;
align-items: center;
.label{
width: 200rpx;
flex-shrink: 0;
}
.text{
input{
background-color: #eee;
padding: 10rpx 20rpx;
border-radius: 20rpx;
}
}
}
.info{
padding: 30rpx;
input{
width: 430rpx;
}
}
.list{
padding: 0 30rpx;
.list-box{
padding: 20rpx 0;
padding-left: 40rpx;
.item-input{
padding-left: 40rpx;
.label{
width: 130rpx;
}
.image-box{
display: flex;
width: 100%;
flex-shrink: 0;
flex-wrap: wrap;
.image{
width: 100rpx;
height: 100rpx;
margin: 10rpx;
position: relative;
image{
width: 100%;
height: 100%;
border-radius: 20rpx;
}
.add-image{
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
border: 1rpx solid #00000022;
border-radius: 20rpx;
}
.delete{
width: 30rpx;
height: 30rpx;
background-color: #00000066;
color: #fff;
position: absolute;
right: 0;
top: 0;
font-size: 22rpx;
display: flex;
justify-content: center;
align-items: center;
}
}
}
}
}
input{
width: 320rpx;
}
}
}
</style>

+ 12
- 0
pages_order/order/ProcessCardOne.vue View File

@ -104,6 +104,18 @@
{{ w.specs }} {{ w.specs }}
</view> </view>
</view> </view>
<view class="Work-List"
>
<view class="label">
备注
</view>
<view class="text">
<input type="text"
style="width: 450rpx;"
v-model="w.remark"/>
</view>
</view>
</view> </view>
</view> </view>


+ 237
- 14
pages_order/order/ProcessCardThree.vue View File

@ -1,10 +1,114 @@
<template> <template>
<view>
<navbar
title="工序卡3"
leftClick
<view class="page">
<navbar :title="title" leftClick @leftClick="$utils.navigateBack" />
<view class="info">
<view class="Work-List">
<view class="label">
部件名
</view>
<view class="text">
<input type="text" v-model="StepOne.component"/>
</view>
</view>
<view class="Work-List">
<view class="label">
研发确认
</view>
<view class="text">
<input type="text" v-model="StepOne.comfirmDevelop"/>
</view>
</view>
<view class="Work-List">
<view class="label">
品质确认
</view>
<view class="text">
<input type="text" v-model="StepOne.confirmQuality"/>
</view>
</view>
<view class="Work-List">
<view class="label">
中试确认
</view>
<view class="text">
<input type="text" v-model="StepOne.confirmTrial"/>
</view>
</view>
<view class="Work-List">
<view class="label">
备注
</view>
<view class="text">
<input type="text" v-model="StepOne.remark"/>
</view>
</view>
</view>
<view class="list">
<view class="item-box"
:key="stepIndex"
v-for="(step, stepIndex) in stepList">
<view class="title">
{{ step.name }}
</view>
<view class="list-box"
:key="cIndex"
v-for="(c, cIndex) in step.workorderItemCheckList">
<view class="title">
{{ c.name }}
</view>
<view class="item-input"
:key="wi"
v-for="(w, wi) in c.workorderParamStepthreeList"
>
<view class="Work-List"
:key="xi"
v-for="(x, xi) in 10"
>
<view class="label">
规格{{ xi + 1 }}
</view>
<view class="text">
<input type="text"
v-model="w['param' + (xi + 1)]"/>
</view>
<view class="text"
v-if=""
style="margin-left: 20rpx;">
{{ w.specs }}
</view>
</view>
<view class="Work-List"
>
<view class="label">
作业员
</view>
<view class="text">
<input type="text"
style="width: 450rpx;"
v-model="w.operator"/>
</view>
</view>
</view>
</view>
</view>
</view>
@leftClick="$utils.navigateBack"/>
<view class="uni-color-btn"
@click="submit">
保存
</view>
</view> </view>
</template> </template>
@ -12,31 +116,150 @@
export default { export default {
data() { data() {
return { return {
StepThree :{}
id: 0,
StepOne: {},
stepList : [],
index : 1,
title : '',
} }
}, },
onLoad(arg) { onLoad(arg) {
this.id = arg.id this.id = arg.id
console.log(arg);
this.index = arg.index || 2
this.title = arg.name
this.queryStepThree() this.queryStepThree()
this.queryTemplateById()
}, },
methods: { methods: {
queryStepThree() { queryStepThree() {
this.$api('queryStepThree', { this.$api('queryStepThree', {
templateId: this.id templateId: this.id
}, res => { }, res => {
if (res.code == 200) { if (res.code == 200) {
this.StepThree = res.result
this.StepOne = res.result.workorderGeneralStepthree
}
})
},
// id
queryTemplateById(){
this.$api('queryTemplateById', {
templateId : this.id
}, res =>{
if(res.code == 200){
let p = res.result.workorderStepList[this.index]
this.stepList = p.workorderProcessList
} }
}) })
}, },
//--1()
updateParamStepOne(item){
return new Promise((success, error) => {
let data = JSON.parse(JSON.stringify(item))
delete data.updateBy
delete data.updateTime
delete data.createBy
delete data.createTime
this.$api('updateParamStepThree', data, res => {
if(res.code == 200){
success(res)
}else{
error(res)
}
})
})
},
async submit(){
console.log(this.stepList);
let StepOne = JSON.parse(JSON.stringify(this.StepOne))
delete StepOne.updateBy
delete StepOne.updateTime
delete StepOne.createBy
delete StepOne.createTime
//
this.$api('updateGeneralStepThree', StepOne, res => {
})
uni.showToast({
title: '保存中...',
icon: 'none'
})
//
let tasks = []
for(let i = 0;i < this.stepList.length;i++){
let step = this.stepList[i]
for(let j = 0;j < step.workorderItemCheckList.length;j++){
let check = step.workorderItemCheckList[j]
for(let k = 0;k < check.workorderParamStepthreeList.length;k++){
let params = check.workorderParamStepthreeList[k]
//
tasks.push(this.updateParamStepOne(params))
}
}
}
//
await Promise.all(tasks)
uni.showToast({
title: '保存成功',
icon: 'none'
})
setTimeout(uni.navigateBack, 1000, -1)
},
} }
} }
</script> </script>
<style>
</style>
<style scoped lang="scss">
.page{
padding-bottom: 200rpx;
.Work-List{
display: flex;
padding: 16rpx 0rpx;
align-items: center;
.label{
width: 200rpx;
flex-shrink: 0;
}
.text{
input{
background-color: #eee;
padding: 10rpx 20rpx;
border-radius: 20rpx;
}
}
}
.info{
padding: 30rpx;
input{
width: 430rpx;
}
}
.list{
padding: 0 30rpx;
.list-box{
padding: 20rpx 0;
padding-left: 40rpx;
.item-input{
padding-left: 40rpx;
.label{
width: 130rpx;
}
}
}
input{
width: 320rpx;
}
}
}
</style>

+ 30
- 44
pages_order/order/ProcessCardTo.vue View File

@ -5,66 +5,40 @@
<view class="Work-List"> <view class="Work-List">
<view class="label"> <view class="label">
中试作业员
部件名
</view> </view>
<view class="text"> <view class="text">
<input type="text" v-model="StepOne.operator"/>
<input type="text" v-model="StepOne.component"/>
</view> </view>
</view> </view>
<view class="Work-List"> <view class="Work-List">
<view class="label"> <view class="label">
气缸料号1
研发确认
</view> </view>
<view class="text"> <view class="text">
<input type="text" v-model="StepOne.cylinder1"/>
<input type="text" v-model="StepOne.confirmDevelop"/>
</view> </view>
</view> </view>
<view class="Work-List"> <view class="Work-List">
<view class="label"> <view class="label">
气缸料号2
品质确认
</view> </view>
<view class="text"> <view class="text">
<input type="text" v-model="StepOne.cylinder2"/>
<input type="text" v-model="StepOne.confirmQuality"/>
</view> </view>
</view> </view>
<view class="Work-List"> <view class="Work-List">
<view class="label"> <view class="label">
活塞料号1
中试确认
</view> </view>
<view class="text"> <view class="text">
<input type="text" v-model="StepOne.piston1"/>
<input type="text" v-model="StepOne.confirmTrial"/>
</view> </view>
</view> </view>
<view class="Work-List">
<view class="label">
活塞料号2
</view>
<view class="text">
<input type="text" v-model="StepOne.piston2"/>
</view>
</view>
<view class="Work-List">
<view class="label">
滑片料号1
</view>
<view class="text">
<input type="text" v-model="StepOne.scribing1"/>
</view>
</view>
<view class="Work-List">
<view class="label">
滑片料号2
</view>
<view class="text">
<input type="text" v-model="StepOne.scribing2"/>
</view>
</view>
</view> </view>
<view class="list"> <view class="list">
@ -85,11 +59,11 @@
<view class="item-input" <view class="item-input"
:key="wi" :key="wi"
v-for="(w, wi) in c.workorderParamSteponeList"
v-for="(w, wi) in c.workorderParamSteptwoList"
> >
<view class="Work-List" <view class="Work-List"
:key="xi" :key="xi"
v-for="(x, xi) in 20"
v-for="(x, xi) in 10"
> >
<view class="label"> <view class="label">
规格{{ xi + 1 }} 规格{{ xi + 1 }}
@ -104,6 +78,18 @@
{{ w.specs }} {{ w.specs }}
</view> </view>
</view> </view>
<view class="Work-List"
>
<view class="label">
作业员
</view>
<view class="text">
<input type="text"
style="width: 450rpx;"
v-model="w.operator"/>
</view>
</view>
</view> </view>
</view> </view>
@ -133,16 +119,16 @@
this.id = arg.id this.id = arg.id
this.index = arg.index || 1 this.index = arg.index || 1
this.title = arg.name this.title = arg.name
this.queryStepOne()
this.queryStepTwo()
this.queryTemplateById() this.queryTemplateById()
}, },
methods: { methods: {
queryStepOne() {
this.$api('queryStepOne', {
queryStepTwo() {
this.$api('queryStepTwo', {
templateId: this.id templateId: this.id
}, res => { }, res => {
if (res.code == 200) { if (res.code == 200) {
this.StepOne = res.result.workorderGeneralStepone
this.StepOne = res.result.workorderGeneralSteptwo
} }
}) })
}, },
@ -168,7 +154,7 @@
delete data.createBy delete data.createBy
delete data.createTime delete data.createTime
this.$api('updateParamStepOne', data, res => {
this.$api('updateParamStepTwo', data, res => {
if(res.code == 200){ if(res.code == 200){
success(res) success(res)
}else{ }else{
@ -188,7 +174,7 @@
delete StepOne.createTime delete StepOne.createTime
// //
this.$api('updateGeneralStepOne', StepOne, res => {
this.$api('updateGeneralStepTwo', StepOne, res => {
}) })
uni.showToast({ uni.showToast({
@ -204,8 +190,8 @@
for(let j = 0;j < step.workorderItemCheckList.length;j++){ for(let j = 0;j < step.workorderItemCheckList.length;j++){
let check = step.workorderItemCheckList[j] let check = step.workorderItemCheckList[j]
for(let k = 0;k < check.workorderParamSteponeList.length;k++){
let params = check.workorderParamSteponeList[k]
for(let k = 0;k < check.workorderParamSteptwoList.length;k++){
let params = check.workorderParamSteptwoList[k]
// //
tasks.push(this.updateParamStepOne(params)) tasks.push(this.updateParamStepOne(params))
} }


+ 72
- 0
pages_order/order/WorkOrderTotalList.vue View File

@ -0,0 +1,72 @@
<template>
<view class="page">
<navbar title="列表" leftClick @leftClick="$utils.navigateBack" />
<view class="search">
<uv-search
placeholder="请输入搜索内容"
v-model="queryParams.title"
bgColor="#fff"
height="80"></uv-search>
</view>
<!-- 标签选项 -->
<!-- <view class="Tabs">
<uv-tabs :list="statusList"
@click="clickTab"></uv-tabs>
</view> -->
<view class="Urgent-Work-Order">
<WorkOrderTotalItem
:key="index"
v-for="(item,index) in list" :obj="item"
@click="$utils.navigateTo('/pages_order/order/WorkOrders?id=' + item.id)"/>
</view>
<tabber select="1" />
</view>
</template>
<script>
import WorkOrderTotalItem from '@/components/work/WorkOrderTotalItem.vue'
import mixinsList from '@/mixins/list.js'
import { mapState } from 'vuex'
export default {
mixins: [mixinsList],
components: {
WorkOrderTotalItem,
},
data() {
return {
mixinsListApi: 'queryTemplateList',
}
},
computed: {
...mapState(['statusList']),
},
methods: {
clickTab(item){
if(item.id){
this.queryParams.statusId = item.id
}else{
delete this.queryParams.statusId
}
this.getData()
},
}
}
</script>
<style scoped lang="scss">
.page {
padding-bottom: 100rpx;
.search{
margin: 20rpx;
}
.Tabs {
}
.Urgent-Work-Order {
}
}
</style>

+ 4
- 5
pages_order/order/WorkOrders.vue View File

@ -103,10 +103,9 @@
}, },
onLoad(args) { onLoad(args) {
this.id = args.id this.id = args.id
this.queryTemplateById()
}, },
onShow() { onShow() {
if(args.id){
if(this.id){
this.queryTemplateById() this.queryTemplateById()
} }
}, },
@ -128,9 +127,9 @@
let urls = [ let urls = [
`/pages_order/order/ProcessCardOne?id=${this.id}&index=${index}&name=${item.name}`, `/pages_order/order/ProcessCardOne?id=${this.id}&index=${index}&name=${item.name}`,
`/pages_order/order/ProcessCardOne?id=${this.id}&index=${index}&name=${item.name}`,
`/pages_order/order/ProcessCardOne?id=${this.id}&index=${index}&name=${item.name}`,
`/pages_order/order/ProcessCardOne?id=${this.id}&index=${index}&name=${item.name}`,
`/pages_order/order/ProcessCardTo?id=${this.id}&index=${index}&name=${item.name}`,
`/pages_order/order/ProcessCardThree?id=${this.id}&index=${index}&name=${item.name}`,
`/pages_order/order/ProcessCardFour?id=${this.id}&index=${index}&name=${item.name}`,
] ]
this.$utils.navigateTo(urls[index]) this.$utils.navigateTo(urls[index])


+ 1
- 1
uni_modules/uv-steps/components/uv-steps-item/props.js View File

@ -13,7 +13,7 @@ export default {
// 图标大小 // 图标大小
iconSize: { iconSize: {
type: [String, Number], type: [String, Number],
default: 17
default: 20
}, },
// 当前步骤是否处于失败状态 // 当前步骤是否处于失败状态
error: { error: {


+ 2
- 2
uni_modules/uv-steps/components/uv-steps-item/uv-steps-item.vue View File

@ -68,14 +68,14 @@
:text="title" :text="title"
:type="parentData.current == index ? 'main' : 'content'" :type="parentData.current == index ? 'main' : 'content'"
lineHeight="20px" lineHeight="20px"
:size="parentData.current == index ? 14 : 13"
:size="parentData.current == index ? 20 : 18"
></uv-text> ></uv-text>
</slot> </slot>
<slot name="desc"> <slot name="desc">
<uv-text <uv-text
:text="desc" :text="desc"
type="tips" type="tips"
size="12"
size="18"
></uv-text> ></uv-text>
</slot> </slot>
</view> </view>


Loading…
Cancel
Save