diff --git a/src/components/StatCard.vue b/src/components/StatCard.vue new file mode 100644 index 0000000..e3982e8 --- /dev/null +++ b/src/components/StatCard.vue @@ -0,0 +1,155 @@ + + + {{title}} + + + + + {{ items[0].value }} + {{ items[0].label }} + + + + + + + + + + {{ item.label }} + + + {{ item.value }} + + + + + + + + + + + + + + diff --git a/src/views/boardGenerate/index.vue b/src/views/boardGenerate/index.vue index ecae15a..fcba5db 100644 --- a/src/views/boardGenerate/index.vue +++ b/src/views/boardGenerate/index.vue @@ -1,6 +1,9 @@ + + {{pageSettingForm}} + + + + + + + + + + + + + + + { } }; - + diff --git a/src/views/print/externalPrint.vue b/src/views/print/externalPrint.vue index a3b7975..831d76f 100644 --- a/src/views/print/externalPrint.vue +++ b/src/views/print/externalPrint.vue @@ -16,7 +16,7 @@ @@ -70,6 +70,7 @@ :isView="true" :isPrint="isPrint" :pageData="pageData" + @update="setValue($event,i.data.options.field,k)" :pageSize="{ width: cmToPx(pageWidth), height: cmToPx(pageHeight) }" v-bind="i" > @@ -79,6 +80,7 @@ :isView="true" :isPrint="isPrint" :pageData="pageData" + @update="setValue($event,i.data.options.field,k)" :pageSize="{ width: cmToPx(pageWidth), height: cmToPx(pageHeight) }" v-bind="i" > @@ -151,31 +153,29 @@ const printRef = ref(); const pageWidth = ref(21); const pageHeight = ref(29.7); const pageDatas = ref([]); -const zoom = ref(1) +const zoom = ref(1); const { cmToPx } = options; const nodes = ref([]); const messageFun = (event) => { - console.log(event); // if (isJSON(event.data)) { // let data = JSON.parse(event.data); let data = event.data; - if (data.type === 'print') { - printFun(); - } + if (data.type === 'print') { + window.chrome?.webview?.postMessage(JSON.stringify({ value: pageDatas.value, type: 'print' })); + printFun(); + } if (data.type === 'JSONDATA') { - if (typeof data.message === 'object' && data.message !== null && !Array.isArray(data.message)) { - pageDatas.value = [data.message]; - // window.chrome?.webview?.postMessage('setDataFinally'); - } else if (Array.isArray(data.message)) { - pageDatas.value = data.message; - // window.chrome?.webview?.postMessage('setDataFinally'); - } else { - // window.chrome?.webview?.postMessage('setDataFail'); - } - console.log('message', data.message); + if (typeof data.message === 'object' && data.message !== null && !Array.isArray(data.message)) { + pageDatas.value = [data.message]; + // window.chrome?.webview?.postMessage('setDataFinally'); + } else if (Array.isArray(data.message)) { + pageDatas.value = data.message; + // window.chrome?.webview?.postMessage('setDataFinally'); + } else { + // window.chrome?.webview?.postMessage('setDataFail'); } + } // } - console.log(event); }; const setNodes = (data) => { @@ -203,11 +203,14 @@ const setNodes = (data) => { }; }); nextTick(() => { - zoom.value = ((printRef.value.offsetWidth - 20) / 793) + zoom.value = ((printRef.value.offsetWidth - 20) / 793); }); }); }); }; +const setValue = (value, field, index) => { + pageDatas.value[index][field] = value; +}; onMounted(() => { window.chrome?.webview?.addEventListener('message', messageFun); window.chrome?.webview?.postMessage('onMounted'); @@ -224,32 +227,11 @@ onMounted(() => { } } listPrintTemplateList().then(data => { - console.log(data); printTemplateList.value = data.rows; }); }); -const printInfoObj = { - id: 'printInfo', - preview: false, // 是否开启预览 - beforeOpenCallback(vue) { - console.log('触发打印工具打开前回调'); - }, - openCallback(vue) { - console.log('触发打印工具打开的回调'); - }, - closeCallback() { - console.log('触发关闭打印工具回调'); - }, - previewBeforeOpenCallback() { - console.log('触发预览前回调'); - }, - previewOpenCallback() { - console.log('触发预览的回调'); - } -}; const switchPrinter = (e) => { - console.log(e); printType.value = e; }; const printFun = (e) => { @@ -315,7 +297,6 @@ const openPrint = (pages, templateId) => { if (typeof pages !== 'object' || pages === null) { pageData = [pages]; } - console.log(pageData); pageDatas.value = pageData || []; }); }; diff --git a/src/views/print/externalPrint1.vue b/src/views/print/externalPrint1.vue deleted file mode 100644 index 650fdc6..0000000 --- a/src/views/print/externalPrint1.vue +++ /dev/null @@ -1,718 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ printName() }} - - - 导出PDF - 本地打印 - {{ i.name }} - - - - - - - - - - - - - - - diff --git a/src/views/print/index.vue b/src/views/print/index.vue index 3dc6b01..ca02891 100644 --- a/src/views/print/index.vue +++ b/src/views/print/index.vue @@ -51,11 +51,89 @@ - - - - - + 表单组件 + + 计划号 + + + 卡片编号 + + + 班次 + + + 班组 + + + 物料规格 + + + 机台 + + + 有效期/天 + + + 工装编号 + + + 宽度/毫米 + + + 开始时间 + + + 结束时间 + + + 数量 + + + 车次/批次 + + + 连续打印数 + + + 备注 + + + 条形码 + + + 选择框组件 + + 操作人 + + + 自检结果 + + + 单位 + + + 工位 + diff --git a/src/views/print/nodes/inputNode.vue b/src/views/print/nodes/inputNode.vue index aa3ee2c..11ac309 100644 --- a/src/views/print/nodes/inputNode.vue +++ b/src/views/print/nodes/inputNode.vue @@ -6,7 +6,7 @@ v-if="!props.isView && !props.isHideHandle && props.selected" /> - @@ -18,9 +18,9 @@