diff --git a/src/api/pad.js b/src/api/pad.js
index 108b245..de4dc2f 100644
--- a/src/api/pad.js
+++ b/src/api/pad.js
@@ -10,3 +10,8 @@ export const getPartSubPropertiesValueHeaderData = data => createAPI(`pad/getPar
export const searchPartData = data => createAPI(`pad/searchPartData`,'post',data)
export const getBomDetailData = data => createAPI(`pad/getBomDetailData`,'post',data)
export const getRoutingDetailData = data => createAPI(`pad/getRoutingDetailData`,'post',data)
+
+
+export const searchDelHeaderList = data => createAPI(`/pad/searchDelHeaderList`,'get',data)
+export const searchDelNotifyDetail = data => createAPI(`/pad/searchDelNotifyDetail`,'get',data)
+export const updateDelNotifyDetail = data => createAPI(`/pad/updateDelNotifyDetail`,'post',data)
diff --git a/src/router/index.js b/src/router/index.js
index 0d672c6..6eee2b6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -31,6 +31,7 @@ const globalRoutes = [
{ path: '/padPart', component: _import('modules/pad/padPart1'), name: 'padPart1', meta: { title: '产品搜索' } },
{ path: '/padPartAttribute', component: _import('modules/pad/padPartAttribute'), name: 'padPartAttribute', meta: { title: '产品属性' } },
{ path: '/padPartPhoto', component: _import('modules/pad/padPartPhoto'), name: 'padPartPhoto', meta: { title: '产品图片' } },
+ { path: '/padCODelNotify', component: _import('modules/pad/padCODelNotify'), name: 'padCODelNotify', meta: { title: '发货通知单' } },
{ path: '/taskReport', component: _import('modules/taskmanage/taskReport'), name: 'taskReport', meta: { title: '任务看板' } },
{ path: '/autoPrintStock', component: _import('modules/autoPrint/autoPrintStock'), name: 'autoPrintStock', meta: { title: '自动打印库存' } },
{ path: '/autoPrint', component: _import('modules/autoPrint/autoPrint'), name: 'autoPrint', meta: { title: '自动打印标签' } },
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a2895d6..fe538c3 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -6,10 +6,10 @@ export default {
site: 0,
languageDefault: '',
userDisplay: '',
- padSopUrl:'http://192.168.2.172/upload/',
- tvSopUrl:'http://192.168.2.172/sopFile/',
- // padSopUrl:'http://192.168.1.83:81/upload/',
- // tvSopUrl:'http://192.168.1.83:81/upload/',
+ // padSopUrl:'http://192.168.2.172/upload/',
+ // tvSopUrl:'http://192.168.2.172/sopFile/',
+ padSopUrl:'http://192.168.1.83:81/upload/',
+ tvSopUrl:'http://192.168.1.83:81/upload/',
},
mutations: {
updateId (state, id) {
diff --git a/src/views/main.vue b/src/views/main.vue
index d668a56..da8f0d9 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -97,6 +97,10 @@
this.site = data.user.site
this.languageDefault = data.user.languageDefault
this.userDisplay = data.user.userDisplay
+ let match = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
+ if (match) {
+ this.$router.replace({ name: 'padCODelNotify' })
+ }
}
})
}
diff --git a/src/views/modules/pad/padCODelNotify.vue b/src/views/modules/pad/padCODelNotify.vue
new file mode 100644
index 0000000..a193c5d
--- /dev/null
+++ b/src/views/modules/pad/padCODelNotify.vue
@@ -0,0 +1,771 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查 询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 属性
+ 图片
+ 检验
+
+
+
+
+ {{getSignNumber(row.delNotifyItemNo)}}
+
+
+
+
+
+
+ 合格
+ 不合格
+ 待检验
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上一张
+
+
+
+
+
+
+
+
+
+ 下一张
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上一条
+ 下一条
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+ 1
+
+
+
+
+
产品属性
-
+
@@ -18,7 +18,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -158,7 +158,7 @@
-
+
@@ -279,7 +279,7 @@
this.routingNum=1;
this.remark=this.currentData.remark;
this.searchData.site= this.currentData.site;
- this.partDescription= this.currentData.partDescription+'/'+this.currentData.spec;
+ this.partDescription= this.currentData.partDescription+(this.currentData.spec ?'/'+this.currentData.spec:"");
getPartSubPropertiesValueHeaderData(this.searchData).then(({data}) => {
this.list = data.rows;
this.bomList = data.rows2;
@@ -414,7 +414,8 @@
})
},
jump(){
- this.$router.push('/padPart');
+ // this.$router.push('/padPart');
+ this.$router.back();
},
nextData(){
if(this.list.length==0){
diff --git a/src/views/modules/print/print_package_label.js b/src/views/modules/print/print_package_label.js
index f01f59d..ccc4b3f 100644
--- a/src/views/modules/print/print_package_label.js
+++ b/src/views/modules/print/print_package_label.js
@@ -62,7 +62,7 @@ export function printPackageLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
- LODOP.ADD_PRINT_TEXT(216,18,191,19,"Manufactured by A&M Polymer");
+ LODOP.ADD_PRINT_TEXT(216,18,191,19,"Manufactured by "+printData.keyInfoStr2);
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
LODOP.ADD_PRINT_TEXT(24,212,149,20,"IATF:16949 Certified");
@@ -104,7 +104,8 @@ export function printPackageLabel(printList) {
}
LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
// LODOP.ADD_PRINT_IMAGE(4,18,114,31,"
");
- LODOP.ADD_PRINT_IMAGE(4,18,114,31,"
");
+ // LODOP.ADD_PRINT_IMAGE(4,18,114,31,`
`);
+ LODOP.ADD_PRINT_IMAGE(4,18,114,31,`
`);
LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
}