Browse Source

Merge pull request '优化' (#97) from wangxy into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/97
pull/98/head
wangxy 3 years ago
parent
commit
093789cfcd
6 changed files with 2274 additions and 29942 deletions
  1. +1
    -1
      .env.dev
  2. +1
    -1
      .env.test
  3. +0
    -27759
      package-lock.json
  4. +1
    -1
      src/views/factoryModel/part/material/index.vue
  5. +7
    -7
      src/views/plan/workbench/homePage/beta/predict/index.vue
  6. +2264
    -2173
      yarn.lock

+ 1
- 1
.env.dev View File

@ -1,4 +1,4 @@
NODE_ENV = 'dev'
NODE_ENV = 'production'
VUE_APP_BASE_URL = http://101.201.121.115:9003/
VUE_APP_TITLE = 生产计划管理系统
VUE_APP_LOGO = ../assets/img/logo.png


+ 1
- 1
.env.test View File

@ -1,4 +1,4 @@
NODE_ENV = 'test'
NODE_ENV = 'production'
VUE_APP_BASE_URL = http://10.11.3.207:9003/
VUE_APP_TITLE = 生产计划管理系统
VUE_APP_LOGO = ../assets/img/logo.png


+ 0
- 27759
package-lock.json
File diff suppressed because it is too large
View File


+ 1
- 1
src/views/factoryModel/part/material/index.vue View File

@ -187,7 +187,7 @@ export default {
"Article-ArtSpec4",
"Article-ArtSpec5",
// "Article-ArtTypeId",
"Article-CustArtId",
// "Article-CustArtId",
// "Article-AlternativeArtId",
"Article-UomId",
// "Article-QuantityPerHour",


+ 7
- 7
src/views/plan/workbench/homePage/beta/predict/index.vue View File

@ -66,9 +66,9 @@ export default {
"AP_CustDemandVerHead-CreateTime",
],
loading: false,
queryParams: {
VersionId: undefined
},
artId: undefined,
valid: undefined,
versionId: undefined,
pagination: {
//
pageNumber: 1,
@ -98,10 +98,10 @@ export default {
this.loading = true
get(`/admin/ap/custdemandverhead/selectdata`, {
...this.pagination,
customerId: id,
...{artId: artId},
valid: valid,
versionId: versionId
customerId: id || this.customerId,
artId: artId || this.artId,
valid: valid || this.valid,
versionId: versionId || this.versionId
}).then(({ code, data: { count = 0, records = [] } }) => {
if (code === 200) {
this.loading = false


+ 2264
- 2173
yarn.lock
File diff suppressed because it is too large
View File


Loading…
Cancel
Save