From d2a3c0f45a7505eb720b350c66084b06b8f292da Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 29 Nov 2024 15:54:23 +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 | 13 +++
components/work/WorkOrderitem.vue | 2 +-
config.js | 2 +-
manifest.json | 2 +-
pages/index/index.vue | 18 +---
.../auth/loginAndRegisterAndForgetPassword.vue | 3 +-
pages_order/order/ChangePassword.vue | 2 -
pages_order/order/FavoriteList.vue | 4 +-
pages_order/order/ModifyMembers.vue | 14 ++-
pages_order/order/ProcessCardOne.vue | 112 ++++++++++++++++++---
pages_order/order/WorkOrderList.vue | 4 +-
pages_order/order/WorkOrders.vue | 42 ++++++--
store/store.js | 13 ++-
13 files changed, 176 insertions(+), 55 deletions(-)
diff --git a/api/api.js b/api/api.js
index 4e56563..169d5e9 100644
--- a/api/api.js
+++ b/api/api.js
@@ -57,6 +57,7 @@ const config = {
url: '/workorder/template/queryTemplateById',
method: 'GET',
auth : true,
+ showLoading : true,
},
//工单信息-工序卡3详情
queryStepThree: {
@@ -64,6 +65,18 @@ const config = {
method: 'GET',
auth : true,
},
+ //工单信息-修改常规参数-工序卡1(选配)
+ updateGeneralStepOne: {
+ url: '/workorder/template/updateGeneralStepOne',
+ method: 'POST',
+ auth : true,
+ },
+ //工单信息-修改工序参数-工序卡1(选配)
+ updateParamStepOne: {
+ url: '/workorder/template/updateParamStepOne',
+ method: 'POST',
+ auth : true,
+ },
}
diff --git a/components/work/WorkOrderitem.vue b/components/work/WorkOrderitem.vue
index 981be62..f609c91 100644
--- a/components/work/WorkOrderitem.vue
+++ b/components/work/WorkOrderitem.vue
@@ -41,7 +41,7 @@
工单状态：
- {{ obj.remark }}
+ {{ obj.statusId_dictText }}
diff --git a/config.js b/config.js
index ce904f0..c94e5c3 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
Vue.use(uvUI);
// 当前环境
-const type = 'dev'
+const type = 'prod'
// 环境配置
diff --git a/manifest.json b/manifest.json
index ea42a21..a427535 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wxe7ae8cbe1673834c",
+ "appid" : "wx50cf2c3632649ec3",
"setting" : {
"urlCheck" : false
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 81f1abb..e59646e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -69,9 +69,7 @@
import tabber from '@/components/base/tabbar.vue'
import WorkOrderitem from '@/components/work/WorkOrderitem.vue'
import mixinsList from '@/mixins/list.js'
- import {
- mapGetters
- } from 'vuex'
+ import { mapGetters } from 'vuex'
export default {
mixins: [mixinsList],
components: {
@@ -104,9 +102,9 @@
computed: {
},
onLoad() {
+ this.queryParams.isEmergency = 1
this.queryBannerList()
this.queryNewsList()
- this.queryCollectionList()
},
methods: {
//轮播图
@@ -122,28 +120,16 @@
this.$api('queryNewsList', res =>{
if(res.code == 200){
this.NewsList = res.result.records
-
res.result.records.forEach(n => {
this.text.push(n.title)
})
}
})
},
- //收藏信息-我的收藏
- queryCollectionList(){
- this.$api('queryCollectionList', res =>{
- if(res.code == 200){
- this.CollectionList = res.result.records
- }
- })
- },
toNotice(index){
- console.log(this.NewsList[index]);
- // @click="$utils.navigateTo('/pages_order/order/Worknotice')"
uni.navigateTo({
url: '/pages_order/order/Worknotice?id=' + this.NewsList[index].id
})
-
},
}
}
diff --git a/pages_order/auth/loginAndRegisterAndForgetPassword.vue b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
index e0051c8..7dfcd2c 100644
--- a/pages_order/auth/loginAndRegisterAndForgetPassword.vue
+++ b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
@@ -1,6 +1,6 @@
-
+
@@ -255,6 +255,7 @@
.frame {
background-color: #FFF;
+ margin-top: 120rpx;
.loginRegister {
display: flex;
diff --git a/pages_order/order/ChangePassword.vue b/pages_order/order/ChangePassword.vue
index 728a305..c1bffd0 100644
--- a/pages_order/order/ChangePassword.vue
+++ b/pages_order/order/ChangePassword.vue
@@ -5,7 +5,6 @@
-
@@ -46,7 +45,6 @@
change(e) {
console.log('change', e);
}
-
}
}
diff --git a/pages_order/order/FavoriteList.vue b/pages_order/order/FavoriteList.vue
index f5dac21..4cb0f5d 100644
--- a/pages_order/order/FavoriteList.vue
+++ b/pages_order/order/FavoriteList.vue
@@ -57,9 +57,9 @@
},
click(item) {
if(item.id){
- this.queryParams.status = item.id
+ this.queryParams.statusId = item.id
}else{
- delete this.queryParams.status
+ delete this.queryParams.statusId
}
this.getData()
},
diff --git a/pages_order/order/ModifyMembers.vue b/pages_order/order/ModifyMembers.vue
index c49953c..c885ad7 100644
--- a/pages_order/order/ModifyMembers.vue
+++ b/pages_order/order/ModifyMembers.vue
@@ -11,16 +11,20 @@
class="headPortrait">
-
+ mode=""> -->
-
+ mode=""> -->
+
+
@@ -80,7 +84,7 @@
}
})
},
- getDetail(){
+ getDetail(title){
this.$api('queryUserById', {
userId : this.id
}, res =>{
diff --git a/pages_order/order/ProcessCardOne.vue b/pages_order/order/ProcessCardOne.vue
index 7b15659..d3b8b6b 100644
--- a/pages_order/order/ProcessCardOne.vue
+++ b/pages_order/order/ProcessCardOne.vue
@@ -69,33 +69,39 @@
-
+
- 上钢选配
+ {{ step.name }}
+ :key="cIndex"
+ v-for="(c, cIndex) in step.workorderItemCheckList">
- 钢化膜
+ {{ c.name }}
-
+
- 规格{{ index + 1 }}：
+ 规格{{ xi + 1 }}：
+ v-model="w['param' + (xi + 1)]"/>
- {{ step.specs }}
+ {{ w.specs }}
@@ -119,11 +125,14 @@
id: 0,
StepOne: {},
stepList : [],
+ index : 0,
}
},
onLoad(arg) {
this.id = arg.id
+ this.index = arg.index || 0
this.queryStepOne()
+ this.queryTemplateById()
},
methods: {
queryStepOne() {
@@ -132,12 +141,89 @@
}, res => {
if (res.code == 200) {
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);
+
+ 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)
},
}
}
diff --git a/pages_order/order/WorkOrderList.vue b/pages_order/order/WorkOrderList.vue
index 39e7534..28c3fc4 100644
--- a/pages_order/order/WorkOrderList.vue
+++ b/pages_order/order/WorkOrderList.vue
@@ -48,9 +48,9 @@
methods: {
clickTab(item){
if(item.id){
- this.queryParams.status = item.id
+ this.queryParams.statusId = item.id
}else{
- delete this.queryParams.status
+ delete this.queryParams.statusId
}
this.getData()
},
diff --git a/pages_order/order/WorkOrders.vue b/pages_order/order/WorkOrders.vue
index c9219a1..01c6bc0 100644
--- a/pages_order/order/WorkOrders.vue
+++ b/pages_order/order/WorkOrders.vue
@@ -47,7 +47,7 @@
状态：
- {{TemplateById.remark}}
+ {{TemplateById.statusDescribe}}
@@ -55,25 +55,31 @@
备注：
-
+ {{TemplateById.remark}}
-
- 中试压缩机试作工序卡1（选配）
+
+ {{ item.name }}
-
+
diff --git a/store/store.js b/store/store.js
index 60880bc..7021bbf 100644
--- a/store/store.js
+++ b/store/store.js
@@ -11,7 +11,8 @@ const store = new Vuex.Store({
configList: [], //配置列表
userInfo : {}, //用户信息
permissions : [],//权限列表
- statusList : [],
+ statusList : [],//工单状态列表
+ // workDetail : {},//工单详情
},
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: {},
})