From 23346cc7ffff52b184d676b5c2727f75820917b5 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 20 Feb 2025 11:50:33 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/production/dailyPlan.vue                | 7 +++++++
 src/views/modules/production/productionBlankingSearch.vue | 7 +++++++
 src/views/modules/production/scheduleForSOTask.vue        | 7 +++++++
 src/views/modules/production/scheduleForShopOrder.vue     | 7 +++++++
 src/views/modules/production/scheduleForVPShopOrder.vue   | 7 +++++++
 src/views/modules/taskmanage/alltasklist.vue              | 4 ++--
 src/views/modules/taskmanage/mysendtasklist.vue           | 4 ++--
 src/views/modules/taskmanage/mytasklist.vue               | 4 ++--
 src/views/modules/taskmanage/tasklist-add-or-update.vue   | 2 +-
 src/views/modules/taskmanage/tasklist.vue                 | 4 ++--
 10 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index 9b9a42c..7054bd8 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -142,6 +142,13 @@
         min-width="200"
         label="物料名称">
       </el-table-column>
+      <el-table-column
+        prop="orderTypeDesc"
+        header-align="center"
+        align="left"
+        min-width="60"
+        label="订单类型">
+      </el-table-column>
       <el-table-column
         prop="status"
         header-align="center"
diff --git a/src/views/modules/production/productionBlankingSearch.vue b/src/views/modules/production/productionBlankingSearch.vue
index 450ec3b..c8eb4cd 100644
--- a/src/views/modules/production/productionBlankingSearch.vue
+++ b/src/views/modules/production/productionBlankingSearch.vue
@@ -124,6 +124,13 @@
         min-width="100"
         label="需求日期">
       </el-table-column>
+      <el-table-column
+        prop="orderTypeDesc"
+        header-align="center"
+        align="left"
+        min-width="60"
+        label="订单类型">
+      </el-table-column>
     </el-table>
     </div>
     <el-dialog title="混炼任务合并" :close-on-click-modal="false" v-drag :visible.sync="sumFlag" width="700px">
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 10fc060..91effb1 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -157,6 +157,13 @@
         min-width="140"
         label="日计划号">
       </el-table-column>
+      <el-table-column
+        prop="orderTypeDesc"
+        header-align="center"
+        align="left"
+        width="70"
+        label="订单类型">
+      </el-table-column>
       <el-table-column
         prop="finishFlag"
         header-align="center"
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index 6b62eab..3604793 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -165,6 +165,13 @@
         width="120"
         label="生产订单号">
       </el-table-column>
+      <el-table-column
+        prop="orderTypeDesc"
+        header-align="center"
+        align="left"
+        width="70"
+        label="订单类型">
+      </el-table-column>
       <el-table-column
         prop="itemNo"
         header-align="center"
diff --git a/src/views/modules/production/scheduleForVPShopOrder.vue b/src/views/modules/production/scheduleForVPShopOrder.vue
index c8edd4f..8d5caa6 100644
--- a/src/views/modules/production/scheduleForVPShopOrder.vue
+++ b/src/views/modules/production/scheduleForVPShopOrder.vue
@@ -127,6 +127,13 @@
         min-width="160"
         label="组合件规格型号">
       </el-table-column>
+      <el-table-column
+        prop="orderTypeDesc"
+        header-align="center"
+        align="left"
+        width="70"
+        label="订单类型">
+      </el-table-column>
       <el-table-column
         prop="itemNo"
         header-align="center"
diff --git a/src/views/modules/taskmanage/alltasklist.vue b/src/views/modules/taskmanage/alltasklist.vue
index dc070a0..75af6cd 100644
--- a/src/views/modules/taskmanage/alltasklist.vue
+++ b/src/views/modules/taskmanage/alltasklist.vue
@@ -58,7 +58,7 @@
           </el-row>
           <el-row>
             <el-col style="margin-top: -5px" :span="24">
-              <el-form-item label="客户">
+              <el-form-item label="客户/工单">
                 <el-input style="width: 120px" v-model="dataForm.customer" clearable></el-input>
               </el-form-item>
               <el-form-item label="项目">
@@ -219,7 +219,7 @@
             tableId: "ProjectInfo",
             tableName: this.$route.meta.title,
             columnProp: "customer",
-            columnLabel: "客户",
+            columnLabel: "客户/工单",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
diff --git a/src/views/modules/taskmanage/mysendtasklist.vue b/src/views/modules/taskmanage/mysendtasklist.vue
index f656205..77cb9e5 100644
--- a/src/views/modules/taskmanage/mysendtasklist.vue
+++ b/src/views/modules/taskmanage/mysendtasklist.vue
@@ -58,7 +58,7 @@
           </el-row>
           <el-row>
             <el-col style="margin-top: -5px" :span="24">
-              <el-form-item label="客户">
+              <el-form-item label="客户/工单">
                 <el-input style="width: 120px" v-model="dataForm.customer" clearable></el-input>
               </el-form-item>
               <el-form-item label="项目">
@@ -243,7 +243,7 @@
             tableId: "ProjectInfo",
             tableName: this.$route.meta.title,
             columnProp: "customer",
-            columnLabel: "客户",
+            columnLabel: "客户/工单",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
diff --git a/src/views/modules/taskmanage/mytasklist.vue b/src/views/modules/taskmanage/mytasklist.vue
index 1d90070..a24d02a 100644
--- a/src/views/modules/taskmanage/mytasklist.vue
+++ b/src/views/modules/taskmanage/mytasklist.vue
@@ -19,7 +19,7 @@
         <el-form :inline="true" label-position="top" :model="dataForm" @keyup.enter.native="getDataList()">
           <el-row>
             <el-col :span="24">
-              <el-form-item label="客户">
+              <el-form-item label="客户/工单">
                 <el-input style="width: 120px" v-model="dataForm.customer" clearable></el-input>
               </el-form-item>
               <el-form-item label="最终状态">
@@ -228,7 +228,7 @@
             tableId: "ProjectInfo",
             tableName: this.$route.meta.title,
             columnProp: "customer",
-            columnLabel: "客户",
+            columnLabel: "客户/工单",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
diff --git a/src/views/modules/taskmanage/tasklist-add-or-update.vue b/src/views/modules/taskmanage/tasklist-add-or-update.vue
index 09c33fa..fe9de09 100644
--- a/src/views/modules/taskmanage/tasklist-add-or-update.vue
+++ b/src/views/modules/taskmanage/tasklist-add-or-update.vue
@@ -20,7 +20,7 @@
           </el-form-item>
         </el-col>
       <el-col :span="8">
-          <el-form-item label="客户" prop="customer">
+          <el-form-item label="客户/工单" prop="customer">
             <el-input v-model="dataForm.customer"></el-input>
           </el-form-item>
       </el-col>
diff --git a/src/views/modules/taskmanage/tasklist.vue b/src/views/modules/taskmanage/tasklist.vue
index 9156809..ef6ac1e 100644
--- a/src/views/modules/taskmanage/tasklist.vue
+++ b/src/views/modules/taskmanage/tasklist.vue
@@ -55,7 +55,7 @@
           </el-row>
           <el-row>
             <el-col style="margin-top: -5px" :span="24">
-              <el-form-item label="客户">
+              <el-form-item label="客户/工单">
                 <el-input style="width: 120px" v-model="dataForm.customer" clearable></el-input>
               </el-form-item>
               <el-form-item label="项目">
@@ -237,7 +237,7 @@
             tableId: "ProjectInfo",
             tableName: this.$route.meta.title,
             columnProp: "customer",
-            columnLabel: "客户",
+            columnLabel: "客户/工单",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,