1、生产工单，增加查询条件，2、生产排版界面增加取消组合按钮

src/api/mes/pro/dta.js

@@ -18,6 +18,14 @@ export function finishApi(data) {
   });
 }
 
+// 修改dta信息
+export function cancelApi(data) {
+  return request({
+    url: `/md/dta/record/cancel/${data}`,
+    method: "put"
+  });
+}
+
 // 查询唯一码号段
 export function getLPNrecordList(query) {
   return request({

src/views/mes/pro/dta/index.vue

@@ -97,6 +97,13 @@
       <el-table-column label="完成时间" align="center" prop="endTime" />
       <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            v-if="!scope.row.endTime"
+            size="mini"
+            type="text"
+            @click="handleCancel(scope.row)"
+            v-hasPermi="['pro:dta:cancel']"
+          >取消</el-button>
           <el-button
             v-if="!scope.row.endTime"
             size="mini"
@@ -247,7 +254,7 @@
 </template>
 
 <script>
-import { getDtaList, finishApi } from "@/api/mes/pro/dta";
+import { getDtaList, finishApi, cancelApi } from "@/api/mes/pro/dta";
 import BrandSelect from "@/components/itemType/single.vue";
 import ProcessSelect from "@/components/process/taskSelectSingle.vue";
 import LPNList from "./components/LPN-list.vue";
@@ -430,6 +437,15 @@ export default {
       }).catch(() => {});
     },
     /** 完成按钮操作 */
+    handleCancel(row) {
+      this.$modal.confirm(`是否确认取消组合单${row.combinationCode}的排版任务？`).then(function() {
+        return cancelApi(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("取消成功");
+      }).catch(() => {});
+    },
+    /** 完成按钮操作 */
     handleFinish(row) {
       this.$modal.confirm(`是否确认组合单${row.combinationCode}的排版任务已经完成？`).then(function() {
         return finishApi(row.id);

src/views/mes/pro/workorder/indexApply.vue

@@ -86,6 +86,12 @@
         <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
+      <el-form-item label="排版状态" prop="dtaType">
+        <el-select v-model="queryParams.dtaType" placeholder="请选择排版状态" clearable>
+          <el-option v-for="dict in dict.type.dta" :key="dict.value" :label="dict.label"
+            :value="dict.value"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="需求日期">
         <el-date-picker v-model="beginRequestDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -251,6 +257,11 @@
           <dict-tag :options="dict.type.rush_order" :value="scope.row.rushOrder" />
         </template>
       </el-table-column>
+      <el-table-column label="排版状态" align="center" prop="dtaType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.dta" :value="scope.row.dtaType" />
+        </template>
+      </el-table-column>
       <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_workorder_status" :value="scope.row.status" />
@@ -677,6 +688,7 @@ export default {
   name: "Workorder",
   dicts: [
     "mes_workorder_status",
+    "dta",
     "rush_order",
     "mes_workorder_sourcetype",
     "mes_workorder_type",
@@ -785,6 +797,7 @@ export default {
         pageSize: 50,
         workorderCodes: null,
         arrangeCodes: null,
+        dtaType: null,
         workorderName: null,
         orderSource: null,
         sapItemCode: null,