工单管理

src/pages/assignment/workordermanage.vue

@@ -19,9 +19,9 @@
         </div>
         <div class="fr mgt10">
           <button class="mgr5 button--primary" @click="getDatas">查&nbsp;&nbsp;询</button>
-          <button class="button--primary" :class="{'button--defalut': !pkId}" :disabled="disabled1" @click="_openStart">开工</button>
-          <button class="button--primary" :class="{'button--defalut': !pkId}" :disabled="disabled2" @click="_saveReport">报工</button>
-          <button class="button--primary" :class="{'button--defalut': !pkId}" :disabled="disabled3" @click="_tofinish">完工</button>
+          <button class="button--primary" :class="{'button--defalut': !pkId || Number(pkObj.order_status) !== 1}" :disabled="disabled1" @click="_openStart">开工</button>
+          <button class="button--primary" :class="{'button--defalut': !pkId || Number(pkObj.order_status) === 1}" :disabled="disabled2" @click="_saveReport">报工</button>
+          <button class="button--primary" :class="{'button--defalut': !pkId || Number(pkObj.order_status) === 1}" :disabled="disabled3" @click="_tofinish">完工</button>
         </div>
       </div>
       <table class="filter-table">
@@ -38,9 +38,9 @@
           <th width="13%">开始时间</th>
           <th width="13%">结束时间</th>
         </tr>
-        <tr v-for="e in dataList" :key="e.workorder_id" @click="toRadio(e)">
+        <tr v-for="e in dataList" :key="e.workorder_id">
           <td>
-            <button class="iconfont select_icon" :class="pkId === e.workorder_id ? 'selected_icon' : 'unselect_icon'"></button>
+            <button class="iconfont select_icon" :class="pkId === e.workorder_id ? 'selected_icon' : 'unselect_icon'" @click="toRadio(e)"></button>
           </td>
           <td>{{e.workorder_code}}</td>
           <td>{{e.shift_type_scode_name}}</td>
@@ -49,7 +49,10 @@
           <td>{{['创建','下发','生产中','暂停', '完成'][Number(e.order_status) - 1]}}</td>
           <td>{{e.plan_qty}}</td>
           <td>{{e.real_qty}}</td>
-          <td>{{e.report_qty}}</td>
+          <!-- <td>{{e.report_qty}}</td> -->
+          <td>
+            <input type="number" class="grid-input" v-model="e.report_qty">
+          </td>
           <td>{{e.realproducestart_date}}</td>
           <td>{{e.realproduceend_date}}</td>
         </tr>
@@ -117,6 +120,15 @@ export default {
         this.disabled1 = false
         return
       }
+      if (Number(this.pkObj.order_status) !== 1) {
+        this.disabled1 = false
+        return
+      }
+      if (Number(this.pkObj.report_qty) < 0) {
+        this.toast('报工数量不能为负值')
+        this.disabled1 = false
+        return
+      }
       try {
         let res = await openStart(this.pkId, this.deviceCode)
         this.toast(res.message)
@@ -135,6 +147,15 @@ export default {
         this.disabled2 = false
         return
       }
+      if (Number(this.pkObj.order_status) === 1) {
+        this.disabled2 = false
+        return
+      }
+      if (Number(this.pkObj.report_qty) < 0) {
+        this.toast('报工数量不能为负值')
+        this.disabled2 = false
+        return
+      }
       try {
         let res = await saveReport(this.pkId, this.pkObj.report_qty)
         this.toast(res.message)
@@ -153,6 +174,15 @@ export default {
         this.disabled3 = false
         return
       }
+      if (Number(this.pkObj.order_status) === 1) {
+        this.disabled3 = false
+        return
+      }
+      if (Number(this.pkObj.report_qty) < 0) {
+        this.toast('报工数量不能为负值')
+        this.disabled3 = false
+        return
+      }
       try {
         let res = await tofinish(this.pkObj)
         this.toast(res.message)
@@ -171,4 +201,11 @@ export default {
     width 1.2rem
 .close_icon
     top 0
+.grid-input
+  line-height 0.18rem
+  font-size 0.13rem
+  color #999
+  text-align center
+  border-radius 3px
+  margin 0 .01rem
 </style>

src/pages/homeset/Home.vue

@@ -21,8 +21,8 @@
           </div>
           <div class="fl desc">
             <p class="device_name">{{e.deviceName}}</p>
-            <p class="ellipsis">任务数: {{e.job_count}}</p>
-            <p class="ellipsis">工单: {{e.workorderCode}}</p>
+            <p class="ellipsis">工单数: {{e.job_count}}</p>
+            <p class="ellipsis">当前工单: {{e.workorderCode}}</p>
           </div>
         </div>
       </div>

src/style/layout.styl

@@ -15,8 +15,6 @@
   color #606266
 .el-date-table td span
   color #606266
-.el-date-editor .el-range__icon,.el-date-editor .el-range-separator
-  line-height 22px
 .el-date-editor .el-range__close-icon
   line-height 24px
 .el-date-range-picker