sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改图标，客户退货任务

wms3.0_pda
lijuncheng 10 months ago
parent
7a227332a1
commit
0ea03011a9
19 changed files with 309 additions and 287 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      App.vue
  2. 412
      pages.json
  3. 42
      pages/config/config.vue
  4. 8
      pages/customerReturn/coms/comReturnJobCard.vue
  5. 35
      pages/customerReturn/job/returnDetail.vue
  6. 12
      pages/deliver/coms/comScanDeliverPack.vue
  7. 8
      pages/login/index.vue
  8. 7
      pages/purchaseReturn/job/returnDetail.vue
  9. 3
      router/my_router.js
  10. 10
      static/ali_icon/iconfont.css
  11. BIN
      static/ali_icon/iconfont.ttf
  12. 2
      static/config.json
  13. 18
      static/icon/iconfont.css
  14. BIN
      static/icon/iconfont.ttf
  15. BIN
      static/icon/iconfont_filter.ttf
  16. 32
      static/iconfont.css
  17. BIN
      static/iconfont.ttf
  18. BIN
      static/iconfont/iconfont.ttf
  19. 2
      static/scss/index.scss

3
App.vue
View File

@ -21,11 +21,12 @@
@import "./uni_modules/vk-uview-ui/index.scss";
// @import './common/PDA_style.css';
@import './common/style/new_style.css';
@import "./static/icon/iconfont.css";
@import './common/style/uni.css';
@import './common/style/pdabasic.css';
@import './uni.scss';
@import '@/static/scss/index.scss';
@import './static/ali_icon/iconfont.css';
body{
background-color: #EBEEF0;

412
pages.json
View File

@ -34,8 +34,30 @@
"style": {
"navigationBarTitleText": "登录",
"titleNView": {
"autoBackButton": "true",
"buttons": [{}]
// "autoBackButton": "true",
"buttons": [
// 右边按钮
// {
// "float": "right",
// "fontSize": "52rpx", //按钮上文字的大小
// "text": "\ue706",
// "fontSrc": "/static/ali_icon/iconfont.ttf"
// }
]
}
}
},
{
"path": "pages/config/config",
"style": {
"navigationBarTitleText": "配置",
"titleNView": {
// "autoBackButton": "true",
"buttons": [
]
}
}
},
@ -66,17 +88,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -101,17 +123,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -139,17 +161,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -174,15 +196,15 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -209,17 +231,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -251,17 +273,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -287,17 +309,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -330,17 +352,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -358,17 +380,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -423,17 +445,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -466,17 +488,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -515,17 +537,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -542,17 +564,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -615,17 +637,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -650,17 +672,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -694,16 +716,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -727,16 +749,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -753,16 +775,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -779,16 +801,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -805,16 +827,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -831,16 +853,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -903,16 +925,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -941,16 +963,16 @@
"titleNView": {
"buttons": [{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -983,17 +1005,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1026,17 +1048,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1068,17 +1090,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1112,17 +1134,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1148,17 +1170,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1208,17 +1230,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1243,16 +1265,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1278,17 +1300,17 @@
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1312,16 +1334,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1360,16 +1382,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1400,16 +1422,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1443,16 +1465,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1484,16 +1506,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1526,17 +1548,17 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1560,16 +1582,16 @@
// 右边按钮
{
"float": "right",
"fontSize": "23px", //按钮上文字的大小
"text": "\ue7c6",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
"float": "right",
"fontSize": "21px", //按钮上文字的大小
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
"fontSrc": "/static/iconfont/iconfont.ttf"
"fontSrc": "/static/ali_icon/iconfont.ttf"
}
]
}
@ -1648,9 +1670,9 @@
"autoBackButton": "true",
"buttons": [{
"float": "right",
"text": "\ue7c6",
"fontSrc": "/static/icon/iconfont.ttf",
"fontSize": "22px"
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf",
"fontSize": "58rpx"
}]
},
"softinputMode": "adjustPan" //adjustResize

42
pages/config/config.vue
View File

@ -0,0 +1,42 @@
<template>
<view class="" style="background-color: #fff; height: 100%;">
<view class="" style="font-size: 35rpx;padding: 15rpx;">
请求地址
</view>
<uni-combox :candidates="candidates" placeholder="请选择请求地址" v-model="city"></uni-combox>
</view>
</template>
<script>
export default {
data() {
return {
candidates:["http://192.168.0.178:12080/admin-api(陈放)",
"http://192.168.0.178:12080/admin-api"
],
city:""
};
},
methods: {
}
}
</script>
<style>
</style>

8
pages/customerReturn/coms/comReturnJobCard.vue
View File

@ -9,13 +9,7 @@
<view class="task_text">
<view class="">
客户名称 : {{dataContent.customerName}}
</view>
</view>
<view class="task_text">
<view class="">
物品代码 : {{dataContent.itemCode}}
客户代码 : {{dataContent.customerCode}}
</view>
</view>
</view>

35
pages/customerReturn/job/returnDetail.vue
View File

@ -95,8 +95,6 @@
};
},
onLoad(option) {
console.log("任务id",option.id)
console.log("任务状态",option.status)
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收
@ -277,8 +275,7 @@
']不一致,是否继续上架?', res => {
if (res) {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
.qty) ? Number(result.balance.qty) : Number(result.label.qty);
itemDetail.handleQty = Number(result.balance.qty)
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -290,8 +287,7 @@
});
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
.qty) ? Number(result.balance.qty) : Number(result.label.qty);
itemDetail.handleQty = Number(result.balance.qty)
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@ -363,19 +359,18 @@
this.managementList = res.list;
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
// customerReturnJobSubmit(this.id, params).then(res => {
// uni.hideLoading()
// if (res.data) {
// var hint = res.data.Number;
// this.showCommitSuccessMessage("提交成功" + hint)
// } else {
// this.showErrorMessage("提交失败[" + res.msg + "]")
// }
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
customerReturnJobSubmit(this.id, params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成客户退货记录:" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
} else {
uni.hideLoading();
this.showErrorMessage(res.message);
@ -394,7 +389,9 @@
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
detail.packingNumber, detail.batch);
detail.toPackingNumber = info.packingNumber;
detail.toContainerNumber = detail.containerNumber;
detail.toBatch = info.batch;
detail.toLocationCode = detail.toLocationCode;
subList.push(detail)
}
})

12
pages/deliver/coms/comScanDeliverPack.vue
View File

@ -138,7 +138,7 @@
fromLocationList: [],
fromLocationCode: '',
fromLocation: null,
issueRecord: [], //补料历史
issueRecord: [], //发货历史
expand: true,
scanOptions: {},
editItem: {},
@ -212,7 +212,7 @@
let location = this.fromLocationList.find(r => r == fromlocation)
if (location == undefined) {
this.fromLocationCode = ''
this.showErrorMessage('补料库位【' + fromlocation + '】不存在')
this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
}
},
onScan(result) {
@ -231,7 +231,7 @@
let lot = result.label.batch;
let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
if (item == undefined) {
that.showErrorMessage('未查找到零件【' + itemCode + '】的补料明细',
that.showErrorMessage('未查找到零件【' + itemCode + '】的发货明细',
res => {
that.getfocus();
}
@ -321,21 +321,21 @@
} else {
if (this.jobContent.AllowModifyBatch == null) {
this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
'】的补料明细,是否要继续补料?', res => {
'】的发货明细,是否要继续发货?', res => {
if (res) {
let batch = that.createBatchInfo(label, balance);
fromLocation.Batchs.unshift(batch);
}
})
} else {
that.showErrorMessage('未查找到批次【' + lot + '】的补料明细',
that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
res => {
that.getfocus();
});
}
}
} else {
that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的补料明细',
that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
res => {
that.getfocus();
}

8
pages/login/index.vue
View File

@ -136,6 +136,14 @@
backgroundColor: "#476DF5 !important"
})
},
//返回首页
onNavigationBarButtonTap(e) {
if (e.index === 0) {
uni.navigateTo({
url:"/pages/config/config"
})
}
},
onLoad() {
getCaptchaImage().then(res => {
if (res) {

7
pages/purchaseReturn/job/returnDetail.vue
View File

@ -248,7 +248,8 @@
']不一致,是否继续上架?', res => {
if (res) {
itemDetail.scaned = true;
itemDetail.handleQty = Number(qty);
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
.qty) ? Number(result.balance.qty) : Number(result.label.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
@ -262,13 +263,13 @@
});
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(qty);
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
.qty) ? Number(result.balance.qty) : Number(result.label.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty =result.package.stdPackQty
itemDetail.balance.stdPackUnit =result.package.stdPackUnit
itemDetail.handleQty = Number(qty);
this.calcHandleQty();
}
}

3
router/my_router.js
View File

@ -1,7 +1,8 @@
//只要是未登录状态，想要跳转到名单内的路径时，直接跳到登录页
// 页面白名单，不受拦截
const whiteList = [
'/pages/login/index'
'/pages/login/index',
'/pages/config/config'
]
function hasPermission(url) {

10
static/icon/iconfont_filter.css → static/ali_icon/iconfont.css
View File

@ -1,6 +1,6 @@
@font-face {
font-family: "iconfont"; /* Project id 4087030 */
src: url('@/static/icon/iconfont_filter.ttf') format('truetype');
src: url('/static/ali_icon/iconfont.ttf') format('truetype');
}
.iconfont {
@ -11,6 +11,14 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-shezhi:before {
content: "\e706";
}
.icon-icon_home:before {
content: "\e696";
}
.icon-guolv:before {
content: "\e6e2";
}

BIN
static/ali_icon/iconfont.ttf
View File

Binary file not shown.

2
static/config.json
View File

@ -18,7 +18,7 @@
"request_url": {
"name": "request_url",
"value": "http://192.168.0.230:12080/admin-api",
"value": "http://192.168.0.178:12080/admin-api",
"dev2": "http://192.168.0.157:12080/admin-api",
"chefang": "http://192.168.0.178:12080/admin-api",
"chenxinming": "http://192.168.0.230:12080/admin-api",

18
static/icon/iconfont.css
View File

@ -1,18 +0,0 @@
@font-face {
font-family: "iconfont";
/* Project id */
/* src: url('iconfont.ttf?t=1653546564489') format('truetype'); */
src: url('@/static/icon/iconfont.ttf') format('truetype');
}
/* .iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-home:before {
content: "\e7c6";
} */

BIN
static/icon/iconfont.ttf
View File

Binary file not shown.

BIN
static/icon/iconfont_filter.ttf
View File

Binary file not shown.

32
static/iconfont.css
View File

@ -1,32 +0,0 @@
@font-face {
font-family: "iconfont"; /* Project id */
src: url('@/static/iconfont.ttf') format('truetype');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-link:before {
content: "\e772";
}
.icon-poweroff:before {
content: "\e774";
}
.icon-safety-certificate:before {
content: "\e776";
}
.icon-chart-pie-alt:before {
content: "\e78c";
}
.icon-kongxincai:before {
content: "\e642";
}

BIN
static/iconfont.ttf
View File

Binary file not shown.

BIN
static/iconfont/iconfont.ttf
View File

Binary file not shown.

2
static/scss/index.scss
View File

@ -2,5 +2,3 @@
@import "./global.scss";
// color-ui
@import "@/static/scss/colorui.css";
// iconfont
@import "@/static/font/iconfont.css";
Write Preview
Loading…
Cancel
Save