Browse Source

修复已知bug

pull/131/head
xuxiaoming 3 years ago
parent
commit
4b04b59d77
5 changed files with 23 additions and 10 deletions
  1. +3
    -3
      src/components/Header.vue
  2. +5
    -5
      src/components/Layout.vue
  3. +6
    -1
      src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
  4. +8
    -0
      src/views/factoryModel/timeModel/dayModel/shiftCconfiguration.vue
  5. +1
    -1
      src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue

+ 3
- 3
src/components/Header.vue View File

@ -133,7 +133,7 @@ export default {
float: left;
width: 40px;
height: 40px;
margin-top: 20px;
margin-top: 10px;
margin-left: 24px;
cursor: pointer;
}
@ -163,7 +163,7 @@ export default {
box-shadow: 0px 1px 3px 0px #1e514d;
border-radius: 2px;
border: 1px solid #2c998f;
margin-top: 12px;
margin-top: 2px;
margin-right: 16px;
.user-details-wrap {
float: right;
@ -213,7 +213,7 @@ export default {
float: left;
width: 185px;
height: 26px;
margin-top: 27px;
margin-top: 17px;
margin-left: 40px;
}
.customer-name {


+ 5
- 5
src/components/Layout.vue View File

@ -39,7 +39,7 @@ export default {
width: 100%;
height: 100%;
box-sizing: border-box;
padding-top: 80px;
padding-top: 62px;
padding-left: 250px;
background: #f3f3f3;
#content-title {
@ -47,16 +47,16 @@ export default {
top: 0;
left: 0;
width: 100%;
height: 80px;
line-height: 80px;
height: 62px;
line-height: 62px;
background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
}
#content-nav-menu {
position: absolute;
top: 80px;
top: 62px;
left: 0;
width: 250px;
height: calc(100% - 80px);
height: calc(100% - 62px);
background: #eeeeee;
box-sizing: border-box;
padding-top: 12px;


+ 6
- 1
src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue View File

@ -510,7 +510,12 @@ data() {
artList:[],
loading: false,
formData: {
"ArtStockResourceData-ArticleStockLevel":{},
"ArtStockResourceData-ArticleStockLevel":{
'AP_ArticleStockLevel-MinCoverPeriod':"",
'AP_ArticleStockLevel-MinCoverPeriodType':"",
'AP_ArticleStockLevel-MaxCoverPeriod':"",
'AP_ArticleStockLevel-MaxCoverPeriodType':"",
},
"ArtStockResourceData-ArticleResource":{
"AP_ArticleResource-RatePerHourToggle":true,
"AP_ArticleResource-TimePerItemToggle":true,


+ 8
- 0
src/views/factoryModel/timeModel/dayModel/shiftCconfiguration.vue View File

@ -171,6 +171,14 @@ export default {
end:"23:59"
};
},
watch: {
formData(data, oldValue) {
console.log('%cshiftCconfiguration.vue line:175 object1', 'color: #007acc;', this.formData["DayModel-EnableS"+this.shiftIndex+"CrossDayToggle"]);
if(this.formData["DayModel-EnableS"+this.shiftIndex+"CrossDayToggle"]){
this.end= "47:59"
}
}
},
methods:{
//
clearTime(){


+ 1
- 1
src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue View File

@ -496,7 +496,7 @@ export default {
},
//
setSelectRow(row) {
if (row.Label == "净生产量") {
this.SET_artId(row.artid)
this.setRowStatus(row.key);


Loading…
Cancel
Save