diff --git a/pages.json b/pages.json index 8d15fe3..4f0ecb9 100644 --- a/pages.json +++ b/pages.json @@ -327,6 +327,18 @@ "bounce": "none" } } + }, + { + "path" : "pages/documentary/detail", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } } ], "globalStyle": { diff --git a/pages/customOrder/customOrder.vue b/pages/customOrder/customOrder.vue index f32bd95..66f951c 100644 --- a/pages/customOrder/customOrder.vue +++ b/pages/customOrder/customOrder.vue @@ -565,6 +565,7 @@ ::v-deep .van-field__control { border-bottom: 1px solid #d7d7d7; text-align: center; + font-size: 16px; } ::v-deep .van-field__label { diff --git a/pages/customOrder/detail.vue b/pages/customOrder/detail.vue index daf388b..5dd869c 100644 --- a/pages/customOrder/detail.vue +++ b/pages/customOrder/detail.vue @@ -709,6 +709,7 @@ ::v-deep .van-field__control { border-bottom: 1px solid #d7d7d7; text-align: center; + font-size: 16px; } ::v-deep .van-field__label { diff --git a/pages/customOrder/list.vue b/pages/customOrder/list.vue index a4b99cc..24486ae 100644 --- a/pages/customOrder/list.vue +++ b/pages/customOrder/list.vue @@ -252,6 +252,7 @@ ::v-deep .van-field__control { text-align: center; + font-size: 16px; } /*面料选择搜索框*/ diff --git a/pages/distribution/detailCus.vue b/pages/distribution/detailCus.vue index 9a07e84..5d1718c 100644 --- a/pages/distribution/detailCus.vue +++ b/pages/distribution/detailCus.vue @@ -79,6 +79,8 @@ belongTo: form.value.belongTo, zt: typeData.value, sd: form.value.sd, + innerComment:form.value.interComment, + customerComment:form.value.customerComment, mls: [] } } @@ -245,7 +247,7 @@ - + 扫一扫 @@ -256,7 +258,7 @@ @close="handleClose"> - + - + 部分配货 @@ -387,6 +389,7 @@ ::v-deep .van-field__control { border-bottom: 1px solid #d7d7d7; text-align: center; + font-size: 16px; } ::v-deep .van-field__label { diff --git a/pages/distribution/detailSpot.vue b/pages/distribution/detailSpot.vue index 3f3e3d3..48d1244 100644 --- a/pages/distribution/detailSpot.vue +++ b/pages/distribution/detailSpot.vue @@ -73,6 +73,7 @@ belongTo: '', zt: typeData.value, sd: form.value.sd, + customerComment:form.value.comment, mls: [] } } @@ -382,6 +383,8 @@ ::v-deep .van-field__control { border-bottom: 1px solid #d7d7d7; text-align: center; + font-size: 16px; + } ::v-deep .van-field__label { diff --git a/pages/documentary/detail.vue b/pages/documentary/detail.vue new file mode 100644 index 0000000..4940a18 --- /dev/null +++ b/pages/documentary/detail.vue @@ -0,0 +1,377 @@ + + + + + \ No newline at end of file diff --git a/pages/documentary/documentary.vue b/pages/documentary/documentary.vue index 9759063..75cc676 100644 --- a/pages/documentary/documentary.vue +++ b/pages/documentary/documentary.vue @@ -93,11 +93,11 @@ if (isValidJSON(l.craftComment)) { l.craftComment = JSON.parse(l.craftComment) } - if (l.status === '待进厂') { + if (l.zt === '待进厂') { l.butonColor = butonColor.value[0] - } else if (l.status === '待出厂') { + } else if (l.zt === '待出厂') { l.butonColor = butonColor.value[1] - } else if (l.status === '已出厂') { + } else if (l.zt === '已出厂') { l.butonColor = butonColor.value[2] } else { l.butonColor = butonColor.value[getRandomIntInclusive(3, 14)] @@ -259,13 +259,6 @@ const showDialog = ref(false) const itemList = ref({} as any) - const toDetile = (item : any) => { - if (item.status === '待进厂') { - showDialog.value = true - itemList.value = item - } - } - const submit = () => { if (!dataItem.value.yjccts) return showToast('请填写预计出厂天数!') dataItem.value.zt = itemList.value.status @@ -276,6 +269,20 @@ } }) } + + //计算米数 + const computing = (list:any) =>{ + let total=list.reduce((accumulator:any, currentValue:any) => { + return accumulator + currentValue.ms*1; + }, 0); + return total + } + //工序详情 + const toDetile = (item:any) =>{ + uni.navigateTo({ + url:'./detail?item='+JSON.stringify(item) + }) + }