diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
index 98510fa..1921f83 100644
--- a/src/components/Template/operation/TableOpertaion.vue
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -61,15 +61,15 @@ export default {
methods: {
// 开始配置
onStartConfig() {
- this.$emit("startConfig", this.innerRow)
+ this.$emit("startConfig", this.innerRow,this.rowIndex)
},
// 配置完成
onConfigComplete() {
- this.$emit("configComplete", this.innerRow)
+ this.$emit("configComplete", this.innerRow,this.rowIndex)
},
// 打印标签
onPrintLabel() {
- this.$emit("printLabel", this.innerRow)
+ this.$emit("printLabel", this.innerRow,this.rowIndex)
},
// 分装
onSubPackage() {
@@ -97,7 +97,7 @@ export default {
resourceList: null,
}
EventBus.$emit('onModifyRecord', params);
- this.$emit("subPackageSubmit", {fzsj:data,rowData:this.innerRow});
+ this.$emit("subPackageSubmit", {fzsj:data,rowData:this.innerRow,headerSelectFields:this.columns.headerSelectFields});
}
},
// 删除行
diff --git a/src/views/business/comps/template/dialog/SubPackageDialog.vue b/src/views/business/comps/template/dialog/SubPackageDialog.vue
index a4c83a3..fbbd28a 100644
--- a/src/views/business/comps/template/dialog/SubPackageDialog.vue
+++ b/src/views/business/comps/template/dialog/SubPackageDialog.vue
@@ -108,13 +108,14 @@ export default {
this.resetErrors();
},
show(data) {
+ const cloneData = JSON.parse(JSON.stringify(data));
if (data.fzList) {
- this.fzList = JSON.parse(JSON.stringify(data.fzList));
+ this.fzList = JSON.parse(JSON.stringify(cloneData.fzList));
// 初始化分装列表错误状态
this.fzListErrors = new Array(this.fzList.length).fill(false);
- delete data.fzList;
+ delete cloneData.fzList;
}
- this.formData = data;
+ this.formData = cloneData;
// 重置错误状态
this.resetErrors();
this.visible = true;
diff --git a/src/views/business/comps/template/dialog/TagPrintDialog.vue b/src/views/business/comps/template/dialog/TagPrintDialog.vue
new file mode 100644
index 0000000..af1e801
--- /dev/null
+++ b/src/views/business/comps/template/dialog/TagPrintDialog.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file