Browse Source

维护包装模板新增字段

pull/142/head
wangxy 3 years ago
parent
commit
0bcdfa58c6
3 changed files with 45 additions and 11 deletions
  1. +9
    -0
      src/api/productexe/base.js
  2. +15
    -10
      src/views/productexe/basic/pkgTemplate.vue
  3. +21
    -1
      src/views/system/printer/printerTemplate/PrinterTemplateAddOrEdit.vue

+ 9
- 0
src/api/productexe/base.js View File

@ -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) { export function addPacktemplate (data) {
return request({ return request({


+ 15
- 10
src/views/productexe/basic/pkgTemplate.vue View File

@ -111,18 +111,16 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="getColumnName('LOG_PackTemplate-PrinterId')"> <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-form-item>
</el-col> </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-col :span="8">
<el-form-item :label="getColumnName('LOG_PackTemplate-TemplateFile')"> <el-form-item :label="getColumnName('LOG_PackTemplate-TemplateFile')">
<el-input placeholder="请输入" <el-input placeholder="请输入"
@ -313,14 +311,21 @@ export default {
title: '新增', title: '新增',
packTypeList: [], packTypeList: [],
printerTemplateIdList: [], printerTemplateIdList: [],
getPrinterArray: [],
} }
}, },
created() { created() {
this.getPacktypeList() this.getPacktypeList()
this.getList() this.getList()
this.getTemplateList() this.getTemplateList()
this.getPrinterList()
}, },
methods: { methods: {
getPrinterList() {
api.getPrinterList().then((res) => {
this.getPrinterArray = res.data
})
},
getTemplateList() { getTemplateList() {
api.getTemplateList().then((res) => { api.getTemplateList().then((res) => {
this.printerTemplateIdList = res.data this.printerTemplateIdList = res.data


+ 21
- 1
src/views/system/printer/printerTemplate/PrinterTemplateAddOrEdit.vue View File

@ -8,10 +8,21 @@
:prop="key" :prop="key"
> >
<el-input <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]" v-model="formData[key]"
:disabled="isAddOrEdit =='edit' && key == 'LabelTemplateHead-LabelTemplateId'" :disabled="isAddOrEdit =='edit' && key == 'LabelTemplateHead-LabelTemplateId'"
placeholder="请输入" /> 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-checkbox v-else v-model="formData[key]" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -68,6 +79,7 @@
<script> <script>
import { addPrintertemplate, getPrintertemplateDetails, updatePrinter } from '@/api/system/printerTemplate' import { addPrintertemplate, getPrintertemplateDetails, updatePrinter } from '@/api/system/printerTemplate'
import { getPrinterList } from '@/api/system/printertab'
export default { export default {
props:{ props:{
item:{ item:{
@ -80,6 +92,7 @@ export default {
data(){ data(){
return{ return{
// //
getPrinterArray: [],
defaultItem:{ defaultItem:{
// "LabelTemplateDetail-LabelTemplateId": undefined, // "LabelTemplateDetail-LabelTemplateId": undefined,
"LabelTemplateDetail-Pos": undefined, "LabelTemplateDetail-Pos": undefined,
@ -107,6 +120,7 @@ export default {
"LabelTemplateHead-BackgroundColor": undefined, "LabelTemplateHead-BackgroundColor": undefined,
"LabelTemplateHead-BackgroundPictureToggle": undefined, "LabelTemplateHead-BackgroundPictureToggle": undefined,
"LabelTemplateHead-BackgroundPicture": undefined, "LabelTemplateHead-BackgroundPicture": undefined,
"LabelTemplateHead-PrinterId": undefined,
}, },
formData:{ formData:{
...this.formDataDefaultItem, ...this.formDataDefaultItem,
@ -124,11 +138,17 @@ export default {
} }
}, },
created(){ created(){
this.getPrinterList()
if(this.isAddOrEdit=='edit' && this.item["LabelTemplateHead-LabelTemplateId"]){ if(this.isAddOrEdit=='edit' && this.item["LabelTemplateHead-LabelTemplateId"]){
this.getDetails(); this.getDetails();
} }
}, },
methods:{ methods:{
getPrinterList() {
getPrinterList().then((res) => {
this.getPrinterArray = res.data
})
},
// //
getDetails(){ getDetails(){
getPrintertemplateDetails(this.item["LabelTemplateHead-LabelTemplateId"]).then(({code, data})=>{ getPrintertemplateDetails(this.item["LabelTemplateHead-LabelTemplateId"]).then(({code, data})=>{


Loading…
Cancel
Save