From ab56bc354afaaa203cdbbdf4d3ec516fef9e6087 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 7 May 2024 09:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E8=BD=AC=E6=A0=87=E7=AD=BE=E6=89=93?=
 =?UTF-8?q?=E5=8D=B050%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   4 +-
 .../components/InputArea.vue                  |   0
 .../components/OtherMsg.vue                   |   1 +
 .../components/Printed.vue                    |   0
 .../components/PrintedEdit.vue                |   0
 .../components/UnPrint.vue                    | 103 +-
 .../components/UnPrintEdit.vue                |   0
 .../components/preview.vue                    |   0
 src/views/base/packagingPrintLog/index.vue    | 367 +-------
 .../base/packagingPrintLog/print-template.js  | 889 ++++++++++++++++++
 .../SmallTitle.vue                            |   0
 .../add-or-updata.vue                         |   0
 src/views/base/packagingPrintLog1/index.vue   | 344 +++++++
 .../unitDict.vue                              |   0
 src/views/base/packagingPrintLog2/index.vue   |  47 -
 .../base/packagingPrintLog2/print-template.js | 554 -----------
 16 files changed, 1361 insertions(+), 948 deletions(-)
 rename src/views/base/{packagingPrintLog2 => packagingPrintLog}/components/InputArea.vue (100%)
 rename src/views/base/{packagingPrintLog2 => packagingPrintLog}/components/OtherMsg.vue (99%)
 rename src/views/base/{packagingPrintLog2 => packagingPrintLog}/components/Printed.vue (100%)
 rename src/views/base/{packagingPrintLog2 => packagingPrintLog}/components/PrintedEdit.vue (100%)
 rename src/views/base/{packagingPrintLog2 => packagingPrintLog}/components/UnPrint.vue (72%)
 rename src/views/base/{packagingPrintLog2 => packagingPrintLog}/components/UnPrintEdit.vue (100%)
 rename src/views/base/{packagingPrintLog2 => packagingPrintLog}/components/preview.vue (100%)
 create mode 100644 src/views/base/packagingPrintLog/print-template.js
 rename src/views/base/{packagingPrintLog => packagingPrintLog1}/SmallTitle.vue (100%)
 rename src/views/base/{packagingPrintLog => packagingPrintLog1}/add-or-updata.vue (100%)
 create mode 100644 src/views/base/packagingPrintLog1/index.vue
 rename src/views/base/{packagingPrintLog => packagingPrintLog1}/unitDict.vue (100%)
 delete mode 100644 src/views/base/packagingPrintLog2/index.vue
 delete mode 100644 src/views/base/packagingPrintLog2/print-template.js

diff --git a/.env.dev b/.env.dev
index 9a3e70a1..5a600926 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,8 +12,8 @@ ENV = 'development'
 VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.1.104:48082'
 # VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.1.101:48082'
diff --git a/src/views/base/packagingPrintLog2/components/InputArea.vue b/src/views/base/packagingPrintLog/components/InputArea.vue
similarity index 100%
rename from src/views/base/packagingPrintLog2/components/InputArea.vue
rename to src/views/base/packagingPrintLog/components/InputArea.vue
diff --git a/src/views/base/packagingPrintLog2/components/OtherMsg.vue b/src/views/base/packagingPrintLog/components/OtherMsg.vue
similarity index 99%
rename from src/views/base/packagingPrintLog2/components/OtherMsg.vue
rename to src/views/base/packagingPrintLog/components/OtherMsg.vue
index c4425b29..d9f48d59 100644
--- a/src/views/base/packagingPrintLog2/components/OtherMsg.vue
+++ b/src/views/base/packagingPrintLog/components/OtherMsg.vue
@@ -204,6 +204,7 @@ export default {
 			});
 		},
 		changeChoose(val) {
+			console.log(val);
 			this.$emit('changeChoose', val);
 		},
 	},
diff --git a/src/views/base/packagingPrintLog2/components/Printed.vue b/src/views/base/packagingPrintLog/components/Printed.vue
similarity index 100%
rename from src/views/base/packagingPrintLog2/components/Printed.vue
rename to src/views/base/packagingPrintLog/components/Printed.vue
diff --git a/src/views/base/packagingPrintLog2/components/PrintedEdit.vue b/src/views/base/packagingPrintLog/components/PrintedEdit.vue
similarity index 100%
rename from src/views/base/packagingPrintLog2/components/PrintedEdit.vue
rename to src/views/base/packagingPrintLog/components/PrintedEdit.vue
diff --git a/src/views/base/packagingPrintLog2/components/UnPrint.vue b/src/views/base/packagingPrintLog/components/UnPrint.vue
similarity index 72%
rename from src/views/base/packagingPrintLog2/components/UnPrint.vue
rename to src/views/base/packagingPrintLog/components/UnPrint.vue
index 1f958865..cf34848c 100644
--- a/src/views/base/packagingPrintLog2/components/UnPrint.vue
+++ b/src/views/base/packagingPrintLog/components/UnPrint.vue
@@ -46,17 +46,18 @@ const tableProps = [
 		showOverflowtooltip: true,
 	},
 	{
-		prop: 'lineId',
+		prop: 'lineName',
 		label: '产线',
 		showOverflowtooltip: true,
 	},
 	{
 		prop: 'specifications',
 		label: '规格',
+		minWidth: 140,
 		showOverflowtooltip: true,
 	},
 	{
-		prop: 'check',
+		prop: 'checkGoodName',
 		label: '判定',
 		showOverflowtooltip: true,
 	},
@@ -74,12 +75,12 @@ const tableProps = [
 	{
 		prop: 'remark',
 		label: '备注1',
+		minWidth: 120,
 		showOverflowtooltip: true,
 	},
 	{
-		prop: 'printStatus',
+		prop: 'printStatusName',
 		label: '打印状态',
-		filter: (val) => (val == 1 ? '未打印' : '已打印'),
 	},
 	{
 		prop: 'createTime',
@@ -106,27 +107,30 @@ export default {
 		return {
 			printMsg1: {
 				customerId: '',
+				customerName: '',
 				sealWorker: '',
 				packWorker: '',
 				processCard: '',
 				pallet: '',
-				remark: '',
+				remarkT: '',
 			},
 			printMsg2: {
 				customerId: '',
+				customerName: '',
 				sealWorker: '',
 				packWorker: '',
 				processCard: '',
 				pallet: '',
-				remark: '',
+				remarkT: '',
 			},
 			printMsg3: {
 				customerId: '',
+				customerName: '',
 				sealWorker: '',
 				packWorker: '',
 				processCard: '',
 				pallet: '',
-				remark: '',
+				remarkT: '',
 			},
 			chooseMsg: 1, //单选
 			formConfig: [
@@ -157,6 +161,16 @@ export default {
 					color: 'primary',
 				},
 			],
+			lineList: [],
+			printStatusList: [
+				{ id: 1, name: '未打印' },
+				{ id: 2, name: '已打印' },
+				{ id: 3, name: '已重打' },
+			],
+			checkGoodList: [
+				{ id: 0, name: '否' },
+				{ id: 1, name: '是' },
+			],
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
@@ -242,18 +256,39 @@ export default {
 	},
 	mounted() {
 		this.getLineList();
-		console.log(printTemplate);
+		this.getTopTitle();
+		console.log(JSON.stringify(printTemplate));
 		console.log('================printTemplate');
 	},
 	methods: {
 		getLineList() {
 			getCorePLList().then((res) => {
-				this.formConfig[0].selectOptions = res.data;
+				this.formConfig[0].selectOptions = res.data || [];
+				this.lineList = res.data || [];
+				this.getList();
 			});
 		},
 		getList() {
 			getPackingPage({ ...this.queryParams }).then((res) => {
-				this.list = res.data.records || [];
+				let arr = res.data.records || [];
+				arr.map((item) => {
+					this.lineList.map((subItem) => {
+						if (item.lineId === subItem.id) {
+							item.lineName = subItem.name;
+						}
+					});
+					this.printStatusList.map((subItem2) => {
+						if (item.printStatus === subItem2.id) {
+							item.printStatusName = subItem2.name;
+						}
+					});
+					this.checkGoodList.map((subItem3) => {
+						if (item.checkGood === subItem3.id) {
+							item.checkGoodName = subItem3.name;
+						}
+					});
+				});
+				this.list = arr;
 				this.total = res.data.total;
 			});
 		},
@@ -276,9 +311,13 @@ export default {
 					this.saveNum(val.data);
 					break;
 				case 'view':
-					this.preView();
+					// 保存选中的内容
+					this.saveTopTitle();
+					this.preView(val.data);
 					break;
 				case 'print':
+					// 保存选中的内容
+					this.saveTopTitle();
 					this.printTemp();
 					break;
 				default:
@@ -302,11 +341,18 @@ export default {
 			this.list[val._pageIndex - 1][val.prop] = val[val.prop];
 		},
 		// 预览
-		preView() {
+		preView(data) {
+			let topMsg =
+				this.chooseMsg === 1
+					? this.printMsg1
+					: this.chooseMsg === 2
+					? this.printMsg2
+					: this.printMsg3;
+			let printData = { ...data, ...topMsg };
 			var hiprintTemplate = new hiprint.PrintTemplate({
 				template: printTemplate,
 			});
-			this.$refs.preView.show(hiprintTemplate);
+			this.$refs.preView.show(hiprintTemplate, printData);
 		},
 		// 打印
 		printTemp() {
@@ -327,6 +373,37 @@ export default {
 			);
 			console.log(hiprintTemplate);
 		},
+		// 保存选中的内容
+		saveTopTitle() {
+			switch (this.chooseMsg) {
+				case 1:
+					localStorage.setItem('printMsg1', JSON.stringify(this.printMsg1));
+					break;
+				case 2:
+					localStorage.setItem('printMsg2', JSON.stringify(this.printMsg2));
+					break;
+				case 3:
+					localStorage.setItem('printMsg3', JSON.stringify(this.printMsg3));
+					break;
+				default:
+					throw new Error(`${this.chooseMsg}的值不正确，请检查！`);
+			}
+		},
+		// 获取打印内容top
+		getTopTitle() {
+			let pm1 = localStorage.getItem('printMsg1');
+			let pm2 = localStorage.getItem('printMsg2');
+			let pm3 = localStorage.getItem('printMsg3');
+			if (pm1) {
+				this.printMsg1 = JSON.parse(pm1);
+			}
+			if (pm2) {
+				this.printMsg2 = JSON.parse(pm2);
+			}
+			if (pm3) {
+				this.printMsg3 = JSON.parse(pm3);
+			}
+		},
 	},
 };
 </script>
diff --git a/src/views/base/packagingPrintLog2/components/UnPrintEdit.vue b/src/views/base/packagingPrintLog/components/UnPrintEdit.vue
similarity index 100%
rename from src/views/base/packagingPrintLog2/components/UnPrintEdit.vue
rename to src/views/base/packagingPrintLog/components/UnPrintEdit.vue
diff --git a/src/views/base/packagingPrintLog2/components/preview.vue b/src/views/base/packagingPrintLog/components/preview.vue
similarity index 100%
rename from src/views/base/packagingPrintLog2/components/preview.vue
rename to src/views/base/packagingPrintLog/components/preview.vue
diff --git a/src/views/base/packagingPrintLog/index.vue b/src/views/base/packagingPrintLog/index.vue
index 450f9294..ecc60ac9 100644
--- a/src/views/base/packagingPrintLog/index.vue
+++ b/src/views/base/packagingPrintLog/index.vue
@@ -1,344 +1,47 @@
-<!--
- * @Author: zwq
- * @Date: 2023-08-01 14:55:51
- * @LastEditors: zhp
- * @LastEditTime: 2024-04-10 16:34:40
- * @Description:
--->
 <template>
-  <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-      :table-data="tableData">
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-        @clickBtn="handleClick" />
-    </base-table>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getDataList" />
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
-  </div>
+	<div class="packagingPrintLog-box">
+		<div style="width: 100%">
+			<ButtonNav
+				:menus="['未打印', '已打印']"
+				:button-mode="true"
+				@change="currentMenu"></ButtonNav>
+		</div>
+		<!-- 未打印 -->
+		<UnPrint v-if="activeMenu == '未打印'" />
+		<!-- 已打印 -->
+		<Printed v-else />
+	</div>
 </template>
-
 <script>
-import AddOrUpdate from './add-or-updata';
-// import unitDict from './unitDict';
-import basicPage from '../mixins/basic-page';
-import { parseTime } from '../mixins/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import {
-  getPackingModel,
-} from '@/api/base/printModel.js'
-import {
-	deletePacking,
-  getPackingPage,
-  getWorkOrderList,
-	exportPackingExcel,
-} from '@/api/base/packingInfo';
-
-const tableProps = [
-	{
-    prop: 'packagingCode',
-    label: '包装流水号'
-  },
-  {
-    prop: 'packagingBarCode',
-    label: '包装条码'
-  },
-	{
-    prop: 'workOrderName',
-		label: '所属工单'
-	},
-	{
-    prop: 'customerName',
-		label: '客户'
-	},
-	{
-    prop: 'content',
-		label: '内容',
-		// subcomponent: unitDict,
-  },
-  {
-    prop: 'modelName',
-    label: '标签模板',
-    // subcomponent: unitDict,
-  },
-  {
-    prop: 'printStatus',
-    label: '打印状态',
-    filter: (val) => val == 1 ? '未打印' : '已打印',
-  },
-	{
-    prop: 'createTime',
-		label: '生成日期',
-		filter: parseTime
-	},
-];
-
+import ButtonNav from '@/components/ButtonNav';
+import UnPrint from './components/UnPrint';
+import Printed from './components/Printed';
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	name: 'packagingPrintLog',
+	components: { ButtonNav, UnPrint, Printed },
 	data() {
 		return {
-			urlOptions: {
-        getDataListURL: getPackingPage,
-				deleteURL: deletePacking,
-				exportURL: exportPackingExcel,
-			},
-			tableProps,
-      tableBtn: [
-        {
-          type: 'print',
-          btnName: '打印',
-        },
-        this.$auth.hasPermi(`base:packaging-print-log:update`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-					  }
-          : undefined,
-        this.$auth.hasPermi(`base:packaging-print-log:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-          : undefined,
-			].filter((v) => v),
-			tableData: [],
-      formConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'workOrderId',
-          filterable: true,
-        },
-        {
-          // parent: 'dateFilterType',
-          // 时间段选择
-          type: 'datePicker',
-          // label: '时间段',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          defaultTime: ['00:00:00', '00:00:00'],
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'createTime',
-        },
-				{
-          type: this.$auth.hasPermi('base:packaging-print-log:query') ? 'button' : '',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
-        {
-          type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'separate' : '',
-				},
-				{
-          type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
-					btnName: '新增',
-					name: 'add',
-					color: 'success',
-					plain: true,
-				},
-				// {
-				// 	type: 'separate',
-				// 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('base:product:export') ? 'button' : '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
+			activeMenu: '未打印',
 		};
 	},
-	components: {
-		AddOrUpdate,
-	},
-  created() {
-    this.getDict()
-  },
-  methods: {
-    getDataList() {
-      this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.records;
-        this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
-      });
-    },
-    getDict() {
-      // 获取产品的属性列表
-      // getCustomerList().then((response) => {
-      //   console.log(response);
-      //   this.customerList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      // getModelList().then((response) => {
-      //   console.log(response);
-      //   this.modelList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      getWorkOrderList().then((response) => {
-        // console.log(response);
-        this.formConfig[0].selectOptions = response.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-    },
-    deleteHandle(id, name, index, packagingCode) {
-      this.$confirm(`是否确认删除${'[' + packagingCode + ']'}数据项?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.urlOptions.deleteURL(id).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.getDataList();
-              },
-            });
-          });
-        })
-        .catch(() => { });
-    },
-    handlePrint(id) {
-      if (id) {
-        getPackingModel(id).then(res => {
-          var obj = {
-            code: '11111222',
-            test: '11111',
-            test2: '3333333',
-            test1: '222222',
-          }
-          console.log(res);
-          // getPackingListInfo({
-          //   size: 20,
-          //   current: 1,
-          //   boxNo: printModel.boxNo
-          // }).then(result => {
-          //   this.substrateList = result.data.records
-          //   var obj = {
-          //     // time: this.getNewDate(),
-          //     boxNo: this.currentData.boxNo,
-          //     orderNum: this.currentData.orderNum,
-          //     powerLevel: this.currentData.powerLevel,
-          //     sapMaterial: this.currentData.sapMaterial,
-          //     img: 'data:image/png;base64,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',
-          //     // lineBody: this.currentData.lineBody == 1 ? 'F ' : 'S',
-          //     createTime: moment(this.currentData.createTime).format('YYYY-MM-DD HH:mm:ss')
-          //     // modul1: '20210320000012',
-          //     // modul2: '20210320000012',
-          //     // modul3: '20210320000012'
-          //   }
-          //   for (var i = 0; i < this.substrateList.length; i++) {
-          //     var model = 'model' + Number(i + 1)
-          //     var pmpp = 'PMPP' + Number(i + 1)
-          //     var m = 'm' + Number(i + 1)
-
-          //     console.log(model)
-          //     // console.log(this.list[i].woSubstrateId)
-          //     // console.log(this.list[i].woSubstrateId)
-          //     obj['' + model + ''] = this.substrateList[i].woSubstrateId
-          //     obj['' + pmpp + ''] = this.substrateList[i].pmpp
-          //     obj['' + m + ''] = i + 1
-          //   }
-          //   console.log(obj)
-          // this.printPreview('预览', res.data)
-          const hiprintTemplate = this.$print(undefined, JSON.parse(res.data.content), obj, {}, {
-            // styleHandler: () => {
-            //   const css = '<link href="http://hiprint.io/Content/hiprint/css/print-lock.css" media="print" rel="stylesheet">'
-            //   return css
-            // }
-          })
-
-          hiprintTemplate.on('printSuccess', function () {
-            console.log(1111);
-            // that.$notification.success({
-            //   // key: key,
-            //   placement: 'topRight',
-            //   message: key + ' 打印成功',
-            //   description: 'Api单独直接打印回调',
-            // });
-          });
-          console.log(hiprintTemplate)
-        })
-      } else {
-        this.$message({
-          message: '请选择打印标签模板',
-          type: 'warning'
-        });
-      }
-    },
-    closeCallback(vue) {
-      console.log('关闭了打印工具')
-    },
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
-          this.listQuery.workOrderId = val.workOrderId;
-          if (val.createTime && val.createTime.length != 0) {
-            this.listQuery.createTime = val.createTime
-            // this.listQuery.createTime[1] = val.timeVal[1]
-          } else {
-            this.listQuery.createTime = undefined
-            // this.listQuery.endTime = undefined
-          }
-          this.getDataList();
-          console.log(this.tableData)
-					break;
-				case 'reset':
-					this.$refs.searchBarForm.resetForm();
-					this.listQuery = {
-						pageSize: 20,
-						pageNo: 1,
-						total: 1,
-					};
-					this.getDataList();
-					break;
-				case 'add':
-					this.addOrEditTitle = '新增';
-					this.addOrUpdateVisible = true;
-					this.addOrUpdateHandle();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-    otherMethods(val) {
-      this.handlePrint(val.data.modelId)
-			// this.addOrUpdateVisible = true;
-			// this.addOrEditTitle = '详情';
-			// this.$nextTick(() => {
-			// 	this.$refs.addOrUpdate.init(val.data.id, true);
-			// });
+	methods: {
+		currentMenu(val) {
+			console.log(val);
+			this.activeMenu = val;
 		},
 	},
 };
 </script>
+<style lang="scss" scoped>
+.packagingPrintLog-box {
+	min-height: calc(100vh - 120px - 8px);
+	background-color: #f2f4f9;
+	.show-box {
+		min-height: calc(100vh - 128px - 52px);
+		margin-top: 8px;
+		padding: 16px;
+		border-radius: 8px;
+		background-color: #fff;
+	}
+}
+</style>
diff --git a/src/views/base/packagingPrintLog/print-template.js b/src/views/base/packagingPrintLog/print-template.js
new file mode 100644
index 00000000..13cb1a2f
--- /dev/null
+++ b/src/views/base/packagingPrintLog/print-template.js
@@ -0,0 +1,889 @@
+export default {
+  "panels":[
+  {
+  "index":0,
+  "name":1,
+  "height":125,
+  "width":95,
+  "paperHeader":0,
+  "paperFooter":354.33070866141736,
+  "printElements":[
+  {
+  "options":{
+  "left":5,
+  "top":5,
+  "height":30,
+  "width":256.5,
+  "right":262.2421875,
+  "bottom":34.9921875,
+  "vCenter":133.9921875,
+  "hCenter":19.9921875,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "borderColor":"green",
+  "backgroundColor":"green"
+  },
+  "printElementType":{
+  "title":"矩形",
+  "type":"rect"
+  }
+  },
+  {
+  "options":{
+  "left":35,
+  "top":15,
+  "height":20,
+  "width":195,
+  "title":"厂内镀膜/钢化片周转标签",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":16.5,
+  "color":"#ffffff",
+  "qrCodeLevel":0,
+  "right":232.9921875,
+  "bottom":35.24609375,
+  "vCenter":135.4921875,
+  "hCenter":25.24609375
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":50,
+  "top":35,
+  "height":52.5,
+  "width":9
+  },
+  "printElementType":{
+  "title":"竖线",
+  "type":"vline"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":35,
+  "height":309,
+  "width":256.5,
+  "right":261.4921875,
+  "bottom":343.9921875,
+  "vCenter":133.2421875,
+  "hCenter":189.4921875
+  },
+  "printElementType":{
+  "title":"矩形",
+  "type":"rect"
+  }
+  },
+  {
+  "options":{
+  "left":10,
+  "top":42.5,
+  "height":18,
+  "width":36,
+  "title":"线别",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":45.99609375,
+  "bottom":60.4921875,
+  "vCenter":27.99609375,
+  "hCenter":51.4921875
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":55,
+  "top":42.5,
+  "height":18,
+  "width":200,
+  "title":"判定",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":93.4921875,
+  "bottom":59.25,
+  "vCenter":75.4921875,
+  "hCenter":50.25,
+  "field":"checkGoodName"
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":62.5,
+  "height":9,
+  "width":256.5,
+  "right":259.9921875,
+  "bottom":72.4921875,
+  "vCenter":132.4921875,
+  "hCenter":67.9921875
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":55,
+  "top":70,
+  "height":18,
+  "width":199.5,
+  "title":"备注",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":91.2421875,
+  "bottom":86.25,
+  "vCenter":73.2421875,
+  "hCenter":77.25,
+  "field":"remarkT"
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":190,
+  "top":87.5,
+  "height":169.5,
+  "width":9,
+  "right":199.74609375,
+  "bottom":255.75,
+  "vCenter":195.24609375,
+  "hCenter":171
+  },
+  "printElementType":{
+  "title":"竖线",
+  "type":"vline"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":87.5,
+  "height":9,
+  "width":256.5,
+  "right":260.7421875,
+  "bottom":96.75,
+  "vCenter":132.4921875,
+  "hCenter":92.25
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":77.5,
+  "top":90,
+  "height":15,
+  "width":36,
+  "title":"规格",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":113.49609375,
+  "bottom":105.4921875,
+  "vCenter":95.49609375,
+  "hCenter":97.9921875
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":207.5,
+  "top":100,
+  "height":18,
+  "width":36,
+  "title":"用户",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":242.7421875,
+  "bottom":116.25,
+  "vCenter":224.7421875,
+  "hCenter":107.25
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":25,
+  "top":102.5,
+  "height":15,
+  "width":156,
+  "title":"长*宽*厚度（单位：mm）",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":179.25,
+  "bottom":117.4921875,
+  "vCenter":101.25,
+  "hCenter":109.9921875
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":117.5,
+  "height":9,
+  "width":256.5,
+  "right":263.7421875,
+  "bottom":125.7421875,
+  "vCenter":135.4921875,
+  "hCenter":121.2421875
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":130,
+  "top":145,
+  "height":55.5,
+  "width":9,
+  "right":138.99609375,
+  "bottom":199.5,
+  "vCenter":134.49609375,
+  "hCenter":171.75
+  },
+  "printElementType":{
+  "title":"竖线",
+  "type":"vline"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":145,
+  "height":9,
+  "width":256.5,
+  "right":260.25,
+  "bottom":154.2421875,
+  "vCenter":132,
+  "hCenter":149.7421875
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":45,
+  "top":155,
+  "height":18,
+  "width":36,
+  "title":"编号",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":82.2421875,
+  "bottom":171.75,
+  "vCenter":64.2421875,
+  "hCenter":162.75
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":135,
+  "top":155,
+  "height":18,
+  "width":49.5,
+  "title":"工位号",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":186,
+  "bottom":172.9921875,
+  "vCenter":161.25,
+  "hCenter":163.9921875
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":197.5,
+  "top":155,
+  "height":18,
+  "width":60,
+  "title":"流程卡号",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":256.74609375,
+  "bottom":143.7421875,
+  "vCenter":226.74609375,
+  "hCenter":134.7421875
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":175,
+  "height":9,
+  "width":256.5,
+  "right":259.2421875,
+  "bottom":183.75,
+  "vCenter":130.9921875,
+  "hCenter":179.25
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":50,
+  "top":200,
+  "height":58.5,
+  "width":9,
+  "right":58.9921875,
+  "bottom":259.5,
+  "vCenter":54.4921875,
+  "hCenter":230.25
+  },
+  "printElementType":{
+  "title":"竖线",
+  "type":"vline"
+  }
+  },
+  {
+  "options":{
+  "left":110,
+  "top":200,
+  "height":58.5,
+  "width":9,
+  "right":117.75,
+  "bottom":256.9921875,
+  "vCenter":113.25,
+  "hCenter":227.7421875
+  },
+  "printElementType":{
+  "title":"竖线",
+  "type":"vline"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":200,
+  "height":9,
+  "width":256.5,
+  "right":262.9921875,
+  "bottom":210.24609375,
+  "vCenter":134.7421875,
+  "hCenter":205.74609375
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":10,
+  "top":210,
+  "height":18,
+  "width":36,
+  "title":"日期",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":45.99609375,
+  "bottom":228,
+  "vCenter":27.99609375,
+  "hCenter":219
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":67.5,
+  "top":210,
+  "height":18,
+  "width":36,
+  "title":"班次",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":103.5,
+  "bottom":228,
+  "vCenter":85.5,
+  "hCenter":219
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":207.5,
+  "top":210,
+  "height":18,
+  "width":36,
+  "title":"片数",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":243.4921875,
+  "bottom":228,
+  "vCenter":225.4921875,
+  "hCenter":219
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":230,
+  "height":9,
+  "width":256.5,
+  "right":261.4921875,
+  "bottom":239.25,
+  "vCenter":133.2421875,
+  "hCenter":234.75
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":257.5,
+  "height":9,
+  "width":256.5,
+  "right":261.4921875,
+  "bottom":266.49609375,
+  "vCenter":133.2421875,
+  "hCenter":261.99609375
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":10,
+  "top":262.5,
+  "height":18,
+  "width":243,
+  "title":"封箱人员工号",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":46.9921875,
+  "bottom":279.24609375,
+  "vCenter":28.9921875,
+  "hCenter":270.24609375,
+  "field":"sealWorker"
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":280,
+  "height":9,
+  "width":256.5,
+  "right":262.2421875,
+  "bottom":289.2421875,
+  "vCenter":133.9921875,
+  "hCenter":284.7421875
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":10,
+  "top":285,
+  "height":18,
+  "width":244.5,
+  "title":"打包人员工号",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":96.4921875,
+  "bottom":301.74609375,
+  "vCenter":52.9921875,
+  "hCenter":292.74609375,
+  "field":"packWorker"
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":300,
+  "height":9,
+  "width":256.5,
+  "right":264.4921875,
+  "bottom":308.49609375,
+  "vCenter":136.2421875,
+  "hCenter":303.99609375
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":10,
+  "top":305,
+  "height":18,
+  "width":247.5,
+  "title":"备注1：单层镀/双层镀/丝印打孔/打孔钢片",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":96.99609375,
+  "bottom":322.9921875,
+  "vCenter":53.49609375,
+  "hCenter":313.9921875
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":5,
+  "top":322.5,
+  "height":9,
+  "width":256.5,
+  "right":262.2421875,
+  "bottom":332.7421875,
+  "vCenter":133.9921875,
+  "hCenter":328.2421875
+  },
+  "printElementType":{
+  "title":"横线",
+  "type":"hline"
+  }
+  },
+  {
+  "options":{
+  "left":10,
+  "top":327.5,
+  "height":18,
+  "width":244.5,
+  "title":"备注2：",
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":97.9921875,
+  "bottom":343.74609375,
+  "vCenter":54.4921875,
+  "hCenter":334.74609375
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":20,
+  "top":122.5,
+  "height":18,
+  "width":157.5,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":54.99609375,
+  "bottom":142.5,
+  "vCenter":36.99609375,
+  "hCenter":133.5,
+  "field":"specifications",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":195,
+  "top":122.5,
+  "height":18,
+  "width":58.5,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":250.9921875,
+  "bottom":140.49609375,
+  "vCenter":223.2421875,
+  "hCenter":131.49609375,
+  "field":"customerName",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":12.5,
+  "top":177.5,
+  "height":18,
+  "width":112.5,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":48.24609375,
+  "bottom":195,
+  "vCenter":30.24609375,
+  "hCenter":186,
+  "field":"packagingCode",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":135,
+  "top":177.5,
+  "height":18,
+  "width":49.5,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":186.24609375,
+  "bottom":196.5,
+  "vCenter":161.49609375,
+  "hCenter":187.5,
+  "field":"workStation",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":195,
+  "top":177.5,
+  "height":18,
+  "width":60,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":254.7421875,
+  "bottom":194.25,
+  "vCenter":224.7421875,
+  "hCenter":185.25,
+  "field":"processCard",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":10,
+  "top":235,
+  "height":18,
+  "width":36,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":46.9921875,
+  "bottom":252.24609375,
+  "vCenter":28.9921875,
+  "hCenter":243.24609375,
+  "field":"date",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":60,
+  "top":235,
+  "height":18,
+  "width":48,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":97.2421875,
+  "bottom":253.9921875,
+  "vCenter":79.2421875,
+  "hCenter":244.9921875,
+  "field":"groupClass",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":120,
+  "top":235,
+  "height":18,
+  "width":64.5,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":167.49609375,
+  "bottom":253.9921875,
+  "vCenter":143.49609375,
+  "hCenter":244.9921875,
+  "field":"time",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":202.5,
+  "top":235,
+  "height":18,
+  "width":48,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":250.74609375,
+  "bottom":253.2421875,
+  "vCenter":226.74609375,
+  "hCenter":244.2421875,
+  "field":"num",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  },
+  {
+  "options":{
+  "left":7.5,
+  "top":62.5,
+  "height":18,
+  "width":36,
+  "coordinateSync":false,
+  "widthHeightSync":false,
+  "fontSize":12,
+  "qrCodeLevel":0,
+  "right":44.7421875,
+  "bottom":81.24609375,
+  "vCenter":26.7421875,
+  "hCenter":72.24609375,
+  "field":"lineName",
+  "hideTitle":true
+  },
+  "printElementType":{
+  "title":"文本",
+  "type":"text"
+  }
+  }
+  ],
+  "paperNumberLeft":372.5,
+  "paperNumberTop":337.5,
+  "paperNumberContinue":true,
+  "watermarkOptions":{
+  }
+  }
+  ]
+  }
\ No newline at end of file
diff --git a/src/views/base/packagingPrintLog/SmallTitle.vue b/src/views/base/packagingPrintLog1/SmallTitle.vue
similarity index 100%
rename from src/views/base/packagingPrintLog/SmallTitle.vue
rename to src/views/base/packagingPrintLog1/SmallTitle.vue
diff --git a/src/views/base/packagingPrintLog/add-or-updata.vue b/src/views/base/packagingPrintLog1/add-or-updata.vue
similarity index 100%
rename from src/views/base/packagingPrintLog/add-or-updata.vue
rename to src/views/base/packagingPrintLog1/add-or-updata.vue
diff --git a/src/views/base/packagingPrintLog1/index.vue b/src/views/base/packagingPrintLog1/index.vue
new file mode 100644
index 00000000..450f9294
--- /dev/null
+++ b/src/views/base/packagingPrintLog1/index.vue
@@ -0,0 +1,344 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 14:55:51
+ * @LastEditors: zhp
+ * @LastEditTime: 2024-04-10 16:34:40
+ * @Description:
+-->
+<template>
+  <div class="app-container">
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      :table-data="tableData">
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
+    </base-table>
+    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+      @pagination="getDataList" />
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
+  </div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+// import unitDict from './unitDict';
+import basicPage from '../mixins/basic-page';
+import { parseTime } from '../mixins/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import {
+  getPackingModel,
+} from '@/api/base/printModel.js'
+import {
+	deletePacking,
+  getPackingPage,
+  getWorkOrderList,
+	exportPackingExcel,
+} from '@/api/base/packingInfo';
+
+const tableProps = [
+	{
+    prop: 'packagingCode',
+    label: '包装流水号'
+  },
+  {
+    prop: 'packagingBarCode',
+    label: '包装条码'
+  },
+	{
+    prop: 'workOrderName',
+		label: '所属工单'
+	},
+	{
+    prop: 'customerName',
+		label: '客户'
+	},
+	{
+    prop: 'content',
+		label: '内容',
+		// subcomponent: unitDict,
+  },
+  {
+    prop: 'modelName',
+    label: '标签模板',
+    // subcomponent: unitDict,
+  },
+  {
+    prop: 'printStatus',
+    label: '打印状态',
+    filter: (val) => val == 1 ? '未打印' : '已打印',
+  },
+	{
+    prop: 'createTime',
+		label: '生成日期',
+		filter: parseTime
+	},
+];
+
+export default {
+  mixins: [basicPage, tableHeightMixin],
+	data() {
+		return {
+			urlOptions: {
+        getDataListURL: getPackingPage,
+				deleteURL: deletePacking,
+				exportURL: exportPackingExcel,
+			},
+			tableProps,
+      tableBtn: [
+        {
+          type: 'print',
+          btnName: '打印',
+        },
+        this.$auth.hasPermi(`base:packaging-print-log:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+          : undefined,
+        this.$auth.hasPermi(`base:packaging-print-log:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+          : undefined,
+			].filter((v) => v),
+			tableData: [],
+      formConfig: [
+        {
+          type: 'select',
+          label: '工单',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'id',
+          param: 'workOrderId',
+          filterable: true,
+        },
+        {
+          // parent: 'dateFilterType',
+          // 时间段选择
+          type: 'datePicker',
+          // label: '时间段',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          defaultTime: ['00:00:00', '00:00:00'],
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'createTime',
+        },
+				{
+          type: this.$auth.hasPermi('base:packaging-print-log:query') ? 'button' : '',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+        {
+          type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'separate' : '',
+				},
+				{
+          type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true,
+				},
+				// {
+				// 	type: 'separate',
+				// 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('base:product:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+  created() {
+    this.getDict()
+  },
+  methods: {
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.records;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    getDict() {
+      // 获取产品的属性列表
+      // getCustomerList().then((response) => {
+      //   console.log(response);
+      //   this.customerList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
+      // getModelList().then((response) => {
+      //   console.log(response);
+      //   this.modelList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
+      getWorkOrderList().then((response) => {
+        // console.log(response);
+        this.formConfig[0].selectOptions = response.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+    },
+    deleteHandle(id, name, index, packagingCode) {
+      this.$confirm(`是否确认删除${'[' + packagingCode + ']'}数据项?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
+    handlePrint(id) {
+      if (id) {
+        getPackingModel(id).then(res => {
+          var obj = {
+            code: '11111222',
+            test: '11111',
+            test2: '3333333',
+            test1: '222222',
+          }
+          console.log(res);
+          // getPackingListInfo({
+          //   size: 20,
+          //   current: 1,
+          //   boxNo: printModel.boxNo
+          // }).then(result => {
+          //   this.substrateList = result.data.records
+          //   var obj = {
+          //     // time: this.getNewDate(),
+          //     boxNo: this.currentData.boxNo,
+          //     orderNum: this.currentData.orderNum,
+          //     powerLevel: this.currentData.powerLevel,
+          //     sapMaterial: this.currentData.sapMaterial,
+          //     img: 'data:image/png;base64,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',
+          //     // lineBody: this.currentData.lineBody == 1 ? 'F ' : 'S',
+          //     createTime: moment(this.currentData.createTime).format('YYYY-MM-DD HH:mm:ss')
+          //     // modul1: '20210320000012',
+          //     // modul2: '20210320000012',
+          //     // modul3: '20210320000012'
+          //   }
+          //   for (var i = 0; i < this.substrateList.length; i++) {
+          //     var model = 'model' + Number(i + 1)
+          //     var pmpp = 'PMPP' + Number(i + 1)
+          //     var m = 'm' + Number(i + 1)
+
+          //     console.log(model)
+          //     // console.log(this.list[i].woSubstrateId)
+          //     // console.log(this.list[i].woSubstrateId)
+          //     obj['' + model + ''] = this.substrateList[i].woSubstrateId
+          //     obj['' + pmpp + ''] = this.substrateList[i].pmpp
+          //     obj['' + m + ''] = i + 1
+          //   }
+          //   console.log(obj)
+          // this.printPreview('预览', res.data)
+          const hiprintTemplate = this.$print(undefined, JSON.parse(res.data.content), obj, {}, {
+            // styleHandler: () => {
+            //   const css = '<link href="http://hiprint.io/Content/hiprint/css/print-lock.css" media="print" rel="stylesheet">'
+            //   return css
+            // }
+          })
+
+          hiprintTemplate.on('printSuccess', function () {
+            console.log(1111);
+            // that.$notification.success({
+            //   // key: key,
+            //   placement: 'topRight',
+            //   message: key + ' 打印成功',
+            //   description: 'Api单独直接打印回调',
+            // });
+          });
+          console.log(hiprintTemplate)
+        })
+      } else {
+        this.$message({
+          message: '请选择打印标签模板',
+          type: 'warning'
+        });
+      }
+    },
+    closeCallback(vue) {
+      console.log('关闭了打印工具')
+    },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 20;
+          this.listQuery.workOrderId = val.workOrderId;
+          if (val.createTime && val.createTime.length != 0) {
+            this.listQuery.createTime = val.createTime
+            // this.listQuery.createTime[1] = val.timeVal[1]
+          } else {
+            this.listQuery.createTime = undefined
+            // this.listQuery.endTime = undefined
+          }
+          this.getDataList();
+          console.log(this.tableData)
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 20,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+    otherMethods(val) {
+      this.handlePrint(val.data.modelId)
+			// this.addOrUpdateVisible = true;
+			// this.addOrEditTitle = '详情';
+			// this.$nextTick(() => {
+			// 	this.$refs.addOrUpdate.init(val.data.id, true);
+			// });
+		},
+	},
+};
+</script>
diff --git a/src/views/base/packagingPrintLog/unitDict.vue b/src/views/base/packagingPrintLog1/unitDict.vue
similarity index 100%
rename from src/views/base/packagingPrintLog/unitDict.vue
rename to src/views/base/packagingPrintLog1/unitDict.vue
diff --git a/src/views/base/packagingPrintLog2/index.vue b/src/views/base/packagingPrintLog2/index.vue
deleted file mode 100644
index ecc60ac9..00000000
--- a/src/views/base/packagingPrintLog2/index.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-	<div class="packagingPrintLog-box">
-		<div style="width: 100%">
-			<ButtonNav
-				:menus="['未打印', '已打印']"
-				:button-mode="true"
-				@change="currentMenu"></ButtonNav>
-		</div>
-		<!-- 未打印 -->
-		<UnPrint v-if="activeMenu == '未打印'" />
-		<!-- 已打印 -->
-		<Printed v-else />
-	</div>
-</template>
-<script>
-import ButtonNav from '@/components/ButtonNav';
-import UnPrint from './components/UnPrint';
-import Printed from './components/Printed';
-export default {
-	name: 'packagingPrintLog',
-	components: { ButtonNav, UnPrint, Printed },
-	data() {
-		return {
-			activeMenu: '未打印',
-		};
-	},
-	methods: {
-		currentMenu(val) {
-			console.log(val);
-			this.activeMenu = val;
-		},
-	},
-};
-</script>
-<style lang="scss" scoped>
-.packagingPrintLog-box {
-	min-height: calc(100vh - 120px - 8px);
-	background-color: #f2f4f9;
-	.show-box {
-		min-height: calc(100vh - 128px - 52px);
-		margin-top: 8px;
-		padding: 16px;
-		border-radius: 8px;
-		background-color: #fff;
-	}
-}
-</style>
diff --git a/src/views/base/packagingPrintLog2/print-template.js b/src/views/base/packagingPrintLog2/print-template.js
deleted file mode 100644
index 14f5bd22..00000000
--- a/src/views/base/packagingPrintLog2/print-template.js
+++ /dev/null
@@ -1,554 +0,0 @@
-export default {
-    panels: [
-      {
-        index: 0,
-        name: 1,
-        height: 125,
-        width: 95,
-        paperHeader: 0,
-        paperFooter: 354.33070866141736,
-        printElements: [
-          {
-            options: {
-              left: 5,
-              top: 5,
-              height: 30,
-              width: 256.5,
-              right: 262.2421875,
-              bottom: 34.9921875,
-              vCenter: 133.9921875,
-              hCenter: 19.9921875,
-              coordinateSync: false,
-              widthHeightSync: false,
-              borderColor: 'green',
-              backgroundColor: 'green',
-            },
-            printElementType: { title: '矩形', type: 'rect' },
-          },
-          {
-            options: {
-              left: 35,
-              top: 15,
-              height: 20,
-              width: 195,
-              title: '厂内镀膜/钢化片周转标签',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 16.5,
-              color: '#ffffff',
-              qrCodeLevel: 0,
-              right: 232.9921875,
-              bottom: 35.24609375,
-              vCenter: 135.4921875,
-              hCenter: 25.24609375,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: { left: 50, top: 35, height: 52.5, width: 9 },
-            printElementType: { title: '竖线', type: 'vline' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 35,
-              height: 309,
-              width: 256.5,
-              right: 261.4921875,
-              bottom: 343.9921875,
-              vCenter: 133.2421875,
-              hCenter: 189.4921875,
-            },
-            printElementType: { title: '矩形', type: 'rect' },
-          },
-          {
-            options: {
-              left: 10,
-              top: 42.5,
-              height: 18,
-              width: 36,
-              title: '线别',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 45.99609375,
-              bottom: 60.4921875,
-              vCenter: 27.99609375,
-              hCenter: 51.4921875,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 55,
-              top: 42.5,
-              height: 18,
-              width: 200,
-              title: '判定：良品/保留/再检',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 93.4921875,
-              bottom: 59.25,
-              vCenter: 75.4921875,
-              hCenter: 50.25,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 62.5,
-              height: 9,
-              width: 256.5,
-              right: 259.9921875,
-              bottom: 72.4921875,
-              vCenter: 132.4921875,
-              hCenter: 67.9921875,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 55,
-              top: 70,
-              height: 18,
-              width: 46,
-              title: '备注：',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 91.2421875,
-              bottom: 86.25,
-              vCenter: 73.2421875,
-              hCenter: 77.25,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 190,
-              top: 87.5,
-              height: 169.5,
-              width: 9,
-              right: 199.74609375,
-              bottom: 255.75,
-              vCenter: 195.24609375,
-              hCenter: 171,
-            },
-            printElementType: { title: '竖线', type: 'vline' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 87.5,
-              height: 9,
-              width: 256.5,
-              right: 260.7421875,
-              bottom: 96.75,
-              vCenter: 132.4921875,
-              hCenter: 92.25,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 77.5,
-              top: 90,
-              height: 15,
-              width: 36,
-              title: '规格',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 113.49609375,
-              bottom: 105.4921875,
-              vCenter: 95.49609375,
-              hCenter: 97.9921875,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 207.5,
-              top: 100,
-              height: 18,
-              width: 36,
-              title: '用户',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 242.7421875,
-              bottom: 116.25,
-              vCenter: 224.7421875,
-              hCenter: 107.25,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 25,
-              top: 102.5,
-              height: 15,
-              width: 156,
-              title: '长*宽*厚度（单位：mm）',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 179.25,
-              bottom: 117.4921875,
-              vCenter: 101.25,
-              hCenter: 109.9921875,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 117.5,
-              height: 9,
-              width: 256.5,
-              right: 263.7421875,
-              bottom: 125.7421875,
-              vCenter: 135.4921875,
-              hCenter: 121.2421875,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 130,
-              top: 145,
-              height: 55.5,
-              width: 9,
-              right: 138.99609375,
-              bottom: 199.5,
-              vCenter: 134.49609375,
-              hCenter: 171.75,
-            },
-            printElementType: { title: '竖线', type: 'vline' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 145,
-              height: 9,
-              width: 256.5,
-              right: 260.25,
-              bottom: 154.2421875,
-              vCenter: 132,
-              hCenter: 149.7421875,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 45,
-              top: 155,
-              height: 18,
-              width: 36,
-              title: '编号',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 82.2421875,
-              bottom: 171.75,
-              vCenter: 64.2421875,
-              hCenter: 162.75,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 135,
-              top: 155,
-              height: 18,
-              width: 49.5,
-              title: '工位号',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 186,
-              bottom: 172.9921875,
-              vCenter: 161.25,
-              hCenter: 163.9921875,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 197.5,
-              top: 155,
-              height: 18,
-              width: 60,
-              title: '流程卡号',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 256.74609375,
-              bottom: 143.7421875,
-              vCenter: 226.74609375,
-              hCenter: 134.7421875,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 175,
-              height: 9,
-              width: 256.5,
-              right: 259.2421875,
-              bottom: 183.75,
-              vCenter: 130.9921875,
-              hCenter: 179.25,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 50,
-              top: 200,
-              height: 58.5,
-              width: 9,
-              right: 58.9921875,
-              bottom: 259.5,
-              vCenter: 54.4921875,
-              hCenter: 230.25,
-            },
-            printElementType: { title: '竖线', type: 'vline' },
-          },
-          {
-            options: {
-              left: 110,
-              top: 200,
-              height: 58.5,
-              width: 9,
-              right: 117.75,
-              bottom: 256.9921875,
-              vCenter: 113.25,
-              hCenter: 227.7421875,
-            },
-            printElementType: { title: '竖线', type: 'vline' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 200,
-              height: 9,
-              width: 256.5,
-              right: 262.9921875,
-              bottom: 210.24609375,
-              vCenter: 134.7421875,
-              hCenter: 205.74609375,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 10,
-              top: 210,
-              height: 18,
-              width: 36,
-              title: '日期',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 45.99609375,
-              bottom: 228,
-              vCenter: 27.99609375,
-              hCenter: 219,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 67.5,
-              top: 210,
-              height: 18,
-              width: 36,
-              title: '班次',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 103.5,
-              bottom: 228,
-              vCenter: 85.5,
-              hCenter: 219,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 207.5,
-              top: 210,
-              height: 18,
-              width: 36,
-              title: '片数',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 243.4921875,
-              bottom: 228,
-              vCenter: 225.4921875,
-              hCenter: 219,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 230,
-              height: 9,
-              width: 256.5,
-              right: 261.4921875,
-              bottom: 239.25,
-              vCenter: 133.2421875,
-              hCenter: 234.75,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 257.5,
-              height: 9,
-              width: 256.5,
-              right: 261.4921875,
-              bottom: 266.49609375,
-              vCenter: 133.2421875,
-              hCenter: 261.99609375,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 10,
-              top: 262.5,
-              height: 18,
-              width: 87,
-              title: '封箱人员工号：',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 46.9921875,
-              bottom: 279.24609375,
-              vCenter: 28.9921875,
-              hCenter: 270.24609375,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 280,
-              height: 9,
-              width: 256.5,
-              right: 262.2421875,
-              bottom: 289.2421875,
-              vCenter: 133.9921875,
-              hCenter: 284.7421875,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 10,
-              top: 285,
-              height: 18,
-              width: 87,
-              title: '打包人员工号：',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 96.4921875,
-              bottom: 301.74609375,
-              vCenter: 52.9921875,
-              hCenter: 292.74609375,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 300,
-              height: 9,
-              width: 256.5,
-              right: 264.4921875,
-              bottom: 308.49609375,
-              vCenter: 136.2421875,
-              hCenter: 303.99609375,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 10,
-              top: 305,
-              height: 18,
-              width: 247.5,
-              title: '备注1：单层镀/双层镀/丝印打孔/打孔钢片',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 96.99609375,
-              bottom: 322.9921875,
-              vCenter: 53.49609375,
-              hCenter: 313.9921875,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-          {
-            options: {
-              left: 5,
-              top: 322.5,
-              height: 9,
-              width: 256.5,
-              right: 262.2421875,
-              bottom: 332.7421875,
-              vCenter: 133.9921875,
-              hCenter: 328.2421875,
-            },
-            printElementType: { title: '横线', type: 'hline' },
-          },
-          {
-            options: {
-              left: 10,
-              top: 327.5,
-              height: 18,
-              width: 87,
-              title: '备注2：',
-              coordinateSync: false,
-              widthHeightSync: false,
-              fontSize: 12,
-              qrCodeLevel: 0,
-              right: 97.9921875,
-              bottom: 343.74609375,
-              vCenter: 54.4921875,
-              hCenter: 334.74609375,
-            },
-            printElementType: { title: '文本', type: 'text' },
-          },
-        ],
-        paperNumberLeft: 372.5,
-        paperNumberTop: 337.5,
-        paperNumberContinue: true,
-        watermarkOptions: {},
-      },
-    ]
-}
\ No newline at end of file