Browse Source

上传

master
前端-胡立永 3 months ago
parent
commit
d2a3c0f45a
13 changed files with 176 additions and 55 deletions
  1. +13
    -0
      api/api.js
  2. +1
    -1
      components/work/WorkOrderitem.vue
  3. +1
    -1
      config.js
  4. +1
    -1
      manifest.json
  5. +2
    -16
      pages/index/index.vue
  6. +2
    -1
      pages_order/auth/loginAndRegisterAndForgetPassword.vue
  7. +0
    -2
      pages_order/order/ChangePassword.vue
  8. +2
    -2
      pages_order/order/FavoriteList.vue
  9. +9
    -5
      pages_order/order/ModifyMembers.vue
  10. +99
    -13
      pages_order/order/ProcessCardOne.vue
  11. +2
    -2
      pages_order/order/WorkOrderList.vue
  12. +32
    -10
      pages_order/order/WorkOrders.vue
  13. +12
    -1
      store/store.js

+ 13
- 0
api/api.js View File

@ -57,6 +57,7 @@ const config = {
url: '/workorder/template/queryTemplateById', url: '/workorder/template/queryTemplateById',
method: 'GET', method: 'GET',
auth : true, auth : true,
showLoading : true,
}, },
//工单信息-工序卡3详情 //工单信息-工序卡3详情
queryStepThree: { queryStepThree: {
@ -64,6 +65,18 @@ const config = {
method: 'GET', method: 'GET',
auth : true, auth : true,
}, },
//工单信息-修改常规参数-工序卡1(选配)
updateGeneralStepOne: {
url: '/workorder/template/updateGeneralStepOne',
method: 'POST',
auth : true,
},
//工单信息-修改工序参数-工序卡1(选配)
updateParamStepOne: {
url: '/workorder/template/updateParamStepOne',
method: 'POST',
auth : true,
},
} }


+ 1
- 1
components/work/WorkOrderitem.vue View File

@ -41,7 +41,7 @@
工单状态 工单状态
</view> </view>
<view class="text"> <view class="text">
{{ obj.remark }}
{{ obj.statusId_dictText }}
</view> </view>
</view> </view>
</view> </view>


+ 1
- 1
config.js View File

@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
Vue.use(uvUI); Vue.use(uvUI);
// 当前环境 // 当前环境
const type = 'dev'
const type = 'prod'
// 环境配置 // 环境配置


+ 1
- 1
manifest.json View File

@ -52,7 +52,7 @@
"quickapp" : {}, "quickapp" : {},
/* */ /* */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxe7ae8cbe1673834c",
"appid" : "wx50cf2c3632649ec3",
"setting" : { "setting" : {
"urlCheck" : false "urlCheck" : false
}, },


+ 2
- 16
pages/index/index.vue View File

@ -69,9 +69,7 @@
import tabber from '@/components/base/tabbar.vue' import tabber from '@/components/base/tabbar.vue'
import WorkOrderitem from '@/components/work/WorkOrderitem.vue' import WorkOrderitem from '@/components/work/WorkOrderitem.vue'
import mixinsList from '@/mixins/list.js' import mixinsList from '@/mixins/list.js'
import {
mapGetters
} from 'vuex'
import { mapGetters } from 'vuex'
export default { export default {
mixins: [mixinsList], mixins: [mixinsList],
components: { components: {
@ -104,9 +102,9 @@
computed: { computed: {
}, },
onLoad() { onLoad() {
this.queryParams.isEmergency = 1
this.queryBannerList() this.queryBannerList()
this.queryNewsList() this.queryNewsList()
this.queryCollectionList()
}, },
methods: { methods: {
// //
@ -122,28 +120,16 @@
this.$api('queryNewsList', res =>{ this.$api('queryNewsList', res =>{
if(res.code == 200){ if(res.code == 200){
this.NewsList = res.result.records this.NewsList = res.result.records
res.result.records.forEach(n => { res.result.records.forEach(n => {
this.text.push(n.title) this.text.push(n.title)
}) })
} }
}) })
}, },
//-
queryCollectionList(){
this.$api('queryCollectionList', res =>{
if(res.code == 200){
this.CollectionList = res.result.records
}
})
},
toNotice(index){ toNotice(index){
console.log(this.NewsList[index]);
// @click="$utils.navigateTo('/pages_order/order/Worknotice')"
uni.navigateTo({ uni.navigateTo({
url: '/pages_order/order/Worknotice?id=' + this.NewsList[index].id url: '/pages_order/order/Worknotice?id=' + this.NewsList[index].id
}) })
}, },
} }
} }


+ 2
- 1
pages_order/auth/loginAndRegisterAndForgetPassword.vue View File

@ -1,6 +1,6 @@
<template> <template>
<view class="refundsOrExchange"> <view class="refundsOrExchange">
<navbar :title="titleList[titleIndex]" leftClick @leftClick="$utils.navigateBack" />
<!-- <navbar :title="titleList[titleIndex]" leftClick @leftClick="$utils.navigateBack" /> -->
<view class="frame"> <view class="frame">
<!-- 登录和注册 --> <!-- 登录和注册 -->
@ -255,6 +255,7 @@
.frame { .frame {
background-color: #FFF; background-color: #FFF;
margin-top: 120rpx;
.loginRegister { .loginRegister {
display: flex; display: flex;


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

@ -5,7 +5,6 @@
<view class="box"> <view class="box">
<view class="ChangeAccountpassword"> <view class="ChangeAccountpassword">
<view class="ChangeName"> <view class="ChangeName">
@ -46,7 +45,6 @@
change(e) { change(e) {
console.log('change', e); console.log('change', e);
} }
} }
} }
</script> </script>


+ 2
- 2
pages_order/order/FavoriteList.vue View File

@ -57,9 +57,9 @@
}, },
click(item) { click(item) {
if(item.id){ if(item.id){
this.queryParams.status = item.id
this.queryParams.statusId = item.id
}else{ }else{
delete this.queryParams.status
delete this.queryParams.statusId
} }
this.getData() this.getData()
}, },


+ 9
- 5
pages_order/order/ModifyMembers.vue View File

@ -11,16 +11,20 @@
class="headPortrait"> class="headPortrait">
<!-- 如果有就显示数据的头像 --> <!-- 如果有就显示数据的头像 -->
<image
<!-- <image
v-if="detail.image" v-if="detail.image"
:src="detail.image" :src="detail.image"
mode=""></image>
mode=""></image> -->
<!-- 如果没有就显示默认的 --> <!-- 如果没有就显示默认的 -->
<image
<!-- <image
v-else v-else
src="/pages_order/static/auth/headImage.png" src="/pages_order/static/auth/headImage.png"
mode=""></image>
mode=""></image> -->
<image
:src="detail.image || '/pages_order/static/auth/headImage.png'"
mode="aspectFill"></image>
</view> </view>
</view> </view>
@ -80,7 +84,7 @@
} }
}) })
}, },
getDetail(){
getDetail(title){
this.$api('queryUserById', { this.$api('queryUserById', {
userId : this.id userId : this.id
}, res =>{ }, res =>{


+ 99
- 13
pages_order/order/ProcessCardOne.vue View File

@ -69,33 +69,39 @@
<view class="list"> <view class="list">
<view class="item-box">
<view class="item-box"
:key="stepIndex"
v-for="(step, stepIndex) in stepList">
<view class="title"> <view class="title">
上钢选配
{{ step.name }}
</view> </view>
<view class="list-box" <view class="list-box"
:key="stepIndex"
v-for="(step, stepIndex) in stepList">
:key="cIndex"
v-for="(c, cIndex) in step.workorderItemCheckList">
<view class="title"> <view class="title">
钢化膜
{{ c.name }}
</view> </view>
<view class="item-input">
<view class="item-input"
:key="wi"
v-for="(w, wi) in c.workorderParamSteponeList"
>
<view class="Work-List" <view class="Work-List"
:key="index"
v-for="(item, index) in 20"
:key="xi"
v-for="(x, xi) in 20"
> >
<view class="label"> <view class="label">
规格{{ index + 1 }}
规格{{ xi + 1 }}
</view> </view>
<view class="text"> <view class="text">
<input type="text" <input type="text"
v-model="step['param' + (index + 1)]"/>
v-model="w['param' + (xi + 1)]"/>
</view> </view>
<view class="text" <view class="text"
v-if=""
style="margin-left: 20rpx;"> style="margin-left: 20rpx;">
{{ step.specs }}
{{ w.specs }}
</view> </view>
</view> </view>
</view> </view>
@ -119,11 +125,14 @@
id: 0, id: 0,
StepOne: {}, StepOne: {},
stepList : [], stepList : [],
index : 0,
} }
}, },
onLoad(arg) { onLoad(arg) {
this.id = arg.id this.id = arg.id
this.index = arg.index || 0
this.queryStepOne() this.queryStepOne()
this.queryTemplateById()
}, },
methods: { methods: {
queryStepOne() { queryStepOne() {
@ -132,12 +141,89 @@
}, res => { }, res => {
if (res.code == 200) { if (res.code == 200) {
this.StepOne = res.result.workorderGeneralStepone this.StepOne = res.result.workorderGeneralStepone
this.stepList = res.result.workorderParamSteponeList
} }
}) })
}, },
submit(){
// 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('updateParamStepOne', data, res => {
if(res.code == 200){
success(res)
}else{
error(res)
}
})
})
},
async submit(){
console.log(this.stepList); 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('updateGeneralStepOne', StepOne, res => {
if(res.code == 200){
success(res)
}else{
error(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.workorderParamSteponeList.length;k++){
let params = check.workorderParamSteponeList[k]
//
tasks.push(this.updateParamStepOne(params))
}
}
}
//
await Promise.all(tasks)
uni.showToast({
title: '保存成功',
icon: 'none'
})
setTimeout(uni.navigateBack, 1000, -1)
}, },
} }
} }


+ 2
- 2
pages_order/order/WorkOrderList.vue View File

@ -48,9 +48,9 @@
methods: { methods: {
clickTab(item){ clickTab(item){
if(item.id){ if(item.id){
this.queryParams.status = item.id
this.queryParams.statusId = item.id
}else{ }else{
delete this.queryParams.status
delete this.queryParams.statusId
} }
this.getData() this.getData()
}, },


+ 32
- 10
pages_order/order/WorkOrders.vue View File

@ -47,7 +47,7 @@
状态 状态
</view> </view>
<view class="index"> <view class="index">
{{TemplateById.remark}}
{{TemplateById.statusDescribe}}
</view> </view>
</view> </view>
<view class="work-box"> <view class="work-box">
@ -55,25 +55,31 @@
备注 备注
</view> </view>
<view class="index"> <view class="index">
{{TemplateById.remark}}
</view> </view>
</view> </view>
</view> </view>
<view class="working-procedure"> <view class="working-procedure">
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardOne?id=' + id)" >
中试压缩机试作工序卡1选配
<view class="working"
v-for="(item, index) in TemplateById.workorderStepList"
:key="index"
@click="clickStep(item, index)" >
{{ item.name }}
</view> </view>
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardTo?id=' + id)">
<!-- <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?id=' + id)">
<view class="working"
@click="$utils.navigateTo('/pages_order/order/ProcessCardThree?id=' + id)">
中试压缩机试作工序卡3 中试压缩机试作工序卡3
</view> </view>
<view class="working" @click="$utils.navigateTo('/pages_order/order/ProcessCardFour?id=' + id)">
<view class="working"
@click="$utils.navigateTo('/pages_order/order/ProcessCardFour?id=' + id)">
中试压缩机试作工序卡4(总成) 中试压缩机试作工序卡4(总成)
</view>
</view> -->
</view> </view>
<view class="modify"> <view class="modify">
<view class="modi" <view class="modi"
@ -85,17 +91,23 @@
</template> </template>
<script> <script>
import { mapState } from 'vuex'
export default { export default {
data() { data() {
return { return {
id : 0, id : 0,
TemplateById : {},
TemplateById : {
workorderStepList : []
},
} }
}, },
onLoad(args) { onLoad(args) {
this.id = args.id this.id = args.id
this.queryTemplateById() this.queryTemplateById()
}, },
computed : {
...mapState(['workDetail']),
},
methods: { methods: {
// id // id
queryTemplateById(){ queryTemplateById(){
@ -106,8 +118,18 @@
this.TemplateById = res.result this.TemplateById = res.result
} }
}) })
}, },
clickStep(item, index){
let urls = [
`/pages_order/order/ProcessCardOne?id=${this.id}&index=${index}`,
`/pages_order/order/ProcessCardOne?id=${this.id}&index=${index}`,
`/pages_order/order/ProcessCardOne?id=${this.id}&index=${index}`,
`/pages_order/order/ProcessCardOne?id=${this.id}&index=${index}`,
]
this.$utils.navigateTo(urls[index])
}
} }
} }
</script> </script>


+ 12
- 1
store/store.js View File

@ -11,7 +11,8 @@ const store = new Vuex.Store({
configList: [], //配置列表 configList: [], //配置列表
userInfo : {}, //用户信息 userInfo : {}, //用户信息
permissions : [],//权限列表 permissions : [],//权限列表
statusList : [],
statusList : [],//工单状态列表
// workDetail : {},//工单详情
}, },
getters: { getters: {
}, },
@ -82,6 +83,16 @@ const store = new Vuex.Store({
} }
}) })
}, },
// 根据id获取工单详情
// queryTemplateById(templateId){
// api('queryTemplateById', {
// templateId
// }, res =>{
// if(res.code == 200){
// this.workDetail = res.result
// }
// })
// },
}, },
actions: {}, actions: {},
}) })


Loading…
Cancel
Save