代码修改

lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -168,6 +168,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="工单状态">
+            <el-select
+              v-model="form.order_status"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.pdm_workorder_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="所属工序">
             <el-select
               v-model="form.workorder_procedure"

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -136,7 +136,7 @@
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="right"
           label="操作"
-          width="120px"
+          width="160px"
           align="center"
         >
           <template slot-scope="scope">
@@ -150,6 +150,11 @@
               icon="el-icon-success"
               @click="doOperate(scope.row, 'a')"
             >完成</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-error"
+              @click="doOperate(scope.row, 'b')"
+            >取消</el-button>
           </template>
         </el-table-column>
       </el-table>