Merge pull request '维护包装模板新增字段' (#141) from feature_supplier into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT/pulls/141
Reviewed-by: Liwei <wei.li@le-it.com.cn>

src/api/productexe/base.js

@@ -187,6 +187,15 @@ export function getPacktypeList (query) {
 	})
 }
 
+// 查询打印机模板
+export function getTemplateList (query) {
+	return request({
+		url: `/admin/base/labeltemplatehead/query`,
+		method: 'get',
+		params: query
+	})
+}
+
 //增加一条包装单模板
 export function addPacktemplate (data) {
 	return request({

src/views/productexe/basic/pkgTemplate.vue

@@ -57,7 +57,7 @@
                @close="closeCb">
       <el-form :model="form"
                ref="form"
-               label-width="120px">
+               label-width="140px">
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item :label="getColumnName('LOG_PackTemplate-PackTemplateId')">
@@ -96,6 +96,18 @@
                 </el-option>
               </el-select>
             </el-form-item>
+          </el-col>
+					<el-col :span="8">
+            <el-form-item :label="getColumnName('LOG_PackTemplate-PrinterTemplateId')">
+              <el-select v-model="form['LOG_PackTemplate-PrinterTemplateId']"
+                         placeholder="请选择">
+                <el-option v-for="item in printerTemplateIdList"
+                           :key="item['LabelTemplateHead-LabelTemplateId']"
+                           :label="item['LabelTemplateHead-Descr']"	
+                           :value="item['LabelTemplateHead-LabelTemplateId']">
+                </el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :label="getColumnName('LOG_PackTemplate-PrinterId')">
@@ -261,6 +273,7 @@ export default {
         'LOG_PackTemplate-Descr': undefined,
         'LOG_PackTemplate-ActiveToggle': undefined,
         'LOG_PackTemplate-PackTypeId': undefined,
+				'LOG_PackTemplate-PrinterTemplateId': undefined,
         'LOG_PackTemplate-PrinterId': undefined,
         'LOG_PackTemplate-TemplateFile': undefined,
         'LOG_PackTemplate-PrintQty': undefined,
@@ -299,13 +312,20 @@ export default {
       total: 0,
       title: '新增',
       packTypeList: [],
+			printerTemplateIdList: [],
     }
   },
   created() {
     this.getPacktypeList()
     this.getList()
+		this.getTemplateList()
   },
   methods: {
+		getTemplateList() {
+      api.getTemplateList().then((res) => {
+        this.printerTemplateIdList = res.data
+      })
+    },
     getPacktypeList() {
       api.getPacktypeList().then((res) => {
         this.packTypeList = res.data
@@ -345,6 +365,8 @@ export default {
                 res.data['LOG_PackTemplate-ActiveToggle'],
               'LOG_PackTemplate-PackTypeId':
                 res.data['LOG_PackTemplate-PackTypeId'],
+							'LOG_PackTemplate-PrinterTemplateId':
+								res.data['LOG_PackTemplate-PrinterTemplateId'],
               'LOG_PackTemplate-PrinterId':
                 res.data['LOG_PackTemplate-PrinterId'],
               'LOG_PackTemplate-TemplateFile':
@@ -434,6 +456,7 @@ export default {
         'LOG_PackTemplate-Descr': undefined,
         'LOG_PackTemplate-ActiveToggle': undefined,
         'LOG_PackTemplate-PackTypeId': undefined,
+				'LOG_PackTemplate-PrinterTemplateId': undefined,
         'LOG_PackTemplate-PrinterId': undefined,
         'LOG_PackTemplate-TemplateFile': undefined,
         'LOG_PackTemplate-PrintQty': undefined,