tasktime 工时提交

pages/aps/aps/index.vue

@@ -26,6 +26,7 @@
             </a>
             <Button type="primary" @click="goResults" style="background:#515A6E;border:solid 1px #515A6E">历史方案</Button>
             <Button type="primary" @click="openApsModal">APS排产</Button>
+            <Button type="primary" v-if="showMutiAps">多级连排</Button>
         </template>
         <template slot="batch">
             <Button type="primary" class="mr10 ml10" @click="removeOk">移出排产</Button>
@@ -367,7 +368,8 @@ export default {
             circleModal: false, //进度条
             listTemp: [], //自定义模板排序下拉框列表
             tempValue: null,
-            tempStatu: 0 //新建模型时传过来的id值
+            tempStatu: 0, //新建模型时传过来的id值
+            showMutiAps: false, //多级连排是否显示
         };
     },
     mounted() {

pages/produce/execute/taskTime/index.vue

@@ -18,7 +18,8 @@
             <!-- <Icon type="ios-time" /> -->
             <div class="gs_bo01">
                 <span class="shi">总工时</span>
-                <span class="number">{{ allHours }}</span>
+                <span class="number" style="display: inline;">{{ allHours }}</span><span style="display: inline;"> 工时</span>
+
             </div>
         </div>
         <Divider type="vertical" class="line_slit" />
@@ -27,7 +28,7 @@
             <img src="@/assets/imgicon/execute/time02.png" alt />
             <div class="gs_bo01">
                 <span class="shi">待分配</span>
-                <span class="number">{{ waitHours }}</span>
+                <span class="number" style="display: inline;">{{ waitHours }}</span><span style="display: inline;"> 工时</span>
             </div>
         </div>
     </div>