diff --git a/pages/index/oldOrderProject.vue.vue b/pages/index/oldOrderProject.vue.vue index cf111a9..89c29aa 100644 --- a/pages/index/oldOrderProject.vue.vue +++ b/pages/index/oldOrderProject.vue.vue @@ -6,14 +6,14 @@ - 选择检测项目 + 选择检测内容 - 可选检测项目: + 可选检测内容: - 已选检测项目: + 已选检测内容: diff --git a/pages/index/selectProject.vue b/pages/index/selectProject.vue index b363a11..3d4a85e 100644 --- a/pages/index/selectProject.vue +++ b/pages/index/selectProject.vue @@ -6,14 +6,14 @@ - 选择检测项目 + 选择检测内容 - 可选检测项目: + 可选检测内容: - 已选检测项目: + 已选检测内容: diff --git a/pages/staff/staff.vue b/pages/staff/staff.vue index edb6185..22c4cec 100644 --- a/pages/staff/staff.vue +++ b/pages/staff/staff.vue @@ -39,7 +39,7 @@ {{ item.goodsName }} 接待人:{{ item.workerName }} - 检测项目:{{ item.projectName }} + 检测内容:{{ item.projectName }} @@ -73,7 +73,8 @@ - 同意 + + 开始检测 取消接单 @@ -87,6 +88,11 @@ + + + + + 添加线下订单 @@ -98,7 +104,6 @@ - @@ -117,7 +122,7 @@ export default { partnerId: uni.getStorageSync("partnerId"), goodsTitle: '', tapindex: 0, - isExamine:false, + isExamine: false, msg: '1', carNum: '', pageNum: 1,//第几页 @@ -137,7 +142,13 @@ export default { text: "已完成", value: "3", } - ] + ], + chooseWorkNodes: [], + show: false, + takingData: { + workNodeId: null, + id: null + }, } }, onLoad() { @@ -171,6 +182,35 @@ export default { tabBar, }, methods: { + confirms(e) { + this.takingData.workNodeId = e.value[0].value + this.show = false + this.orderTaking(this.takingData) + }, + cancels() { + this.show = false + }, + // 让操作人选择要开始的项目 + async orderTakingBefore(item) { + this.takingData = { + workNodeId: null, + id: item.id + } + let res = await request({ + url: '/partnerOwn/partner/inspectionDetail', + method: 'get', + params: { + inspectionInfoId: item.id + } + }) + this.chooseWorkNodes = [res.data.workNodes.map(i => { + return { + label: i.projectName, + value: i.id + } + })] + this.show = true + }, msgInfo() { console.log(this.msgSocket, 'msgSocket') if (this.msgSocket) { @@ -481,6 +521,7 @@ export default { font-weight: 600; color: #FF571A; } + .lanniu-container { width: 90%; position: fixed; @@ -490,7 +531,15 @@ export default { justify-content: space-between; /* 控制子元素之间的间距,可以改为 center/space-around */ transform: translate(-50%); left: 50%; - z-index: 9999999999999999999999999999999999999999999999999999999; + z-index: 999998; +} + +.lanniu-container2 { + position: fixed; + display: flex; + align-items: center; + justify-content: space-between; /* 控制子元素之间的间距,可以改为 center/space-around */ + z-index: 999999; } .lanniu {