diff --git a/component/public/errorshow.vue b/component/public/errorshow.vue index 569ae9a..903df19 100644 --- a/component/public/errorshow.vue +++ b/component/public/errorshow.vue @@ -69,6 +69,7 @@ flex-wrap: wrap; margin-bottom: 4vw; text-align: center; + overflow-wrap: break-word; } .qd { diff --git a/pages/NursingNew/component/doctorask/api/api.js b/pages/NursingNew/component/doctorask/api/api.js index affe975..012ca83 100644 --- a/pages/NursingNew/component/doctorask/api/api.js +++ b/pages/NursingNew/component/doctorask/api/api.js @@ -69,3 +69,12 @@ export const assistOrder = (params) => { data: params, }) } + +// 业务)生成即时指令工单接口 +export const generateInstant = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/serviceorder/generateInstant`, + method: 'post', + data: params, + }) +} \ No newline at end of file diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue index 56e2709..6bc8de7 100644 --- a/pages/NursingNew/component/index.vue +++ b/pages/NursingNew/component/index.vue @@ -114,7 +114,7 @@ 取消 - 确定 + 确定 @@ -139,7 +139,7 @@ - + {{indexmessage?.izStart=='N'?'待执行':'执行中'}} @@ -152,9 +152,11 @@ {{ indexmessage?.directiveName }} - + - {{indexmessage.categoryName}} + + {{indexmessage.categoryName}} + @@ -294,6 +296,7 @@ + @@ -475,7 +478,7 @@ - + {{ topbuttontarget==1?`照片`:`录像` }} @@ -509,7 +512,7 @@ { if(e>-1&&e==fwzldex.value){ @@ -998,8 +1002,27 @@ fwzldex.value = e } } + const error = ref(false) + const msg = ref('') const subitshowing = () =>{ - jszlshow.value = false + if(fwzldex.value<0){ + return + } + let code = fwzlindex.value==0?1:fwzlindex.value==1?2:4 + let obj = { + id:fwzlarr.value[fwzldex.value].id, + triggerMode:1, + orderType:code + } + console.log(obj) + generateInstant(obj).then(res=>{ + if(res.success){ + jszlshow.value = false + }else{ + error.value = true; + msg.value = res.message + } + }) } function calcAge(dateOfBirth : string) { diff --git a/pages/NursingNew/component/pleasetake/common/addwl.vue b/pages/NursingNew/component/pleasetake/common/addwl.vue index bcca73c..1e080fc 100644 --- a/pages/NursingNew/component/pleasetake/common/addwl.vue +++ b/pages/NursingNew/component/pleasetake/common/addwl.vue @@ -211,7 +211,7 @@ .more { margin-left: 0.6vw; position: relative; - background: RGBA(239, 240, 244, 1); + background: RGBA(239, 240, 244, 0); .righ0 { diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue index bffe59a..80dc54a 100644 --- a/pages/Warehouse/finish.vue +++ b/pages/Warehouse/finish.vue @@ -1081,6 +1081,7 @@ + diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue index c24b0be..f18a711 100644 --- a/pages/Warehouse/index/component/index.vue +++ b/pages/Warehouse/index/component/index.vue @@ -67,10 +67,11 @@ 取消 - 确定 + 确定 + @@ -348,10 +349,13 @@ - 单人执行 + 单人执行 + 协助执行 - {{indexmessage.employeeName}} + + {{indexmessage.employeeName}} + {{indexmessage.optNames}} - + diff --git a/pages/procurement/common/thwl.vue b/pages/procurement/common/thwl.vue index 711b1f3..c2d372a 100644 --- a/pages/procurement/common/thwl.vue +++ b/pages/procurement/common/thwl.vue @@ -27,7 +27,7 @@ - {{!qb?'更多':'收起'}} diff --git a/pages/procurement/common/toryitem.vue b/pages/procurement/common/toryitem.vue index c75b7f8..419786c 100644 --- a/pages/procurement/common/toryitem.vue +++ b/pages/procurement/common/toryitem.vue @@ -91,8 +91,9 @@ - - + + + @@ -449,13 +450,14 @@ background: #F9F9F9; overflow: hidden; view { - width: 1.6vw; - height: 1.6vw; + width: 2vw; + height: 2vw; z-index: 20; position: absolute; right: 0.1vw; top: 0.1vw; - background: rgba(255, 255, 255, 0.7); + border-radius:0.6vw 1.1vw 0.6vw 0.6vw; + background: rgba(255, 255, 255, 1); display: flex; justify-content: center; align-items: center; diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue index 42bc137..78942cd 100644 --- a/pages/procurement/inventory.vue +++ b/pages/procurement/inventory.vue @@ -256,6 +256,7 @@ +