diff --git a/src/pages/picking/review/details.vue b/src/pages/picking/review/details.vue index e3c8bdf..f585d98 100644 --- a/src/pages/picking/review/details.vue +++ b/src/pages/picking/review/details.vue @@ -485,7 +485,7 @@ const onHandleOutbound = async () => { } .step-title { - font-size: 11px; + font-size: 10px; font-weight: 400; margin-bottom: 3px; text-align: center; diff --git a/src/pages/picking/review/index.vue b/src/pages/picking/review/index.vue index 4151621..bb638a9 100644 --- a/src/pages/picking/review/index.vue +++ b/src/pages/picking/review/index.vue @@ -41,16 +41,10 @@ class="table-list-item" :key="index" v-for="(item, index) in tableList" - @click="handleItem(item)" + @click="onReview(item)" > - +
{{ item.code }}
@@ -177,19 +171,41 @@ const viewOptions = reactive([ // 审核/查看 -const onReview = (e, item) => { - console.log('e', e) - const params = { - id: item.id, - taskId: item.taskId, - flowId: item.flowId, - nodeId: item.nodeId, - type: e.content.text ==='审核' ? 1 : 2, +const onReview = (item) => { + if(item.taskStatus === 3 || item.taskStatus === 2){ + uni.navigateTo({ + url: `/pages/picking/review/details?params=${JSON.stringify({ + id: item.id, + taskId: item.taskId, + flowId: item.flowId, + nodeId: item.nodeId, + type: 2, + })}`, + }) + }else if((item.taskStatus === 1 || item.taskStatus === 0) && typeof item.configValue === 'string' && item.configValue.includes(userId.value)){ + console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxx",userId) + uni.navigateTo({ + url: `/pages/picking/review/details?params=${JSON.stringify({ + id: item.id, + taskId: item.taskId, + flowId: item.flowId, + nodeId: item.nodeId, + type: 1, + })}`, + }) } - console.log('params', params) - uni.navigateTo({ - url: `/pages/picking/review/details?params=${JSON.stringify(params)}`, - }) + + // const params = { + // id: item.id, + // taskId: item.taskId, + // flowId: item.flowId, + // nodeId: item.nodeId, + // type: e.content.text ==='审核' ? 1 : 2, + // } + // console.log('params', params) + // uni.navigateTo({ + // url: `/pages/picking/review/details?params=${JSON.stringify(params)}`, + // }) } const handleItemxxxx = (item) => {