优化

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

@@ -81,6 +81,14 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item :label="$t('排产次数')" prop="taskBatch">
+            <el-input
+              v-model="queryParams.taskBatch"
+
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item :label="$t('项目号')" prop="customerProjectNo">
             <el-input
               v-model="queryParams.customerProjectNo"
@@ -609,6 +617,7 @@ export default {
         pageSize: 10,
         taskCode: null,
         arrangeCode: null,
+        taskBatch: null,
         arrangeUsername: null,
         workorderCode: null,
         processName: null,

src/views/mes/proTable/productProcess/index.vue

@@ -13,6 +13,16 @@
       <el-form-item :label="$t('产品编码')" prop="productCode">
           <el-input v-model="queryParams.productCode" :placeholder="$t('请输入产品编码')"  />
       </el-form-item>
+      <el-form-item :label="$t('所属产线')" prop="lineName">
+          <el-input v-model="queryParams.lineName" :placeholder="$t('请输入')"  />
+      </el-form-item>
+      <el-form-item :label="$t('工单状态')" prop="status">
+        <el-select v-model="queryParams.workOrderStatus" clearable multiple>
+          <el-option v-for="dict in dict.type.mes_workorder_status" :key="dict.value" :label="dict.label"
+            :value="dict.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('产品名称')" prop="productName">
         <el-input v-model="queryParams.productName"  >
           <el-button slot="append" icon="el-icon-search" @click="$refs['ItemSelectRef'].showFlag = true" ></el-button>
@@ -27,6 +37,12 @@
         <el-table-column :label="$t('项目号')" align="center" prop="customerProjectNo"></el-table-column>
         <el-table-column :label="$t('订单号')" align="center" prop="orderCode"></el-table-column>
         <el-table-column :label="$t('生产工单')" align="center" prop="workorderCode"></el-table-column>
+        <el-table-column :label="$t('所属产线')" align="center" prop="lineName"></el-table-column>
+        <el-table-column :label="$t('工单状态')" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.mes_workorder_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('工单类型')" align="center" prop="workorderType">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" />
@@ -59,7 +75,7 @@
         </el-table-column>
         <el-table-column :label="$t('合格数量')" align="center" prop="quantityQualify"></el-table-column>
         <el-table-column :label="$t('不合格数量')" align="center" prop="quantityUnqualify"></el-table-column>
-        <el-table-column :label="$t('合格率')" align="center" prop="passRate">、
+        <el-table-column :label="$t('合格率')" align="center" prop="passRate">
           <template slot-scope="scope">
             {{scope.row.passRate ? `${scope.row.passRate}%` : ''}}
           </template>
@@ -96,6 +112,7 @@ export default {
   components: {ItemSelect},
   dicts: [
   "mes_workorder_type",
+  "mes_workorder_status"
 ],
   data() {
     return {
@@ -137,6 +154,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         defectStatus: true,
+        workOrderStatus: [],
+        lineName: null,
         "customerProjectNo": null,
         "endDate": null,
         "orderCode": null,