|
@@ -166,7 +166,7 @@
|
166
|
166
|
height="calc(100% - 50px)"
|
167
|
167
|
ref="table"
|
168
|
168
|
style="table-layout: fixed;"
|
169
|
|
-
|
|
169
|
+
|
170
|
170
|
>
|
171
|
171
|
<!-- :cell-style ='cellstyle' :height="tableContainHeight" calc(100% - 50px) 600-->
|
172
|
172
|
<el-table-column
|
|
@@ -1344,7 +1344,7 @@
|
1344
|
1344
|
:schedulMode="modename_value"
|
1345
|
1345
|
>
|
1346
|
1346
|
|
1347
|
|
-
|
|
1347
|
+
|
1348
|
1348
|
</schedule-item>
|
1349
|
1349
|
</div>
|
1350
|
1350
|
</template>
|
|
@@ -2526,7 +2526,7 @@ export default {
|
2526
|
2526
|
|
2527
|
2527
|
for(let i = 0; i < this.weeks.length; i++){
|
2528
|
2528
|
for(let b = 0; b < this.first_weeks.length; b++){
|
2529
|
|
- if(this.weeks[i].week_type == this.first_weeks[b].week_type && this.first_weeks[b].order_id > 0){
|
|
2529
|
+ if(this.weeks[i].week_type == this.first_weeks[b].week_type){
|
2530
|
2530
|
console.log(this.weeks[i].week_type)
|
2531
|
2531
|
console.log(this.first_weeks[b].week_type)
|
2532
|
2532
|
console.log(this.first_weeks[b].order_id)
|