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

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

src/api/productexe/base.js

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

src/views/productexe/basic/pkgTemplate.vue

@@ -111,18 +111,16 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :label="getColumnName('LOG_PackTemplate-PrinterId')">
-              <el-input placeholder="请输入"
-                        v-model="form['LOG_PackTemplate-PrinterId']"
-                        autocomplete="off"></el-input>
+              <el-select v-model="form['LOG_PackTemplate-PrinterId']"
+                         placeholder="请选择">
+                <el-option v-for="item in getPrinterArray"
+                           :key="item['Printer-PrinterId']"
+                           :label="item['Printer-Descr']"	
+                           :value="item['Printer-PrinterId']">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item :label="getColumnName('LOG_PackTemplate-PrinterId')">
-              <el-input placeholder="请输入"
-                        v-model="form['LOG_PackTemplate-PrinterId']"
-                        autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <el-form-item :label="getColumnName('LOG_PackTemplate-TemplateFile')">
               <el-input placeholder="请输入"
@@ -313,14 +311,21 @@ export default {
       title: '新增',
       packTypeList: [],
 			printerTemplateIdList: [],
+			getPrinterArray: [],
     }
   },
   created() {
     this.getPacktypeList()
     this.getList()
 		this.getTemplateList()
+		this.getPrinterList()
   },
   methods: {
+		getPrinterList() {
+			api.getPrinterList().then((res) => {
+        this.getPrinterArray = res.data
+      })
+		},
 		getTemplateList() {
       api.getTemplateList().then((res) => {
         this.printerTemplateIdList = res.data

src/views/system/printer/printerTemplate/PrinterTemplateAddOrEdit.vue

@@ -8,10 +8,21 @@
             :prop="key"
           >
 						<el-input 
-							v-if="key!='LabelTemplateHead-PictureTemplateToggle' && key!='LabelTemplateHead-BackgroundColorToggle' && key!='LabelTemplateHead-BackgroundPictureToggle'" 
+							v-if="key!='LabelTemplateHead-PictureTemplateToggle' && key!='LabelTemplateHead-BackgroundColorToggle' 
+							&& key!='LabelTemplateHead-BackgroundPictureToggle' && key!='LabelTemplateHead-PrinterId'" 
 							v-model="formData[key]" 
 							:disabled="isAddOrEdit =='edit' && key == 'LabelTemplateHead-LabelTemplateId'" 
 							placeholder="请输入" />
+						<el-select
+							v-else-if="key == 'LabelTemplateHead-PrinterId'"
+							v-model="formData[key]" 
+							placeholder="请选择">
+							<el-option v-for="item in getPrinterArray"
+													:key="item['Printer-PrinterId']"
+													:label="item['Printer-Descr']"	
+													:value="item['Printer-PrinterId']">
+							</el-option>
+						</el-select>
 						<el-checkbox v-else v-model="formData[key]" />
           </el-form-item>
 				</el-col>
@@ -68,6 +79,7 @@
 <script>
 
 import { addPrintertemplate, getPrintertemplateDetails, updatePrinter } from '@/api/system/printerTemplate'
+import { getPrinterList } from '@/api/system/printertab'
 export default {
   props:{
     item:{
@@ -80,6 +92,7 @@ export default {
   data(){
     return{
       // 配置项模板
+			getPrinterArray: [],
       defaultItem:{
         // "LabelTemplateDetail-LabelTemplateId": undefined,
         "LabelTemplateDetail-Pos": undefined,
@@ -107,6 +120,7 @@ export default {
         "LabelTemplateHead-BackgroundColor": undefined,
 				"LabelTemplateHead-BackgroundPictureToggle": undefined,
         "LabelTemplateHead-BackgroundPicture": undefined,
+				"LabelTemplateHead-PrinterId": undefined,
       },
       formData:{
         ...this.formDataDefaultItem,
@@ -124,11 +138,17 @@ export default {
     }
   },
   created(){
+		this.getPrinterList()
     if(this.isAddOrEdit=='edit' && this.item["LabelTemplateHead-LabelTemplateId"]){
       this.getDetails();
     }
   },
   methods:{
+		getPrinterList() {
+			getPrinterList().then((res) => {
+        this.getPrinterArray = res.data
+      })
+		},
     // 获取详情
     getDetails(){
       getPrintertemplateDetails(this.item["LabelTemplateHead-LabelTemplateId"]).then(({code, data})=>{