From 54d9f4c370277e765daaeaebaaec988ea01d252b Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 30 Nov 2024 20:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/api.js | 54 ++-
components/work/WorkOrderTotalItem.vue | 97 ++++++
pages.json | 3 +
pages/index/index.vue | 2 +-
pages_order/order/ModifyWorkOrder.vue | 2 +-
pages_order/order/ProcessCardFour.vue | 370 ++++++++++++++++++++-
pages_order/order/ProcessCardOne.vue | 12 +
pages_order/order/ProcessCardThree.vue | 251 +++++++++++++-
pages_order/order/ProcessCardTo.vue | 74 ++---
pages_order/order/WorkOrderTotalList.vue | 72 ++++
pages_order/order/WorkOrders.vue | 9 +-
.../uv-steps/components/uv-steps-item/props.js | 2 +-
.../components/uv-steps-item/uv-steps-item.vue | 4 +-
13 files changed, 868 insertions(+), 84 deletions(-)
create mode 100644 components/work/WorkOrderTotalItem.vue
create mode 100644 pages_order/order/WorkOrderTotalList.vue
diff --git a/api/api.js b/api/api.js
index 884e162..ae68a94 100644
--- a/api/api.js
+++ b/api/api.js
@@ -46,6 +46,18 @@ const config = {
method: 'GET',
auth : true,
},
+ //工单信息-工序卡3详情
+ queryStepThree: {
+ url: '/workorder/template/queryStepThree',
+ method: 'GET',
+ auth : true,
+ },
+ //工单信息-工序卡4(总成)详情
+ queryStepFour: {
+ url: '/workorder/template/queryStepFour',
+ method: 'GET',
+ auth : true,
+ },
//收藏信息-我的收藏
queryCollectionList: {
url: '/workorder/collection/queryCollectionList',
@@ -66,12 +78,6 @@ const config = {
auth : true,
showLoading : true,
},
- //工单信息-工序卡3详情
- queryStepThree: {
- url: '/workorder/template/queryStepThree',
- method: 'GET',
- auth : true,
- },
//工单信息-修改常规参数-工序卡1(选配)
updateGeneralStepOne: {
url: '/workorder/template/updateGeneralStepOne',
@@ -84,6 +90,42 @@ const config = {
method: 'POST',
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,
+ },
}
diff --git a/components/work/WorkOrderTotalItem.vue b/components/work/WorkOrderTotalItem.vue
new file mode 100644
index 0000000..a658ff0
--- /dev/null
+++ b/components/work/WorkOrderTotalItem.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+ {{ obj.taskNo }}
+
+
+ {{ obj.responsibler }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index fdd1334..95a5003 100644
--- a/pages.json
+++ b/pages.json
@@ -33,6 +33,9 @@
{
"path": "mine/help"
},
+ {
+ "path": "order/WorkOrderTotalList"
+ },
{
"path": "order/WorkOrders"
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e59646e..28d0a57 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -92,7 +92,7 @@
{
name: 'lock',
title: '汇总列表',
- url : '/pages_order/order/WorkOrderList',
+ url : '/pages_order/order/WorkOrderTotalList',
},
],
NewsList : [],//公告列表
diff --git a/pages_order/order/ModifyWorkOrder.vue b/pages_order/order/ModifyWorkOrder.vue
index 16f8f84..ef89325 100644
--- a/pages_order/order/ModifyWorkOrder.vue
+++ b/pages_order/order/ModifyWorkOrder.vue
@@ -117,7 +117,7 @@
this.id = args.id
},
onShow() {
- if(args.id){
+ if(this.id){
this.querydetail()
}
},
diff --git a/pages_order/order/ProcessCardFour.vue b/pages_order/order/ProcessCardFour.vue
index b1abe06..4b21fe2 100644
--- a/pages_order/order/ProcessCardFour.vue
+++ b/pages_order/order/ProcessCardFour.vue
@@ -1,9 +1,137 @@
-
-
+
+
+
+
+
+
+ 部件名：
+
+
+
+
+
+
+
+
+ 研发确认：
+
+
+
+
+
+
+
+
+ 品质确认：
+
+
+
+
+
+
+
+
+ 中试确认：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ step.name }}
+
+
+
+
+ {{ c.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ x
+
+
+
+
+
+
+
+ 作业员：
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
@@ -11,15 +139,237 @@
export default {
data() {
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: {
-
+ 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
+ // })
+ // })
+ // })
+ // },
}
}
-
+
\ No newline at end of file
diff --git a/pages_order/order/ProcessCardOne.vue b/pages_order/order/ProcessCardOne.vue
index 9258ba8..cc85410 100644
--- a/pages_order/order/ProcessCardOne.vue
+++ b/pages_order/order/ProcessCardOne.vue
@@ -104,6 +104,18 @@
{{ w.specs }}
+
+
+
+ 备注：
+
+
+
+
+
diff --git a/pages_order/order/ProcessCardThree.vue b/pages_order/order/ProcessCardThree.vue
index a0f8aee..97b02e7 100644
--- a/pages_order/order/ProcessCardThree.vue
+++ b/pages_order/order/ProcessCardThree.vue
@@ -1,10 +1,114 @@
-
-
+
+
+
+
+
+ 部件名：
+
+
+
+
+
+
+
+
+ 研发确认：
+
+
+
+
+
+
+
+
+ 品质确认：
+
+
+
+
+
+
+
+
+ 中试确认：
+
+
+
+
+
+
+
+
+ 备注：
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ step.name }}
+
+
+
+
+ {{ c.name }}
+
+
+
+
+
+ 规格{{ xi + 1 }}：
+
+
+
+
+
+ {{ w.specs }}
+
+
+
+
+
+ 作业员：
+
+
+
+
+
+
+
+
+
+
- @leftClick="$utils.navigateBack"/>
+
+ 保存
+
@@ -12,31 +116,150 @@
export default {
data() {
return {
- StepThree :{}
+ id: 0,
+ StepOne: {},
+ stepList : [],
+ index : 1,
+ title : '',
}
},
onLoad(arg) {
this.id = arg.id
- console.log(arg);
+ this.index = arg.index || 2
+ this.title = arg.name
this.queryStepThree()
+ this.queryTemplateById()
},
methods: {
queryStepThree() {
this.$api('queryStepThree', {
templateId: this.id
}, res => {
-
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)
+ },
}
}
-
+
\ No newline at end of file
diff --git a/pages_order/order/ProcessCardTo.vue b/pages_order/order/ProcessCardTo.vue
index 600370c..b469f7d 100644
--- a/pages_order/order/ProcessCardTo.vue
+++ b/pages_order/order/ProcessCardTo.vue
@@ -5,66 +5,40 @@
- 中试作业员：
+ 部件名：
-
+
- 气缸料号1：
+ 研发确认：
-
+
- 气缸料号2：
+ 品质确认：
-
+
- 活塞料号1：
+ 中试确认：
-
+
-
-
- 活塞料号2：
-
-
-
-
-
-
-
-
- 滑片料号1：
-
-
-
-
-
-
-
-
- 滑片料号2：
-
-
-
-
-
@@ -85,11 +59,11 @@
规格{{ xi + 1 }}：
@@ -104,6 +78,18 @@
{{ w.specs }}
+
+
+
+ 作业员：
+
+
+
+
+
@@ -133,16 +119,16 @@
this.id = arg.id
this.index = arg.index || 1
this.title = arg.name
- this.queryStepOne()
+ this.queryStepTwo()
this.queryTemplateById()
},
methods: {
- queryStepOne() {
- this.$api('queryStepOne', {
+ queryStepTwo() {
+ this.$api('queryStepTwo', {
templateId: this.id
}, res => {
if (res.code == 200) {
- this.StepOne = res.result.workorderGeneralStepone
+ this.StepOne = res.result.workorderGeneralSteptwo
}
})
},
@@ -168,7 +154,7 @@
delete data.createBy
delete data.createTime
- this.$api('updateParamStepOne', data, res => {
+ this.$api('updateParamStepTwo', data, res => {
if(res.code == 200){
success(res)
}else{
@@ -188,7 +174,7 @@
delete StepOne.createTime
// 修改常规参数
- this.$api('updateGeneralStepOne', StepOne, res => {
+ this.$api('updateGeneralStepTwo', StepOne, res => {
})
uni.showToast({
@@ -204,8 +190,8 @@
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]
+ for(let k = 0;k < check.workorderParamSteptwoList.length;k++){
+ let params = check.workorderParamSteptwoList[k]
// 将请求添加到任务
tasks.push(this.updateParamStepOne(params))
}
diff --git a/pages_order/order/WorkOrderTotalList.vue b/pages_order/order/WorkOrderTotalList.vue
new file mode 100644
index 0000000..26a45f1
--- /dev/null
+++ b/pages_order/order/WorkOrderTotalList.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/WorkOrders.vue b/pages_order/order/WorkOrders.vue
index fd77cba..969f7ca 100644
--- a/pages_order/order/WorkOrders.vue
+++ b/pages_order/order/WorkOrders.vue
@@ -103,10 +103,9 @@
},
onLoad(args) {
this.id = args.id
- this.queryTemplateById()
},
onShow() {
- if(args.id){
+ if(this.id){
this.queryTemplateById()
}
},
@@ -128,9 +127,9 @@
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/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])
diff --git a/uni_modules/uv-steps/components/uv-steps-item/props.js b/uni_modules/uv-steps/components/uv-steps-item/props.js
index 1af6711..71d2e98 100644
--- a/uni_modules/uv-steps/components/uv-steps-item/props.js
+++ b/uni_modules/uv-steps/components/uv-steps-item/props.js
@@ -13,7 +13,7 @@ export default {
// 图标大小
iconSize: {
type: [String, Number],
- default: 17
+ default: 20
},
// 当前步骤是否处于失败状态
error: {
diff --git a/uni_modules/uv-steps/components/uv-steps-item/uv-steps-item.vue b/uni_modules/uv-steps/components/uv-steps-item/uv-steps-item.vue
index cfb6166..3b8ae9f 100644
--- a/uni_modules/uv-steps/components/uv-steps-item/uv-steps-item.vue
+++ b/uni_modules/uv-steps/components/uv-steps-item/uv-steps-item.vue
@@ -68,14 +68,14 @@
:text="title"
:type="parentData.current == index ? 'main' : 'content'"
lineHeight="20px"
- :size="parentData.current == index ? 14 : 13"
+ :size="parentData.current == index ? 20 : 18"
>