north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue
@@ -1,6 +1,6 @@ <script setup> import request from "@/utils/request" import {computed, onMounted, ref} from "vue" import {computed, onMounted, ref, watch} from "vue" import PrintFoot from "@/components/sd/order/PrintFoot.vue" import companyInfo from "@/stores/sd/companyInfo" import deepClone from "@/utils/deepClone"; @@ -22,11 +22,18 @@ let props = defineProps({ deliveryId:null, type:null type:null, optionVal:4 }) const form = ref({ }) let produceList2 = ref([]) watch(()=>props.optionVal,()=>{ //给数据进行分页 pageData.value = groupArrayByFive(produceList2.value[0].data) delivery.value = produceList2.value[0].delivery }) const deliveryId = ref() @@ -111,9 +118,7 @@ } //给数据进行分页 pageData.value = groupArrayByFive(produceList2.value[0].data) console.log(pageData.value) delivery.value = produceList2.value[0].delivery console.log(delivery.value) @@ -126,8 +131,11 @@ function groupArrayByFive(arr) { let result = []; for (let i = 0; i < arr.length; i += 4) { result.push(arr.slice(i, i + 4)); if(props.optionVal === null){ props.optionVal = 4 } for (let i = 0; i < arr.length; i += props.optionVal) { result.push(arr.slice(i, i + props.optionVal)); } return result; } @@ -429,6 +437,7 @@ --el-input-hover-border-color: rgba(255,255,255,0.0); --el-input-hover-border-width: 0px; width: 100%; word-break:break-all; } :deep(.el-textarea__inner){ color: #333333; north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue
@@ -1,6 +1,6 @@ <script setup> import request from "@/utils/request" import {computed, onMounted, onUpdated, ref} from "vue" import {computed, onMounted, onUpdated, ref, watch} from "vue" import PrintFoot from "@/components/sd/order/PrintFoot.vue" import companyInfo from "@/stores/sd/companyInfo" import deepClone from "@/utils/deepClone"; @@ -21,7 +21,8 @@ let props = defineProps({ deliveryId: null, type: null type: null, optionVal:8 }) const form = ref({}) let produceList2 = ref([]) @@ -30,6 +31,11 @@ const deliveryId = ref() const pageData = ref() watch(()=>props.optionVal,()=>{ //给数据进行分页 pageData.value = groupArrayByFive(produceList2.value[0].data) delivery.value = produceList2.value[0].delivery }) const getData = () => { if (props.deliveryId === null || props.deliveryId === undefined || props.deliveryId === '') { return @@ -165,8 +171,10 @@ }else{ next=true } if((index==3 && next) ||number==8){ if(props.optionVal === null){ props.optionVal = 8 } if((index==3 && next) ||number==props.optionVal){ results.push(numberResult); index=0 number=0 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -31,7 +31,7 @@ let sheetIndex = ref(-1) let rowClickIndex = ref(null) let produceList = ref([]) let optionVal = ref(null) let flowData = ref({ delivery: null @@ -292,6 +292,7 @@ flowData.value.delivery=delivery dialogTableVisible.value = true sheetIndex.value=3 optionVal.value = 4 }else{ ElMessage.warning(t('order.orderNotApproved')) } @@ -307,6 +308,7 @@ flowData.value.delivery=selectRecords dialogTableVisible.value = true sheetIndex.value=3 optionVal.value = 4 } @@ -325,6 +327,7 @@ flowData.value.delivery=delivery dialogTableVisible.value = true sheetIndex.value=4 optionVal.value = 4 }else{ ElMessage.warning(t('order.orderNotApproved')) } @@ -340,6 +343,7 @@ flowData.value.delivery=selectRecords dialogTableVisible.value = true sheetIndex.value=4 optionVal.value = 4 } @@ -358,6 +362,7 @@ flowData.value.delivery=delivery dialogTableVisible.value = true sheetIndex.value=5 optionVal.value = 8 }else{ ElMessage.warning(t('order.orderNotApproved')) } @@ -373,6 +378,7 @@ flowData.value.delivery=selectRecords dialogTableVisible.value = true sheetIndex.value=5 optionVal.value = 8 } @@ -391,6 +397,7 @@ flowData.value.delivery=delivery dialogTableVisible.value = true sheetIndex.value=6 optionVal.value = 8 }else{ ElMessage.warning(t('order.orderNotApproved')) } @@ -406,6 +413,7 @@ flowData.value.delivery=selectRecords dialogTableVisible.value = true sheetIndex.value=6 optionVal.value = 8 } @@ -652,13 +660,24 @@ <template #header="{ close, titleId, titleClass }"> <el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle /> <el-button @click="exportFile" :icon="Download" circle /> <el-select v-model="optionVal" v-if="sheetIndex>2" style="width: 120px"> <el-option v-for="n in 8" :key="n" :label="n" :value="n" /> </el-select> </template> <print-sheet1 id="child" v-if="sheetIndex===1" :deliveryId="flowData.delivery" /> <print-sheet2 id="child" v-if="sheetIndex===2" :deliveryId="flowData.delivery" /> <print-sheet-luoyang id="child" v-if="sheetIndex===3" :deliveryId="flowData.delivery" :type="1" /> <print-sheet-luoyang id="child" v-if="sheetIndex===4" :deliveryId="flowData.delivery" :type="2" /> <print-sheet-luoyang-details id="child" v-if="sheetIndex===5" :deliveryId="flowData.delivery" :type="3" /> <print-sheet-luoyang-details id="child" v-if="sheetIndex===6" :deliveryId="flowData.delivery" :type="4" /> <print-sheet-luoyang id="child" v-if="sheetIndex===3" :deliveryId="flowData.delivery" :type="1" :optionVal='optionVal'/> <print-sheet-luoyang id="child" v-if="sheetIndex===4" :deliveryId="flowData.delivery" :type="2" :optionVal='optionVal'/> <print-sheet-luoyang-details id="child" v-if="sheetIndex===5" :deliveryId="flowData.delivery" :type="3" :optionVal='optionVal'/> <print-sheet-luoyang-details id="child" v-if="sheetIndex===6" :deliveryId="flowData.delivery" :type="4" :optionVal='optionVal'/> </el-dialog> </div>
