zelian_wu
/
ckt-leble-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

roll label

dev
qiezi 1 year ago
parent
5ce8895b36
commit
b7e4edf2c8
5 changed files with 66 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/api/dict/country.js
  2. 4
      src/printFormat/roll_label.js
  3. 30
      src/views/modules/factory/tblbasedata.vue
  4. 3
      src/views/modules/label/printer.vue
  5. 28
      src/views/modules/part/external.vue

3
src/api/dict/country.js
View File

@ -0,0 +1,3 @@
import {createAPI} from '../../utils/httpRequest'
export const countryList = (data) => createAPI(`/country`,'post',data)

4
src/printFormat/roll_label.js
View File

@ -72,12 +72,12 @@ export const print_roll_label = (printList,printerName)=>{
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
} }
LODOP.ADD_PRINT_TEXT(66,73,29,15,"DATE");
LODOP.ADD_PRINT_TEXT(60,73,29,15,"DATE");
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",5); LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(66,95,85,16,row.date);
LODOP.ADD_PRINT_TEXT(60,95,85,16,row.date);
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",5); LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);

30
src/views/modules/factory/tblbasedata.vue
View File

@ -7,6 +7,7 @@ import {
getTableUserListLanguage, getTableUserListLanguage,
getTableUserListLanguageGroup getTableUserListLanguageGroup
} from '../../../api/table' } from '../../../api/table'
import {countryList} from '../../../api/dict/country'
let site = { let site = {
@ -25,6 +26,7 @@ let site = {
email: '', email: '',
active: '', active: '',
buNo: '', buNo: '',
defaultCountry:'',
} }
export default { export default {
name: 'TblBaseData', name: 'TblBaseData',
@ -51,6 +53,7 @@ export default {
saveFormRules:{ saveFormRules:{
siteName: [{ required: true, message: 'Please input Site Name', trigger: ['blur','change'] }], siteName: [{ required: true, message: 'Please input Site Name', trigger: ['blur','change'] }],
active: [{ required: true, message: 'Please select Active', trigger: ['blur','change'] }], active: [{ required: true, message: 'Please select Active', trigger: ['blur','change'] }],
defaultCountry: [{ required: true, message: 'Please select Default Country', trigger: ['blur','change'] }],
}, },
saveVisible: false, saveVisible: false,
tableLoading: false, tableLoading: false,
@ -221,6 +224,7 @@ export default {
columnWidth: 120 columnWidth: 120
}, },
], ],
countryList:[],
} }
}, },
methods:{ methods:{
@ -243,6 +247,7 @@ export default {
this.$emit('row-click', row) this.$emit('row-click', row)
}else { }else {
if (type === 0){ if (type === 0){
this.getCountryList();
this.siteForm = { this.siteForm = {
...row, ...row,
} }
@ -334,6 +339,7 @@ export default {
let params = { let params = {
...this.siteForm, ...this.siteForm,
} }
this.getCountryList();
generateSiteId(params).then(({data})=>{ generateSiteId(params).then(({data})=>{
if (data && data.code === 0){ if (data && data.code === 0){
this.siteForm.siteId = data.id; this.siteForm.siteId = data.id;
@ -427,6 +433,18 @@ export default {
}).catch((error)=>{ }).catch((error)=>{
this.$message.error(error) this.$message.error(error)
}) })
},
getCountryList () {
let params = {}
countryList(params).then(({data})=>{
if (data && data.code === 0){
this.countryList = data.rows;
}else {
this.$message.warning(data.msg)
}
}).catch((error)=>{
this.$message.error(error)
})
} }
}, },
created () { created () {
@ -529,6 +547,18 @@ export default {
<el-input v-model="siteForm.phoneNo"></el-input> <el-input v-model="siteForm.phoneNo"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="Contact Phone No" prop="phoneNo" :show-message="false">-->
<!-- <el-input v-model="siteForm.phoneNo"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="Default Country" prop="defaultCountry" :show-message="false">-->
<!-- <el-select v-model="siteForm.defaultCountry" placeholder="" style="width: 100%">-->
<!-- <el-option v-for="item in countryList" :label="item.countryNo" :value="item.countryNo" :key="item.countryNo"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6"> <el-col :span="6">
<el-form-item label=" " :show-message="false"> <el-form-item label=" " :show-message="false">
<el-checkbox v-model="siteForm.active" true-label="Y" false-label="N">Active</el-checkbox> <el-checkbox v-model="siteForm.active" true-label="Y" false-label="N">Active</el-checkbox>

3
src/views/modules/label/printer.vue
View File

@ -623,6 +623,8 @@ export default {
} }
this.printRules.cartonCount[0].message = `Please input ${data.data.rollCountLabel}` this.printRules.cartonCount[0].message = `Please input ${data.data.rollCountLabel}`
} }
this.getExternalPartPictureList();
this.selectLabelFormatUserDefaultListByUserId();
this.printVisible = true; this.printVisible = true;
}else { }else {
this.$message.warning(data.msg) this.$message.warning(data.msg)
@ -648,6 +650,7 @@ export default {
}).catch((error)=>{ }).catch((error)=>{
this.$message.error(error) this.$message.error(error)
}) })
}, },
handlePrintOrSave(){ handlePrintOrSave(){
this.$refs.printForm.validate((valid,obj) => { this.$refs.printForm.validate((valid,obj) => {

28
src/views/modules/part/external.vue
View File

@ -16,6 +16,7 @@ import {getExternalPartManufacturerList} from '../../../api/part/externalPartMan
import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../api/table' import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../api/table'
import {Decimal} from 'decimal.js' import {Decimal} from 'decimal.js'
import {getCategoryList} from '../../../api/category/category' import {getCategoryList} from '../../../api/category/category'
import {countryList} from '../../../api/dict/country'
let part = { let part = {
site:'', site:'',
@ -67,6 +68,7 @@ export default {
qtyPerCarton: [{ required: true, message: 'Please input Qty Per Carton', trigger: ['blur','change'] }], qtyPerCarton: [{ required: true, message: 'Please input Qty Per Carton', trigger: ['blur','change'] }],
qtyPerRoll: [{ required: true, message: 'Please input Qty Per Roll', trigger: ['blur','change'] }], qtyPerRoll: [{ required: true, message: 'Please input Qty Per Roll', trigger: ['blur','change'] }],
rollsPerCarton: [{ required: true, message: 'Please input Rolls Per Carton', trigger: ['blur','change'] }], rollsPerCarton: [{ required: true, message: 'Please input Rolls Per Carton', trigger: ['blur','change'] }],
freeInfo2: [{ required: true, message: 'Please select OOC', trigger: ['blur','change'] }],
}, },
savePartVisible:false, savePartVisible:false,
partTableLoading:false, partTableLoading:false,
@ -688,6 +690,7 @@ export default {
pictureList:[], pictureList:[],
externalPartManufacturerList:[], externalPartManufacturerList:[],
base64List:[], base64List:[],
countryList:[],
} }
}, },
watch:{ watch:{
@ -831,6 +834,7 @@ export default {
moldCodeRequired: 'N', moldCodeRequired: 'N',
serialNumberRequired: 'N', serialNumberRequired: 'N',
} }
this.getCountryList();
this.savePart.category = this.partCategoryList.length > 0 ? this.partCategoryList[0].categoryValue : '' this.savePart.category = this.partCategoryList.length > 0 ? this.partCategoryList[0].categoryValue : ''
this.savePartVisible = true; this.savePartVisible = true;
} }
@ -860,6 +864,7 @@ export default {
handleRowClick(row, column, event,type){ handleRowClick(row, column, event,type){
this.currentPart = {...row} this.currentPart = {...row}
if (type === 0){ if (type === 0){
this.getCountryList();
this.savePart = {...row} this.savePart = {...row}
this.savePartVisible = true; this.savePartVisible = true;
} }
@ -1032,6 +1037,20 @@ export default {
}, },
changeQtyRollCarton(){ changeQtyRollCarton(){
this.savePart.qtyPerRoll = this.savePart.qtyPerCarton; this.savePart.qtyPerRoll = this.savePart.qtyPerCarton;
},
getCountryList(){
let params = {
}
countryList(params).then(({data})=>{
if (data && data.code === 0){
this.countryList = data.rows
}else {
this.$message.warning(data.msg)
}
}).catch((error)=>{
this.$message.error(error)
})
} }
}, },
computed:{ computed:{
@ -1040,6 +1059,7 @@ export default {
created () { created () {
this.selectUnitList(); this.selectUnitList();
this.getCategoryList(); this.getCategoryList();
// this.getCountryList();
this.selectExternalPartList(); this.selectExternalPartList();
this.getTableUserColumn("10002Table", 1) this.getTableUserColumn("10002Table", 1)
this.getTableUserColumn("10002Table2", 2) this.getTableUserColumn("10002Table2", 2)
@ -1182,6 +1202,9 @@ export default {
<el-form-item label="Free Info1" :show-message="false"> <el-form-item label="Free Info1" :show-message="false">
<el-input v-model="savePart.freeInfo"></el-input> <el-input v-model="savePart.freeInfo"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="Free Info" :show-message="false">-->
<!-- <el-input v-model="savePart.freeInfo"></el-input>-->
<!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item label=" " :show-message="false"> <el-form-item label=" " :show-message="false">
@ -1193,6 +1216,11 @@ export default {
<el-input v-model="savePart.freeInfo2"></el-input> <el-input v-model="savePart.freeInfo2"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-form-item label="OOC" :show-message="false" prop="freeInfo2">-->
<!-- <el-select v-model="savePart.freeInfo2" placeholder="" style="width: 100%">-->
<!-- <el-option v-for="item in countryList" :label="item.countryNo" :value="item.countryNo" :key="item.countryNo"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

Write Preview
Loading…
Cancel
Save