修改工时分配页面

pages/produce/execute/execute.less

@@ -297,8 +297,8 @@
             float: left;
             margin: 20px 72px;
             width: 300px;
-            // height: 240px;
-            height: 180px;
+            // height: 200px;
+            // height: 180px;
             border-color: #2680EB;
             .ivu-card-head{
                 background: #d3e6fb;
@@ -324,7 +324,7 @@
             }
             .gs_footer{
                 background: #d3e6fb;
-                margin: 0 -16px;
+                margin: 0 -16px -16px;
                 height: 59px;
                 // border-bottom-left-radius: 4px;
                 // border-bottom-right-radius: 4px;
@@ -334,7 +334,7 @@
                     height: 59px;
                     line-height: 60px;
                     text-align: center;
-                    width: calc(100% - 0px);
+                    width: calc(50% - 0px);
                     // width: calc(50% - 2px);
                 }
                 .gs_del{

pages/produce/execute/index.vue

@@ -126,6 +126,9 @@ export default {
                 this.$Message.info("尊敬的用户，您没有该权限！");
             } //产品装配
             if (number == 3) {
+                if(this.$route.query.dispatchStatus != 0){
+                  return this.$Message.info("此订单未完成！不能进行工时分配。");
+                }
                 this.detail = () => import("./taskTime/index");
             } //工时分配
             if (number == 4) {

pages/produce/execute/taskTime/index.vue

@@ -52,18 +52,22 @@
                 <p class="gs_p">
                     <span class="b_size">100</span>  秒
         </p>-->
-        <p class="gs_footer">
+        <p class="gs_footer" >
           <a class="gs_edit" @click="editItem">
             <Icon type="md-create" />
             编辑</a
           >
-          <a class="gs_del" @click="delItem(item.id)">
+          <a
+            class="gs_del"
+            style="position: absolute;right:0px; width: 50%;"
+            @click="delItem(item.id)"
+          >
             <Icon type="ios-trash-outline" />删除
           </a>
         </p>
       </Card>
       <a class="gs_card gs_add" @click="addItem" v-show="this.waitHours != 0">
-        <Icon type="ios-add" />
+        <Icon type="ios-add" style="vertical-align:middle"/>
       </a>
     </div>
     <div
@@ -120,6 +124,7 @@ export default {
         //   workHour: 0,
         // },
       ],
+      cardManCopy:[],
       topInfoShow: {},
     };
   },