Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
# Conflicts:
# UI-Project/src/lang/zh.js
# UI-Project/src/views/NewPage.vue
# UI-Project/src/views/Returns/upreturns.vue
# UI-Project/src/views/Slicecage/slicecage.vue
# UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
| | |
|---|
| | | <script setup> |
|---|
| | | import request from "@/utils/request" |
|---|
| | | import {ElDatePicker, ElMessage} from "element-plus" |
|---|
| | | import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue" |
|---|
| | | import {Search} from "@element-plus/icons-vue" |
|---|
| | | import {ElMessage} from "element-plus" |
|---|
| | | import {onMounted, ref} from "vue" |
|---|
| | | // import {useRouter} from 'vue-router' |
|---|
| | | // import {changeFilterEvent, filterChanged} from "@/hook" |
|---|
| | | // import {useI18n} from 'vue-i18n' |
|---|
| | |
|---|
| | | let props = defineProps({ |
|---|
| | | printFlowCardId: null, |
|---|
| | | printLayer: null, |
|---|
| | | printGlassId: null, |
|---|
| | | }) |
|---|
| | | |
|---|
| | | onMounted(async () => { |
|---|
| | | console.log(props.printFlowCardId,props.printLayer) |
|---|
| | | const response = await request.post('/unLoadGlass/downGlassInfo/downGlassLabelPrint',{ |
|---|
| | | flowCardId:props.printFlowCardId, |
|---|
| | | layer:props.printLayer |
|---|
| | | layer: props.printLayer, |
|---|
| | | glassId: props.printGlassId |
|---|
| | | }); |
|---|
| | | if (response.code == 200) { |
|---|
| | | console.log("lastList.value",response.data) |
|---|
