zelian_wu 2 years ago
parent
commit
f2d21625f2
  1. 1
      src/element-ui/index.js
  2. 8
      src/views/modules/label/printer.vue
  3. 1
      src/views/modules/part/picture/picture.vue
  4. 4
      static/config/index-prod.js

1
src/element-ui/index.js

@ -4,7 +4,6 @@ import Element from 'element-ui';
import locale from 'element-ui/lib/locale' import locale from 'element-ui/lib/locale'
import en from 'element-ui/lib/locale/lang/en' import en from 'element-ui/lib/locale/lang/en'
Vue.use(Element, {size: 'medium', zIndex: 3000,locale: en}); Vue.use(Element, {size: 'medium', zIndex: 3000,locale: en});
import { import {
Loading, Loading,

8
src/views/modules/label/printer.vue

@ -554,11 +554,11 @@ export default {
} }
} }
this.printCurrentPart = JSON.parse(JSON.stringify(this.currentPart)) this.printCurrentPart = JSON.parse(JSON.stringify(this.currentPart))
this.printCurrentPart.serialNumber= '';
this.printCurrentPart.manufacturerNo= '';
this.printCurrentPart.moldCode= '';
this.printCurrentPart.manufacturerTime= dayjs().format('YYYY-MM-DD HH:mm:ss');
this.$set(this.printCurrentPart,'cartonCount',1) this.$set(this.printCurrentPart,'cartonCount',1)
this.$set(this.printCurrentPart,'manufacturerNo','')
this.$set(this.printCurrentPart,'moldCode','')
this.$set(this.printCurrentPart,'serialNumber',undefined)
this.$set(this.printCurrentPart,'manufacturerTime',dayjs().format('YYYY-MM-DD HH:mm:ss'))
if (this.currentPart.serialNumberRequired === 'Y'){ if (this.currentPart.serialNumberRequired === 'Y'){
this.printCurrentPart.qtyPerRoll = 1; this.printCurrentPart.qtyPerRoll = 1;
this.printCurrentPart.rollsPerCarton = 1; this.printCurrentPart.rollsPerCarton = 1;

1
src/views/modules/part/picture/picture.vue

@ -62,6 +62,7 @@ export default {
partNo: this.part.partNo, partNo: this.part.partNo,
createBy: this.$store.state.user.name, createBy: this.$store.state.user.name,
} }
this.baseUrl = process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi' : window.SITE_CONFIG['baseUrl']
this.saveVisible = true; this.saveVisible = true;
}, },
savePicture(){ savePicture(){

4
static/config/index-prod.js

@ -6,7 +6,9 @@
// api接口请求地址 // api接口请求地址
// window.SITE_CONFIG['baseUrl'] = 'http://172.26.68.17:9008';// 客户 // window.SITE_CONFIG['baseUrl'] = 'http://172.26.68.17:9008';// 客户
window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.83:8086';// 83
// window.SITE_CONFIG['baseUrl'] = 'http://192.168.254.12:9008/';// 客户
window.SITE_CONFIG['baseUrl'] = 'http://qrcode.checkpt.com:9008/';// 客户
// window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.83:8086';// 83
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['domain'] = './'; // 域名

Loading…
Cancel
Save