From 98fc4ac665d58e682b3ede17e66c38ea585527a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 5 Aug 2025 09:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AB=E5=8C=96=E6=97=A5=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E3=80=81=E6=9F=A5=E8=AF=A2=E4=BA=A7=E9=87=8F?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=92=8C=E7=A1=AB=E5=8C=96=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=AF=B9=E6=AF=94=E8=A1=A8=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=B4=BE=E5=B7=A5=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=B8=BA=E5=8D=95=E6=9C=BA/=E5=8F=8C=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/scheduleForSOTask.vue  | 15 ++++++++++++-
 src/views/modules/production/searchSfdc.vue   | 17 +++++++++++++++
 .../modules/query/liuhuaIssureAndReport.vue   | 21 ++++++++++++++++++-
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 98f1464..ab46e21 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -402,6 +402,13 @@
             <el-option label="加班" value="加班"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="派工类型:">
+          <el-select v-model="schedulingModalData.shiftType" style="width: 120px"
+                     placeholder="请选择">
+            <el-option label="单机" value="单机"></el-option>
+            <el-option label="双机" value="双机"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="派工人员:">
           <el-select v-model="schedulingModalData.operatorId" style="width: 120px"
                      placeholder="请选择">
@@ -691,6 +698,7 @@
           operatorId:'',
           efficiency:'',
           partPlanQty:'',
+          shiftType: ''
         },
         scheduledModalFlag: false,
         vpModalFlag: false,
@@ -885,6 +893,10 @@
         //   })
         //   return false
         // }
+        if (this.schedulingModalData.shiftType==null || this.schedulingModalData.shiftType=='') {
+          this.$message.warning('请选择派工类型！')
+          return false
+        }
         let flag=false;
         for (let i = 0; i <this.schedulingModalTableData.length; i++) {
           if(''==this.schedulingModalTableData[i].scheduleQty||this.schedulingModalTableData[i].scheduleQty==null){
@@ -960,7 +972,8 @@
           efficiency:this.schedulingModalData.efficiency,
           orderRef1:this.schedulingModalData.orderRef1,
           remark:this.schedulingModalData.remark,
-          repairSOFlag:this.schedulingModalData.repairSOFlag
+          repairSOFlag:this.schedulingModalData.repairSOFlag,
+          shiftType: this.schedulingModalData.shiftType
         }
         scheduleForSOTask(indata).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue
index 8bb273a..467e2da 100644
--- a/src/views/modules/production/searchSfdc.vue
+++ b/src/views/modules/production/searchSfdc.vue
@@ -241,6 +241,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          },{
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "shiftType",
+            columnLabel: "派工类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
           },
           {
             tableId: "sfdcList",
diff --git a/src/views/modules/query/liuhuaIssureAndReport.vue b/src/views/modules/query/liuhuaIssureAndReport.vue
index 7a8de8d..76b67c8 100644
--- a/src/views/modules/query/liuhuaIssureAndReport.vue
+++ b/src/views/modules/query/liuhuaIssureAndReport.vue
@@ -132,7 +132,26 @@
             status: true,
             fixed: '',
             columnWidth: 60
-          },{
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 400003,
+            serialNumber: '400003Table1PartNo',
+            tableId: "400003Table1",
+            tableName: "硫化发料产出",
+            columnProp: "shiftType",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "派工类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
             userId: this.$store.state.user.name,
             functionId: 400003,
             serialNumber: '400003Table1PartNo',