();
+ for (const person of persons) {
+ if (!uniquePersons.has(person.name)) {
+ uniquePersons.set(person.name, person);
+ }
+ }
+
+ return Array.from(uniquePersons.values());
+ }
+
+export const padNumberToLength=(num: number, length: number) : string=> {
+ let numStr = num.toString();
+ while (numStr.length < length) {
+ numStr = '0' + numStr;
+ }
+ return numStr;
+}
+
+
diff --git a/Web/src/views/basics-date/custom/component/editDialog.vue b/Web/src/views/basics-date/custom/component/editDialog.vue
index 2e9ac72..e31a3f7 100644
--- a/Web/src/views/basics-date/custom/component/editDialog.vue
+++ b/Web/src/views/basics-date/custom/component/editDialog.vue
@@ -72,7 +72,6 @@
-
diff --git a/Web/src/views/basics-date/distributor/index.vue b/Web/src/views/basics-date/distributor/index.vue
index 8745361..81fd3ce 100644
--- a/Web/src/views/basics-date/distributor/index.vue
+++ b/Web/src/views/basics-date/distributor/index.vue
@@ -150,6 +150,7 @@
import editDialog from '/@/views/basics-date/distributor/component/editDialog.vue'
import { pageDistributor, deleteDistributor } from '/@/api/main/distributor';
+
const showAdvanceQueryUI = ref(false);
const editDialogRef = ref();
diff --git a/Web/src/views/basics-date/unit/index.vue b/Web/src/views/basics-date/unit/index.vue
index baab16f..f084158 100644
--- a/Web/src/views/basics-date/unit/index.vue
+++ b/Web/src/views/basics-date/unit/index.vue
@@ -214,7 +214,6 @@ import { ElMessageBox, ElMessage } from 'element-plus';
let data = reactive({
unit: [] as SqlSugarPagedListSysUnitOutput[],//单位数据
unitGroup: [] as SysUnitGroupOutput[],//单位组数据
-
});
const ruleFormRef = ref();
diff --git a/Web/src/views/labelPrinting/codeElement/component/editDialog.vue b/Web/src/views/labelPrinting/codeElement/component/editDialog.vue
new file mode 100644
index 0000000..fbbf60f
--- /dev/null
+++ b/Web/src/views/labelPrinting/codeElement/component/editDialog.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+ {{ props.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Web/src/views/labelPrinting/codeElement/component/editElementDialog.vue b/Web/src/views/labelPrinting/codeElement/component/editElementDialog.vue
new file mode 100644
index 0000000..5881042
--- /dev/null
+++ b/Web/src/views/labelPrinting/codeElement/component/editElementDialog.vue
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+ {{ props.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 上移
+ 下移
+
+
+
+
+ 新增元素
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Web/src/views/labelPrinting/codeElement/index.vue b/Web/src/views/labelPrinting/codeElement/index.vue
new file mode 100644
index 0000000..3c6eb97
--- /dev/null
+++ b/Web/src/views/labelPrinting/codeElement/index.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ queryParams = {}"> 重置
+ 高级查询
+ 隐藏
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元素
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Web/src/views/labelPrinting/codeElementProp/component/editDialog.vue b/Web/src/views/labelPrinting/codeElementProp/component/editDialog.vue
new file mode 100644
index 0000000..ed9ddd1
--- /dev/null
+++ b/Web/src/views/labelPrinting/codeElementProp/component/editDialog.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+ {{ props.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Web/src/views/labelPrinting/codeElementProp/index.vue b/Web/src/views/labelPrinting/codeElementProp/index.vue
new file mode 100644
index 0000000..3a21b9e
--- /dev/null
+++ b/Web/src/views/labelPrinting/codeElementProp/index.vue
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ queryParams = {}"> 重置
+ 高级查询
+ 隐藏
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Web/src/views/labelPrinting/codePakageConfiguration/component/editDialog.vue b/Web/src/views/labelPrinting/codePakageConfiguration/component/editDialog.vue
new file mode 100644
index 0000000..a7e2094
--- /dev/null
+++ b/Web/src/views/labelPrinting/codePakageConfiguration/component/editDialog.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+ {{ props.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Web/src/views/labelPrinting/codePakageConfiguration/index.vue b/Web/src/views/labelPrinting/codePakageConfiguration/index.vue
new file mode 100644
index 0000000..6849aa6
--- /dev/null
+++ b/Web/src/views/labelPrinting/codePakageConfiguration/index.vue
@@ -0,0 +1,238 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ queryParams = {}"> 重置
+ 高级查询
+ 隐藏
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Web/src/views/labelPrinting/materialPrinting/component/editAccess.vue b/Web/src/views/labelPrinting/materialPrinting/component/editAccess.vue
index aa89c63..b19ffd1 100644
--- a/Web/src/views/labelPrinting/materialPrinting/component/editAccess.vue
+++ b/Web/src/views/labelPrinting/materialPrinting/component/editAccess.vue
@@ -33,7 +33,7 @@
-
+
@@ -78,11 +78,13 @@ import { SysUnitOutput, MaterialsOutput, SysPrint, PrintDataInput, PrintData, Pr
import { ElMessageBox, ElMessage, TabsPaneContext } from 'element-plus';
import VueJsonPretty from 'vue-json-pretty';
import 'vue-json-pretty/lib/styles.css';
+import {getCodeConfig} from "/@/api/main/codeElement";
import { hiprint } from 'vue-plugin-hiprint';
import providers from '../../print/component/hiprint/providers';
import PrintPreview from '../../print/component/hiprint/preview.vue';
import { PrintDataApiFp } from '../../../../api-services/apis/print-data-api';
+import { async } from '../../../../router/backEnd';
const props = defineProps({
@@ -92,7 +94,7 @@ const props = defineProps({
let hiprintTemplate = ref();
const preViewRef = ref();
-
+const codeConfigData = ref([]);
const printData = ref([]);
//定义printInfoFrom字段
@@ -154,8 +156,6 @@ const queryUnitByGroupId = async (groupId:number) => {
//定义matterSubmit方法
const printSubmit = () => {
- //changeMode();
- // console.log(printInfoFrom.printDataTem)
if(printInfoFrom.printDataTem=='')
{
ElMessage.error('请先选择打印模板');
@@ -163,12 +163,9 @@ const printSubmit = () => {
}
hiprintTemplate.value.clear();
hiprintTemplate.value?.update(JSON.parse(printInfoFrom.printDataTem));
- // console.log(hiprintTemplate.value)
- //console.log(hiprintTemplate.value.printPanels[0].width)
- let { width } = hiprintTemplate.value.printPanels[0].width;
- let tempPrintData =[{qrCode: '6544898545156',barCode:'456789'},{qrCode: 'https://cli.im/deqr/other',barCode:'https://www.baidu.com/'}]
+ //let { width } = hiprintTemplate.value.printPanels[0].width;
+ //let tempPrintData =[{qrCode: '6544898545156',barCode:'456789'},{qrCode: 'https://cli.im/deqr/other',barCode:'https://www.baidu.com/'}]
//preViewRef.value.showDialog(hiprintTemplate.value, tempPrintData, width);
-
getPrintData().then(()=>{
state.waitShowPrinter = true;
hiprintTemplate.value.print(
@@ -182,6 +179,18 @@ const printSubmit = () => {
);
});
+
+}
+
+//添加汇报单
+const addReport=async ()=>{
+ let reportData = {
+ unitGroupId:state.matterFrom.unitGroupId,
+ name:printInfoFrom.package,
+ printData:printData.value
+ };
+
+
}
// 查询操作
@@ -189,7 +198,7 @@ const getPrintData = async () => {
let codeType=printInfoFrom.printDataTem.includes('条形码')?'条形码':'二维码';
//PrintDataMaterialsInput
let printInput = {
- codeHead:state.matterFrom.codeNum,
+ codeHead:printInfoFrom.package,
codeLength:5,
count:printInfoFrom.printCount,
codeType:codeType
@@ -201,12 +210,6 @@ const getPrintData = async () => {
};
-const formInline = reactive({
- user: '',
- region: '',
- date: '',
-})
-
const onSubmit = () => {
console.log('submit!')
}
@@ -236,9 +239,14 @@ const printLabel = (data:any) => {
onMounted(() => {
handleQuery();
-
+ handleCodeConfigQuery();
})
+ // 查询操作
+ const handleCodeConfigQuery = async () => {
+ var res = await getCodeConfig();
+ codeConfigData.value = res.data.result ?? [];
+ };
// 选择模板
const changeMode = () => {
diff --git a/Web/src/views/labelPrinting/materialPrinting/index.vue b/Web/src/views/labelPrinting/materialPrinting/index.vue
index 1ff5a26..f5bfed3 100644
--- a/Web/src/views/labelPrinting/materialPrinting/index.vue
+++ b/Web/src/views/labelPrinting/materialPrinting/index.vue
@@ -40,7 +40,7 @@
- 打印标签
+ 打印标签
diff --git a/Web/src/views/labelPrinting/print/component/hiprint/providers.ts b/Web/src/views/labelPrinting/print/component/hiprint/providers.ts
index 16262a5..abf44ae 100644
--- a/Web/src/views/labelPrinting/print/component/hiprint/providers.ts
+++ b/Web/src/views/labelPrinting/print/component/hiprint/providers.ts
@@ -121,11 +121,11 @@ export const aProvider = function () {
{
tid: 'aProviderModule.creater',
title: '制表人',
- data: 'Admin.NET',
+ data: 'GuanWei',
type: 'text',
options: {
field: 'creater',
- testData: 'Admin.NET',
+ testData: 'GuanWei',
height: 16,
fontSize: 6.75,
fontWeight: '700',
@@ -151,11 +151,11 @@ export const aProvider = function () {
{
tid: 'aProviderModule.signer',
title: '库管签字',
- data: 'Admin.NET',
+ data: 'GuanWei',
type: 'text',
options: {
field: 'signer',
- testData: 'Admin.NET',
+ testData: 'GuanWei',
height: 16,
fontSize: 6.75,
fontWeight: '700',
@@ -166,11 +166,11 @@ export const aProvider = function () {
{
tid: 'aProviderModule.director',
title: '经理签字',
- data: 'Admin.NET',
+ data: 'GuanWei',
type: 'text',
options: {
field: 'director',
- testData: 'Admin.NET',
+ testData: 'GuanWei',
height: 16,
fontSize: 6.75,
fontWeight: '700',
diff --git a/Web/src/views/system/codeGen/index.vue b/Web/src/views/system/codeGen/index.vue
index f8414b8..8eda086 100644
--- a/Web/src/views/system/codeGen/index.vue
+++ b/Web/src/views/system/codeGen/index.vue
@@ -143,7 +143,7 @@ const handleCurrentChange = (val: number) => {
// 打开表增加页面
const openAddDialog = () => {
state.editMenuTitle = '增加';
- EditCodeGenRef.value?.openDialog({ authorName: 'Admin.NET', generateType: '200', nameSpace: state.applicationNamespaces[0] });
+ EditCodeGenRef.value?.openDialog({ authorName: 'GuanWei', generateType: '200', nameSpace: state.applicationNamespaces[0] });
};
// 打开表编辑页面