From a4942c55c97850649f92995ffc8b3af82617448f Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Wed, 24 Jan 2024 16:14:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/productManagement/workoder_v2.js      |  9 ++-
 src/views/productManagement/workorder2.vue    | 58 ++++++++++++++-----
 .../productManagement/workorder_online.vue    |  2 +-
 src/views/productManagement/workplan2.vue     |  2 +-
 4 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/src/api/productManagement/workoder_v2.js b/src/api/productManagement/workoder_v2.js
index 3923c84..a2e9102 100644
--- a/src/api/productManagement/workoder_v2.js
+++ b/src/api/productManagement/workoder_v2.js
@@ -69,4 +69,11 @@ export function updateSort(query) {
 }
 
 
-
+// 生成工作工单
+export function GenerateWorkorder(query) {
+  return request({
+    url: '/mes/pro/workorder_v2/generateWorkorder',
+    method: 'get',
+    params: query,
+  })
+}
\ No newline at end of file
diff --git a/src/views/productManagement/workorder2.vue b/src/views/productManagement/workorder2.vue
index 4260e1f..a3b7514 100644
--- a/src/views/productManagement/workorder2.vue
+++ b/src/views/productManagement/workorder2.vue
@@ -6,20 +6,19 @@
           <el-input v-model="search.year" placeholder="输入年份"></el-input>
         </el-form-item>
         <el-form-item label="周">
-          <el-input v-model="search.week" placeholder="输入周"></el-input>
+          <el-input-number v-model="search.week" :min="1" :max="100" label="输入周"></el-input-number>
         </el-form-item>
         <el-form-item label="日">
           <el-select v-model="search.date" placeholder="请选择日">
-            <el-option label="周一" value="1"> </el-option>
-            <el-option label="周二" value="2"> </el-option>
-            <el-option label="周三" value="3"> </el-option>
-            <el-option label="周四" value="4"> </el-option>
-            <el-option label="周五" value="5"> </el-option>
-            <el-option label="周六" value="6"> </el-option>
-            <el-option label="周日" value="7"> </el-option>
+            <el-option label="周一" :value="1"> </el-option>
+            <el-option label="周二" :value="2"> </el-option>
+            <el-option label="周三" :value="3"> </el-option>
+            <el-option label="周四" :value="4"> </el-option>
+            <el-option label="周五" :value="5"> </el-option>
+            <el-option label="周六" :value="6"> </el-option>
+            <el-option label="周日" :value="7"> </el-option>
           </el-select>
         </el-form-item>
-
         <el-button type="primary" icon="el-icon-search" @click="handleClick">搜索</el-button>
       </el-form>
 
@@ -27,6 +26,7 @@
         <el-col :span="1.5"> <el-button type="warning" size="mini" @click="importworkorder">导入工单</el-button> </el-col>
         <el-col :span="1.5"> <el-button type="info" size="mini" @click="download_workorder">导出工单</el-button> </el-col>
         <el-col :span="1.5"> <el-button type="danger" size="mini" @click="handleAllworkorder">删除工单</el-button> </el-col>
+        <el-col :span="1.5"> <el-button type="success" size="mini" @click="generate_workorder">生成工单</el-button> </el-col>
       </el-row>
     </div>
     <!-- 用户导入对话框 -->
@@ -90,6 +90,7 @@
       <vxe-column type="seq" width="60"></vxe-column>
       <!-- <vxe-column field="sort" title="序号"></vxe-column>
       <vxe-column field="id" title="工单号"></vxe-column> -->
+      <vxe-column field="clientWorkorder" title="工单号"></vxe-column>
       <vxe-column field="blankNumber" title="毛坯号"></vxe-column>
       <vxe-column field="finishedPartNumber" title="成品零件号"></vxe-column>
       <vxe-column field="productDescription" title="产品描述"></vxe-column>
@@ -126,8 +127,6 @@
                   @click="addworkorder(row)"
                 ></vxe-button
               ></el-dropdown-item>
-              <el-dropdown-item> <i class="el-icon-arrow-up el-icon--right"></i><span>上移</span></el-dropdown-item>
-              <el-dropdown-item> <i class="el-icon-arrow-up el-icon--right"></i><span>下移</span></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -235,6 +234,7 @@ import {
   deleteworkorder,
   updateworkorder,
   updateSort,
+  GenerateWorkorder
 } from '@/api/productManagement/workoder_v2.js'
 import Sortable from 'sortablejs'
 import { getToken } from '@/utils/auth'
@@ -245,8 +245,8 @@ export default {
     return {
       search: {
         year: new Date().getFullYear(),
-        week: null,
-        date: null,
+        week: 1,
+        date: 1,
       },
       pagination: {
         total: 0,
@@ -551,6 +551,38 @@ export default {
       this.workorderItem.week = row.week
       this.workorderItem.date = row.date
     },
+    //todo 生成工单
+    generate_workorder() {
+      this.$modal
+        .confirm('是否确认重新生成工单')
+        .then(()=> {
+          if (this.search.year == undefined) {
+            this.$message.error('请选择年份');
+            return
+          }
+          if (this.search.week == undefined) {
+            this.$message.error('请选择周');
+            return
+          }
+          if (this.search.date == undefined) {
+            this.$message.error('请选择日期');
+            return
+          }
+
+          return GenerateWorkorder(this.search)
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            if (res.data>0) {
+              this.$notify.success('生成工单成功')
+              this.getList()
+            } else {
+              this.$notify.error('生成工单失败')
+            }
+          }
+        })
+        .catch(() => {})
+    },
   },
 }
 </script>
diff --git a/src/views/productManagement/workorder_online.vue b/src/views/productManagement/workorder_online.vue
index 73a0bac..25061fa 100644
--- a/src/views/productManagement/workorder_online.vue
+++ b/src/views/productManagement/workorder_online.vue
@@ -6,7 +6,7 @@
           <el-input v-model="search.year" placeholder="输入年份"></el-input>
         </el-form-item>
         <el-form-item label="周">
-          <el-input v-model="search.week" placeholder="输入周"></el-input>
+          <el-input-number v-model="search.week" :min="1" :max="100" label="输入周"></el-input-number>
         </el-form-item>
         <el-form-item label="日">
           <el-select v-model="search.date" placeholder="请选择日">
diff --git a/src/views/productManagement/workplan2.vue b/src/views/productManagement/workplan2.vue
index 58f6ee4..60c0960 100644
--- a/src/views/productManagement/workplan2.vue
+++ b/src/views/productManagement/workplan2.vue
@@ -6,7 +6,7 @@
           <el-input v-model="search.year" placeholder="输入年份"></el-input>
         </el-form-item>
         <el-form-item label="周">
-          <el-input v-model="search.week" placeholder="输入周"></el-input>
+          <el-input-number v-model="search.week" :min="1" :max="100" label="输入周"></el-input-number>
         </el-form-item>
         <el-form-item label="零件号">
           <el-input v-model="search.partnumber" placeholder="输入零件号"></el-input>