From e0a9e80678b553a254f74ef32eb28a0c5451bce0 Mon Sep 17 00:00:00 2001
From: wangxy <xinyao.wang@le-it.com.cn>
Date: Wed, 27 Oct 2021 13:52:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/printerTemplate.js             |  17 +--
 src/api/system/printheadtab.js                |  25 +---
 src/views/system/printer/printerTemplate.vue  |  43 +++---
 .../PrinterTemplateAddOrEdit.vue              | 130 ++++++++++--------
 src/views/system/printer/printheadtab.vue     | 128 ++++++-----------
 5 files changed, 149 insertions(+), 194 deletions(-)

diff --git a/src/api/system/printerTemplate.js b/src/api/system/printerTemplate.js
index 80e497b..0533d5f 100644
--- a/src/api/system/printerTemplate.js
+++ b/src/api/system/printerTemplate.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询打印机模板列表
 export function getPrintertemplate(params) {
   return request({
-    url: '/admin/base/printertemplate/query',
+		url: '/admin/base/labeltemplatehead/query',
     method: 'get',
     params
   })
@@ -12,7 +12,7 @@ export function getPrintertemplate(params) {
 // 新增
 export function addPrintertemplate(data) {
   return request({
-    url: '/admin/base/printertemplate/insertone',
+		url: '/admin/base/labeltemplatehead/insertone',
     method: 'post',
     data
   })
@@ -21,7 +21,7 @@ export function addPrintertemplate(data) {
 // 修改
 export function updatePrinter(data) {
   return request({
-    url: '/admin/base/printertemplate/updateone',
+		url: '/admin/base/labeltemplatehead/updateone',
     method: 'put',
     data
   })
@@ -30,7 +30,7 @@ export function updatePrinter(data) {
 // 删除
 export function delPrinter(id) {
   return request({
-    url: `/admin/base/printertemplate/deleteone/${id}`,
+		url: `/admin/base/labeltemplatehead/deleteone/${id}`,
     method: 'delete'
   })
 }
@@ -38,14 +38,7 @@ export function delPrinter(id) {
 // 详情
 export function getPrintertemplateDetails(id) {
   return request({
-    url: `/admin/base/printertemplate/get/${id}`,
-    method: 'get'
-  })
-}
-// 打印机集合
-export function getPrinterList(){
-  return request({
-    url: '/admin/base/printer/query',
+		url: `/admin/base/labeltemplatehead/get/${id}`,
     method: 'get'
   })
 }
diff --git a/src/api/system/printheadtab.js b/src/api/system/printheadtab.js
index 27a922a..bc8328e 100644
--- a/src/api/system/printheadtab.js
+++ b/src/api/system/printheadtab.js
@@ -2,33 +2,16 @@ import request from '@/utils/request'
 
 export function getPrintheadList(query) {
   return request({
-		url: '/admin/base/printhead/query',
+		url: '/admin/base/labelhead/query',
     method: 'get',
     params: query
   })
 }
 
-export function getPrinthead(query) {
-  return request({
-    url: '/admin/printheadtab/selectinfo',
-    method: 'get',
-    params: query
-  })
-}
-
-// 新增
-export function addPrinthead(data) {
-  return request({
-    url: '/admin/printheadtab/addinfo',
-    method: 'post',
-    data: data
-  })
-}
-
 // 重打
 export function updatePrinthead(data) {
   return request({
-		url: '/admin/base/printhead/updateone',
+		url: '/admin/base/labelhead/updateone',
     method: 'put',
     data: data
   })
@@ -37,7 +20,7 @@ export function updatePrinthead(data) {
 // 删除
 export function delPrinthead(id) {
   return request({
-		url: `/admin/base/printhead/deleteone/` + id,
+		url: `/admin/base/labelhead/deleteone/` + id,
     method: 'delete'
   })
 }
@@ -45,7 +28,7 @@ export function delPrinthead(id) {
 // 明细
 export function getPrintDetailList(id) {
   return request({
-		url: `/admin/base/printdetail/query?printHeadId=${id}`,
+		url: `/admin/base/labeldetail/query?labelId=${id}`,
     method: 'get'
   })
 }
diff --git a/src/views/system/printer/printerTemplate.vue b/src/views/system/printer/printerTemplate.vue
index 56b1075..2ce92b9 100644
--- a/src/views/system/printer/printerTemplate.vue
+++ b/src/views/system/printer/printerTemplate.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-form ref="queryForm" :model="queryParams" :inline="true">
-      <el-form-item label="打印模板ID">
+      <el-form-item :label="getColumnName('LabelTemplateHead-LabelTemplateId')">
         <el-input
-          v-model.trim="queryParams.templateId"
+          v-model.trim="queryParams.LabelTemplateId"
           placeholder="请输入查询内容"
           size="small"
           style="width: 200px"
@@ -29,7 +29,10 @@
         width="156px"
       >
         <template slot-scope="scope">
-          <span>{{ scope.row[item] }}</span>
+					<span v-if="item === 'LabelTemplateHead-PlantNr'">{{ getValue(scope.row['LabelTemplateHead-PlantNr']) }}</span>
+					<span v-else-if="item === 'LabelTemplateHead-LastModify'"> {{ parseTime(scope.row[item]) }} </span>
+					<span v-else-if="item === 'LabelTemplateHead-CreateTime'"> {{ parseTime(scope.row[item]) }} </span>
+					<span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="130" fixed="right">
@@ -82,22 +85,24 @@ export default {
         pageNumber:1,
         _pageSize:10,
         total:0,
-        templateId: undefined
+        LabelTemplateId: undefined
       },
       // 默认字段
       defaultItem: {
-        "PrinterTemplate-PlantNr": '',
-        "PrinterTemplate-TemplateId": "",
-        "PrinterTemplate-TemplateTye": "",
-        "PrinterTemplate-Descr": "",
-        "PrinterTemplate-Active": "",
-        "PrinterTemplate-PrintQty": "",
-        "PrinterTemplate-PlanQty": "",
-        "PrinterTemplate-PrinterId": "",
-        "PrinterTemplate-TemplateFile": "",
-        "PrinterTemplate-LastModify": "",
-        "PrinterTemplate-LastUser": "",
-        "PrinterTemplate-CreateTime": ""
+        "LabelTemplateHead-PlantNr": '',
+        "LabelTemplateHead-LabelTemplateId": "",
+        "LabelTemplateHead-Descr": "",
+        "LabelTemplateHead-LabelTemplateFile": "",
+				"LabelTemplateHead-PictureTemplateToggle": "",
+				"LabelTemplateHead-Height": "",
+				"LabelTemplateHead-Width": "",
+				"LabelTemplateHead-BackgroundColorToggle": "",
+				"LabelTemplateHead-BackgroundColor": "",
+				"LabelTemplateHead-BackgroundPictureToggle": "",
+				"LabelTemplateHead-BackgroundPicture": "",
+        "LabelTemplateHead-LastModify": "",
+        "LabelTemplateHead-LastUser": "",
+        "LabelTemplateHead-CreateTime": ""
       },
       // table 表头 
       headers:[],
@@ -122,7 +127,7 @@ export default {
       this.isAddOrEdit=''
       this.item={}
       this.loading=true;
-      if (!this.queryParams.templateId) this.queryParams.templateId = undefined
+      if (!this.queryParams.LabelTemplateId) this.queryParams.LabelTemplateId = undefined
       getPrintertemplate(this.queryParams).then(({code, data:{count, records}})=>{
         this.loading=false;
         if(code===200){
@@ -132,7 +137,7 @@ export default {
       })
     },
     reset(){
-      this.queryParams.templateId=undefined;
+      this.queryParams.LabelTemplateId=undefined;
       this.handleQuery();
     },
     /** 搜索按钮操作 */
@@ -157,7 +162,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return delPrinter(row['PrinterTemplate-TemplateId'])
+        return delPrinter(row['LabelTemplateHead-LabelTemplateId'])
       }).then(() => {
         this.msgSuccess('删除成功')
 				if(this.queryParams.pageNumber>1 && this.dataList.length===1){
diff --git a/src/views/system/printer/printerTemplate/PrinterTemplateAddOrEdit.vue b/src/views/system/printer/printerTemplate/PrinterTemplateAddOrEdit.vue
index e02c5c8..ec9f369 100644
--- a/src/views/system/printer/printerTemplate/PrinterTemplateAddOrEdit.vue
+++ b/src/views/system/printer/printerTemplate/PrinterTemplateAddOrEdit.vue
@@ -1,33 +1,40 @@
 <template>
-  <el-dialog :title="isAddOrEdit=='edit' ? '编辑模板' :'添加模板'" visible width="800px" :before-close="cancel">
-      <el-form ref="formRef" :model="formData" :rules="rules" style="overflow: hidden;" label-width="120px">
-				<el-col :span="8" v-for="(value, key, index) in formDataDefaultItem" :key="index">
+  <el-dialog :title="isAddOrEdit=='edit' ? '编辑模板' :'添加模板'" visible width="80%" :before-close="cancel">
+      <el-form ref="formRef" :model="formData" :rules="rules" style="overflow: hidden;" label-width="200px">
+				<el-row>
+				<el-col :span="6" v-for="(value, key, index) in formDataDefaultItem" :key="index">
 					<el-form-item
             :label="getColumnName(key)"
             :prop="key"
           >
-						<el-input v-if="key!='PrinterTemplate-PrinterId'" v-model="formData[key]" :disabled="isAddOrEdit =='edit' && key == 'PrinterTemplate-TemplateId'" placeholder="请输入" />
-            <el-select v-else v-model="formData[key]" placeholder="请选择" >
-              <el-option
-                v-for="item in allPrinter"
-                :key="item['Printer-PrinterId']"
-                :label="item['Printer-Descr']"
-                :value="item['Printer-PrinterId']">
-              </el-option>
-            </el-select>
+						<el-input 
+							v-if="key!='LabelTemplateHead-PictureTemplateToggle' && key!='LabelTemplateHead-BackgroundColorToggle' && key!='LabelTemplateHead-BackgroundPictureToggle'" 
+							v-model="formData[key]" 
+							:disabled="isAddOrEdit =='edit' && key == 'LabelTemplateHead-LabelTemplateId'" 
+							placeholder="请输入" />
+						<el-checkbox v-else v-model="formData[key]" />
           </el-form-item>
 				</el-col>
+				</el-row>
+				<el-row>
 				<el-col :span="24">
           <el-table
-            :data="formData['PrinterTemplate-PrinterTemplateLst']"
+            :data="formData['LabelTemplateHead-LabelTemplateDetail']"
             style="width: 100%;margin-bottom:10px;"
             height="400px"
             border
           >
             <el-table-column type="index" width="40" />
-            <el-table-column v-for="(value, key, index) in defaultItem" :label="getColumnName(key)" :key="index" align="center">
+            <el-table-column v-for="(value, key, index) in defaultItem" width="150" :label="getColumnName(key)" :key="index" align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row[key]" />
+                <el-input
+									v-if="key!='LabelTemplateDetail-ValueParseToggle' && key!='LabelTemplateDetail-LabelItemFilled' && key!='LabelTemplateDetail-ShowBarcodeText'" 
+									v-model="scope.row[key]" />
+								<el-switch
+									v-else
+									v-model="scope.row[key]"
+									active-color="#13ce66">
+								</el-switch>
               </template>
             </el-table-column>
             <el-table-column align="center" width="100">
@@ -50,6 +57,7 @@
             </el-table-column>
           </el-table>
 				</el-col>
+				</el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="save">确 定</el-button>
@@ -59,7 +67,7 @@
 </template>
 <script>
 
-import { addPrintertemplate, getPrintertemplateDetails, updatePrinter, getPrinterList } from '@/api/system/printerTemplate'
+import { addPrintertemplate, getPrintertemplateDetails, updatePrinter } from '@/api/system/printerTemplate'
 export default {
   props:{
     item:{
@@ -73,57 +81,57 @@ export default {
     return{
       // 配置项模板
       defaultItem:{
-        // "PrinterTemplateLst-TemplateId": undefined,
-        "PrinterTemplateLst-Pos": undefined,
-        "PrinterTemplateLst-VarName": undefined,
-        "PrinterTemplateLst-VarValue": undefined,
-        "PrinterTemplateLst-VarType": undefined
+        // "LabelTemplateDetail-LabelTemplateId": undefined,
+        "LabelTemplateDetail-Pos": undefined,
+				"LabelTemplateDetail-X": undefined,
+				"LabelTemplateDetail-Y": undefined,
+				"LabelTemplateDetail-Height": undefined,
+				"LabelTemplateDetail-Width": undefined,
+				"LabelTemplateDetail-LabelItemType": undefined,
+				"LabelTemplateDetail-ValueParseToggle": undefined,
+				"LabelTemplateDetail-LabelItemValue": undefined,
+				"LabelTemplateDetail-LabelItemPen": undefined,
+				"LabelTemplateDetail-LabelItemFilled": undefined,
+				"LabelTemplateDetail-LabelItemFont": undefined,
+				"LabelTemplateDetail-ShowBarcodeText": undefined,
       },
       // form表单模板
       formDataDefaultItem:{
-        "PrinterTemplate-TemplateId": undefined,
-        "PrinterTemplate-TemplateTye": undefined,
-        "PrinterTemplate-Descr": undefined,
-        "PrinterTemplate-Active": undefined,
-        "PrinterTemplate-PrintQty": undefined,
-        "PrinterTemplate-PlanQty": undefined,
-        "PrinterTemplate-PrinterId": undefined,
-        "PrinterTemplate-TemplateFile": undefined,
+        "LabelTemplateHead-LabelTemplateId": undefined,
+        "LabelTemplateHead-Descr": undefined,
+        "LabelTemplateHead-Height": undefined,
+        "LabelTemplateHead-Width": undefined,
+        "LabelTemplateHead-PictureTemplateToggle": undefined,
+        "LabelTemplateHead-LabelTemplateFile": undefined,
+        "LabelTemplateHead-BackgroundColorToggle": undefined,
+        "LabelTemplateHead-BackgroundColor": undefined,
+				"LabelTemplateHead-BackgroundPictureToggle": undefined,
+        "LabelTemplateHead-BackgroundPicture": undefined,
       },
       formData:{
         ...this.formDataDefaultItem,
-        "PrinterTemplate-PrinterTemplateLst": []
+        "LabelTemplateHead-LabelTemplateDetail": []
       },
       // 表单校验
       rules: {
-        'PrinterTemplate-TemplateId': [
+        'LabelTemplateHead-LabelTemplateId': [
           { required: true, message: '此项不能为空', trigger: 'blur' }
         ],
-        'PrinterTemplate-TemplateTye': [
-          { required: true, message: '此项不能为空', trigger: 'blur' }
-        ],
-        'PrinterTemplate-Descr': [
+        'LabelTemplateHead-Descr': [
           { required: true, message: '此项不能为空', trigger: 'blur' }
         ]
       },
-      // 全量打印机列表
-      allPrinter:[]
     }
   },
   created(){
-    getPrinterList().then(({code, data})=>{
-      if(code==200){
-        this.allPrinter=data||[]
-      }
-    })
-    if(this.isAddOrEdit=='edit' && this.item["PrinterTemplate-TemplateId"]){
+    if(this.isAddOrEdit=='edit' && this.item["LabelTemplateHead-LabelTemplateId"]){
       this.getDetails();
     }
   },
   methods:{
     // 获取详情
     getDetails(){
-      getPrintertemplateDetails(this.item["PrinterTemplate-TemplateId"]).then(({code, data})=>{
+      getPrintertemplateDetails(this.item["LabelTemplateHead-LabelTemplateId"]).then(({code, data})=>{
         if(code==200){
           this.formData={...data}
         }
@@ -145,12 +153,15 @@ export default {
     edit(){
       updatePrinter({
         ...this.formData,
-        "PrinterTemplate-Active": Number(this.formData["PrinterTemplate-Active"]),
-        "PrinterTemplate-PrintQty": Number(this.formData["PrinterTemplate-PrintQty"]),
-        "PrinterTemplate-PlanQty": Number(this.formData["PrinterTemplate-PlanQty"]),
-        'PrinterTemplate-PrinterTemplateLst': this.formData['PrinterTemplate-PrinterTemplateLst'].map(e=>{
-          e["PrinterTemplateLst-Pos"] =Number(e["PrinterTemplateLst-Pos"]);
-          e["PrinterTemplateLst-TemplateId"] = this.formData["PrinterTemplate-TemplateId"];
+        "LabelTemplateHead-Height": Number(this.formData["LabelTemplateHead-Height"]),
+        "LabelTemplateHead-Width": Number(this.formData["LabelTemplateHead-Width"]),
+        'LabelTemplateHead-LabelTemplateDetail': this.formData['LabelTemplateHead-LabelTemplateDetail'].map(e=>{
+          e["LabelTemplateDetail-Pos"] =Number(e["LabelTemplateDetail-Pos"]);
+					e["LabelTemplateDetail-X"] =Number(e["LabelTemplateDetail-X"]);
+					e["LabelTemplateDetail-Y"] =Number(e["LabelTemplateDetail-Y"]);
+					e["LabelTemplateDetail-Height"] =Number(e["LabelTemplateDetail-Height"]);
+					e["LabelTemplateDetail-Width"] =Number(e["LabelTemplateDetail-Width"]);
+          e["LabelTemplateDetail-LabelTemplateId"] = this.formData["LabelTemplateHead-LabelTemplateId"];
           return e;
         })
       }).then(({code})=>{
@@ -164,12 +175,15 @@ export default {
     add(){
       addPrintertemplate({
         ...this.formData,
-        "PrinterTemplate-Active": Number(this.formData["PrinterTemplate-Active"]),
-        "PrinterTemplate-PrintQty": Number(this.formData["PrinterTemplate-PrintQty"]),
-        "PrinterTemplate-PlanQty": Number(this.formData["PrinterTemplate-PlanQty"]),
-        'PrinterTemplate-PrinterTemplateLst': this.formData['PrinterTemplate-PrinterTemplateLst'].map(e=>{
-          e["PrinterTemplateLst-Pos"] =Number(e["PrinterTemplateLst-Pos"]);
-          e["PrinterTemplateLst-TemplateId"] = this.formData["PrinterTemplate-TemplateId"];
+        "LabelTemplateHead-Height": Number(this.formData["LabelTemplateHead-Height"]),
+        "LabelTemplateHead-Width": Number(this.formData["LabelTemplateHead-Width"]),
+        'LabelTemplateHead-LabelTemplateDetail': this.formData['LabelTemplateHead-LabelTemplateDetail'].map(e=>{
+          e["LabelTemplateDetail-Pos"] =Number(e["LabelTemplateDetail-Pos"]);
+					e["LabelTemplateDetail-X"] =Number(e["LabelTemplateDetail-X"]);
+					e["LabelTemplateDetail-Y"] =Number(e["LabelTemplateDetail-Y"]);
+					e["LabelTemplateDetail-Height"] =Number(e["LabelTemplateDetail-Height"]);
+					e["LabelTemplateDetail-Width"] =Number(e["LabelTemplateDetail-Width"]);
+          e["LabelTemplateDetail-LabelTemplateId"] = this.formData["LabelTemplateHead-LabelTemplateId"];
           return e;
         })
       }).then(({code})=>{
@@ -185,11 +199,11 @@ export default {
     },
     /** 新增属性 */
     handleAddValst() {
-      this.formData['PrinterTemplate-PrinterTemplateLst'].push({...this.defaultItem})
+      this.formData['LabelTemplateHead-LabelTemplateDetail'].push({...this.defaultItem})
     },
     /** 删除属性 */
     handleDeleteValst(index) {
-      this.formData['PrinterTemplate-PrinterTemplateLst'].splice(index, 1)
+      this.formData['LabelTemplateHead-LabelTemplateDetail'].splice(index, 1)
     },
   }
 }
diff --git a/src/views/system/printer/printheadtab.vue b/src/views/system/printer/printheadtab.vue
index 3e2617e..840af9f 100644
--- a/src/views/system/printer/printheadtab.vue
+++ b/src/views/system/printer/printheadtab.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-form ref="queryForm" :model="queryParams" :inline="true">
-      <el-form-item label="打印记录ID">
+      <el-form-item :label="getColumnName('LabelHead-LabelId')">
         <el-input
-          v-model.trim="queryParams.printheadid"
+          v-model.trim="queryParams.LabelId"
           placeholder="请输入查询内容"
           clearable
           size="small"
@@ -17,11 +17,11 @@
     <el-table v-loading="loading" :data="dataList" border>
       <el-table-column v-for="(item, index) in headers" :key="index" align="center" :label="getColumnName(item)" :show-overflow-tooltip="true" width="156px">
         <template slot-scope="scope">
-          <span v-if="item === 'PrintHead-PlantNr'">{{ getValue(scope.row['PrintHead-PlantNr']) }}</span>
-          <span v-else-if="item === 'PrintHead-Status'"> {{ scope.row[item] | changeContent }} </span>
-          <span v-else-if="item === 'PrintHead-LastModify'"> {{ parseTime(scope.row[item]) }} </span>
-          <span v-else-if="item === 'PrintHead-CreateTime'"> {{ parseTime(scope.row[item]) }} </span>
-          <span v-else-if="item === 'PrintHead-PrintedTime'"> {{ parseTime(scope.row[item]) }} </span>
+          <span v-if="item === 'LabelHead-PlantNr'">{{ getValue(scope.row['LabelHead-PlantNr']) }}</span>
+          <span v-else-if="item === 'LabelHead-Status'"> {{ scope.row[item] | changeContent }} </span>
+          <span v-else-if="item === 'LabelHead-LastModify'"> {{ parseTime(scope.row[item]) }} </span>
+          <span v-else-if="item === 'LabelHead-CreateTime'"> {{ parseTime(scope.row[item]) }} </span>
+          <span v-else-if="item === 'LabelHead-PrintTime'"> {{ parseTime(scope.row[item]) }} </span>
           <span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
@@ -58,23 +58,22 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <el-dialog :title="title" :visible.sync="open" fullscreen :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="80%">
       <el-table v-loading="loading" :data="form" border>
-        <el-table-column v-for="(item, index) in formHeader" :key="index" align="center" :label="getColumnName(item)" :show-overflow-tooltip="true" width="156px">
+        <el-table-column 
+					v-for="(item, index) in formHeader" 
+					:key="index" 
+					align="center" 
+					:label="getColumnName(item)" 
+					:show-overflow-tooltip="true" >
           <template slot-scope="scope">
-            <span v-if="item === 'PrintDetail-PlantNr'">{{ getValue(scope.row['PrintHead-PlantNr']) }}</span>
-            <span v-else-if="item === 'PrintDetail-LastModify'"> {{ parseTime(scope.row[item]) }} </span>
-            <span v-else-if="item === 'PrintDetail-CreateTime'"> {{ parseTime(scope.row[item]) }} </span>
+            <span v-if="item === 'LabelDetail-PlantNr'">{{ getValue(scope.row['LabelDetail-PlantNr']) }}</span>
+            <span v-else-if="item === 'LabelDetail-LastModify'"> {{ parseTime(scope.row[item]) }} </span>
+            <span v-else-if="item === 'LabelDetail-CreateTime'"> {{ parseTime(scope.row[item]) }} </span>
             <span v-else>{{ scope.row[item] }}</span>
           </template>
         </el-table-column>
       </el-table>
-      <!-- <pagination
-        :total="formTotal"
-        :page.sync="formParams.pageNumber"
-        :limit.sync="formParams.pageSize"
-        @pagination="getDetailList"
-      /> -->
     </el-dialog>
   </div>
 </template>
@@ -115,27 +114,12 @@ export default {
       queryParams: {
         pageNumber: 1,
         pageSize: 10,
-        printheadid: undefined
+        LabelId: undefined
       },
       // 明细表数据
       form: [],
-      // formTotal: 0,
       // 明细表头
       formHeader: [],
-      // 明细查询参数
-      formParams: {
-        pageNumber: 1,
-        pageSize: 10
-      },
-      // 表单校验
-      rules: {
-        'PrintHead-PlantNr': [
-          { required: true, type: 'integer', message: '此项不能为空', trigger: 'blur' }
-        ],
-        'PrintHead-PrintHeadId': [
-          { required: true, message: '此项不能为空', trigger: 'blur' }
-        ]
-      }
     }
   },
   beforeCreate() {
@@ -158,27 +142,18 @@ export default {
           this.dataList = response.data.records
           this.total = response.data.count
           this.headers = [
-            'PrintHead-PlantNr',
-            'PrintHead-PrintHeadId',
-						'PrintHead-PrinterId',
-            'PrintHead-PrintFileType',
-            'PrintHead-PrintEventType',
-            'PrintHead-PrintObjId',
-            'PrintHead-PrintObjType',
-            'PrintHead-Status',
-            'PrintHead-TemplateFile',
-            'PrintHead-TermId',
-            'PrintHead-WebAddress',
-            'PrintHead-PrintCopies',
-            'PrintHead-PrintedTime',
-            'PrintHead-PrintedCopies',
-            'PrintHead-ival1',
-            'PrintHead-ival2',
-            'PrintHead-cval1',
-            'PrintHead-cval2',
-            'PrintHead-LastModify',
-            'PrintHead-LastUser',
-            'PrintHead-CreateTime'
+            'LabelHead-PlantNr',
+            'LabelHead-LabelId',
+						'LabelHead-LabelTemplateId',
+						'LabelHead-PrinterId',
+						'LabelHead-BusinessObjType',
+						'LabelHead-BusinessObjId',
+						'LabelHead-Status',
+						'LabelHead-PrintQty',
+						'LabelHead-PrintTime',
+						'LabelHead-LastModify',
+						'LabelHead-LastUser',
+						'LabelHead-CreateTime'
           ]
           this.loading = false
         }
@@ -186,22 +161,18 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-			if (this.queryParams.printheadid === '') this.queryParams.printheadid = undefined
+			if (this.queryParams.LabelId === '') this.queryParams.LabelId = undefined
       this.queryParams.pageNumber = 1
       this.getList()
     },
     /** 重新打印按钮操作 */
     handleUpdate(row) {
-      this.$confirm('是否确认重新打印"' + row['PrintHead-PrintHeadId'] + '"的数据项?', '提示', {
+      this.$confirm('是否确认重新打印"' + row['LabelHead-LabelId'] + '"的数据项?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        updatePrinthead({
-          'PrintHead-PlantNr': row['PrintHead-PlantNr'],
-          'PrintHead-PrintHeadId': row['PrintHead-PrintHeadId'],
-          'PrintHead-Status': 'R'
-        }).then(response => {
+        updatePrinthead(row).then(response => {
           this.getList()
           this.msgSuccess('提交成功')
         })
@@ -209,12 +180,12 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$confirm('是否确认删除"' + row['PrintHead-PrintHeadId'] + '"的数据项?', '警告', {
+      this.$confirm('是否确认删除"' + row['LabelHead-LabelId'] + '"的数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return delPrinthead(row['PrintHead-PrintHeadId'])
+        return delPrinthead(row['LabelHead-LabelId'])
       }).then(() => {
         this.msgSuccess('删除成功')
 				const totalPage = Math.ceil((this.total -1) / this.queryParams.pageSize)
@@ -226,33 +197,22 @@ export default {
 
     /** 明细按钮操作 */
     handleDetail(row) {
-      this.formParams.printheadid = row['PrintHead-PrintHeadId']
       this.formHeader = [
-        'PrintDetail-PlantNr',
-        'PrintDetail-PrintHeadId',
-        'PrintDetail-Pos',
-        'PrintDetail-VarName',
-        'PrintDetail-VarValue',
-        'PrintDetail-VarType',
-        'PrintDetail-VarPos',
-        'PrintDetail-LastModify',
-        'PrintDetail-LastUser',
-        'PrintDetail-CreateTime'
+        'LabelDetail-PlantNr',
+        'LabelDetail-LabelId',
+        'LabelDetail-Pos',
+        'LabelDetail-VariableName',
+        'LabelDetail-VariableValue',
+        'LabelDetail-LastModify',
+        'LabelDetail-LastUser',
+        'LabelDetail-CreateTime'
       ]
-      getPrintDetailList(row['PrintHead-PrintHeadId']).then(response => {
+      getPrintDetailList(row['LabelHead-LabelId']).then(response => {
         this.open = true
         this.title = '明细记录'
         this.form = response.data
-        // this.formTotal = response.data.count
       })
     },
-    /** 明细表查询 */
-    getDetailList() {
-      getPrintDetailList(row['PrintHead-PrintHeadId']).then(response => {
-        this.form = response.data
-        // this.formTotal = response.data.count
-      })
-    }
   }
 }
 </script>