diff --git a/src/api/dict/country.js b/src/api/dict/country.js
new file mode 100644
index 0000000..d3b5934
--- /dev/null
+++ b/src/api/dict/country.js
@@ -0,0 +1,3 @@
+import {createAPI} from '../../utils/httpRequest'
+
+export const countryList = (data) => createAPI(`/country`,'post',data)
diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js
index 3e24e86..d184b59 100644
--- a/src/printFormat/roll_label.js
+++ b/src/printFormat/roll_label.js
@@ -72,12 +72,12 @@ export const print_roll_label = (printList,printerName)=>{
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,"FontSize",5);
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,"FontSize",5);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
diff --git a/src/views/modules/factory/tblbasedata.vue b/src/views/modules/factory/tblbasedata.vue
index 6342148..b7e8989 100644
--- a/src/views/modules/factory/tblbasedata.vue
+++ b/src/views/modules/factory/tblbasedata.vue
@@ -7,6 +7,7 @@ import {
getTableUserListLanguage,
getTableUserListLanguageGroup
} from '../../../api/table'
+import {countryList} from '../../../api/dict/country'
let site = {
@@ -25,6 +26,7 @@ let site = {
email: '',
active: '',
buNo: '',
+ defaultCountry:'',
}
export default {
name: 'TblBaseData',
@@ -51,6 +53,7 @@ export default {
saveFormRules:{
siteName: [{ required: true, message: 'Please input Site Name', 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,
tableLoading: false,
@@ -221,6 +224,7 @@ export default {
columnWidth: 120
},
],
+ countryList:[],
}
},
methods:{
@@ -243,6 +247,7 @@ export default {
this.$emit('row-click', row)
}else {
if (type === 0){
+ this.getCountryList();
this.siteForm = {
...row,
}
@@ -334,6 +339,7 @@ export default {
let params = {
...this.siteForm,
}
+ this.getCountryList();
generateSiteId(params).then(({data})=>{
if (data && data.code === 0){
this.siteForm.siteId = data.id;
@@ -427,6 +433,18 @@ export default {
}).catch((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 () {
@@ -529,6 +547,18 @@ export default {
+
+
+
+
+
+
+
+
+
+
+
+
Active
diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue
index 293ab03..f3f0956 100644
--- a/src/views/modules/label/printer.vue
+++ b/src/views/modules/label/printer.vue
@@ -623,6 +623,8 @@ export default {
}
this.printRules.cartonCount[0].message = `Please input ${data.data.rollCountLabel}`
}
+ this.getExternalPartPictureList();
+ this.selectLabelFormatUserDefaultListByUserId();
this.printVisible = true;
}else {
this.$message.warning(data.msg)
@@ -648,6 +650,7 @@ export default {
}).catch((error)=>{
this.$message.error(error)
})
+
},
handlePrintOrSave(){
this.$refs.printForm.validate((valid,obj) => {
diff --git a/src/views/modules/part/external.vue b/src/views/modules/part/external.vue
index ba190f0..91e70d2 100644
--- a/src/views/modules/part/external.vue
+++ b/src/views/modules/part/external.vue
@@ -16,6 +16,7 @@ import {getExternalPartManufacturerList} from '../../../api/part/externalPartMan
import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../api/table'
import {Decimal} from 'decimal.js'
import {getCategoryList} from '../../../api/category/category'
+import {countryList} from '../../../api/dict/country'
let part = {
site:'',
@@ -67,6 +68,7 @@ export default {
qtyPerCarton: [{ required: true, message: 'Please input Qty Per Carton', 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'] }],
+ freeInfo2: [{ required: true, message: 'Please select OOC', trigger: ['blur','change'] }],
},
savePartVisible:false,
partTableLoading:false,
@@ -688,6 +690,7 @@ export default {
pictureList:[],
externalPartManufacturerList:[],
base64List:[],
+ countryList:[],
}
},
watch:{
@@ -831,6 +834,7 @@ export default {
moldCodeRequired: 'N',
serialNumberRequired: 'N',
}
+ this.getCountryList();
this.savePart.category = this.partCategoryList.length > 0 ? this.partCategoryList[0].categoryValue : ''
this.savePartVisible = true;
}
@@ -860,6 +864,7 @@ export default {
handleRowClick(row, column, event,type){
this.currentPart = {...row}
if (type === 0){
+ this.getCountryList();
this.savePart = {...row}
this.savePartVisible = true;
}
@@ -1032,6 +1037,20 @@ export default {
},
changeQtyRollCarton(){
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:{
@@ -1040,6 +1059,7 @@ export default {
created () {
this.selectUnitList();
this.getCategoryList();
+ // this.getCountryList();
this.selectExternalPartList();
this.getTableUserColumn("10002Table", 1)
this.getTableUserColumn("10002Table2", 2)
@@ -1182,6 +1202,9 @@ export default {
+
+
+
@@ -1193,6 +1216,11 @@ export default {
+
+
+
+
+