From 78809560f4315777e770acec0e24cb42e2ca97a7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 七月 2024 08:06:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index 71de13a..24e7219 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -22,6 +22,23 @@
 //宸ュ簭
 const value = ref(t('machine.edgeGrinding'))
 
+//鏍规嵁浠ヤ笅瀛楁姹囨�绘煡璇�
+const stateValue = ref('')
+const stateOptions = [
+  {
+    value: 1,
+    label: t('order.orderId'),
+  },
+  {
+    value: 2,
+    label: t('processCard.processId'),
+  },
+  {
+    value: 3,
+    label: t('processCard.technologyNumber'),
+  },
+]
+
 //琛ㄥ熬姹傚拰
 const sumNum = (list, field) => {
   let count = 0
@@ -231,6 +248,15 @@
       filterMethod: filterChanged
     },
     {
+      field: 'order_id',
+      width: 120,
+      title: t('order.orderId'),
+      showOverflow: "ellipsis",
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged
+    },
+    {
       field: 'process_id',
       width: 120,
       title: t('processCard.processId'),
@@ -373,6 +399,15 @@
         &nbsp;&nbsp;
         <el-input v-model="form.project" clearable :placeholder="$t('order.project')" style="width: 130px"></el-input>
         &nbsp;
+        <el-select v-model="stateOptions[0]" class="m-2" :placeholder="$t('processCard.pleaseSelect')" clearable allow-create filterable style="width: 140px">
+          <el-option
+              v-for="item in stateOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+        &nbsp;
         <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
           <el-option
               v-for="item in titleSelectJson['processType']"

--
Gitblit v1.8.0