From efcbcea69c31c63c8b83c066a21a8f47fabee22d Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Mon, 22 Jan 2024 15:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E4=BD=93=E5=B7=A5=E7=A8=8B=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   |  29 ++-
 src/views/productManagement/workorder2.vue | 240 ++++++++++++++++++++-
 src/views/productManagement/workplan2.vue  |   7 +
 3 files changed, 264 insertions(+), 12 deletions(-)

diff --git a/src/api/productManagement/workoder_v2.js b/src/api/productManagement/workoder_v2.js
index 127d7ec..7878e25 100644
--- a/src/api/productManagement/workoder_v2.js
+++ b/src/api/productManagement/workoder_v2.js
@@ -21,6 +21,33 @@ export function deleteAllWorkorder(query) {
     url: '/mes/pro/workorder_v2/deleteAll',
     method: 'get',
     params: query,
-    
+  })
+}
+
+// 导出函数，添加新的工作计划
+export function addNewworkorder(data) {
+  return request({
+    url: '/mes/pro/workorder_v2/addworkorder',
+    method: 'post',
+    data: data,
+    contextType: 'application/json',
+  })
+}
+
+// 导出函数，删除工作计划
+export function deleteworkorder(id) {
+  return request({
+    url: '/mes/pro/workorder_v2/deleteitem/' + id,
+    method: 'get',
+  })
+}
+
+// 导出函数，更新工作计划
+export function updateworkorder(data) {
+  return request({
+    url: '/mes/pro/workorder_v2/updateworkorder',
+    method: 'post',
+    data: data,
+    contextType: 'application/json',
   })
 }
diff --git a/src/views/productManagement/workorder2.vue b/src/views/productManagement/workorder2.vue
index 2c59519..71b4a77 100644
--- a/src/views/productManagement/workorder2.vue
+++ b/src/views/productManagement/workorder2.vue
@@ -24,7 +24,7 @@
       </el-form>
 
       <el-row>
-        <el-col :span="1.5"> <el-button type="primary" size="mini">新建工单</el-button> </el-col>
+        <el-col :span="1.5"> <el-button type="primary" size="mini" @click="addworkorder">新建工单</el-button> </el-col>
         <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>
@@ -48,7 +48,7 @@
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip"><el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的生产计划</div>
+          <div class="el-upload__tip" slot="tip"><el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的生产工单</div>
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
         </div>
@@ -89,7 +89,6 @@
       :data="workorder_table_data"
     >
       <vxe-column type="seq" width="60"></vxe-column>
-      <vxe-column field="id" title="工单号"></vxe-column>
       <vxe-column field="blankNumber" title="毛坯号"></vxe-column>
       <vxe-column field="finishedPartNumber" title="成品零件号"></vxe-column>
       <vxe-column field="productDescription" title="产品描述"></vxe-column>
@@ -103,9 +102,9 @@
       <vxe-column field="remark1" title="备注1"></vxe-column>
       <vxe-column field="remark2" title="备注2"></vxe-column>
       <vxe-column title="操作" width="100" show-overflow>
-        <template #default>
-          <vxe-button size="mini" type="text" status="primary" content="修改"></vxe-button>
-          <vxe-button size="mini" type="text" status="danger" content="删除"></vxe-button>
+        <template #default="{ row }">
+          <vxe-button size="mini" type="text" status="primary" content="修改" @click="updateitem(row)"></vxe-button>
+          <vxe-button size="mini" type="text" status="danger" content="删除" @click="deleteitem(row)"></vxe-button>
         </template>
       </vxe-column>
     </vxe-table>
@@ -116,12 +115,96 @@
       :limit.sync="pagination.pageSize"
       @pagination="getList"
     />
+    <!-- 添加或修改生产工单对话框 -->
+    <el-dialog :title="dialog.title" :visible.sync="dialog.open" width="63%">
+      <el-form :model="workorderItem" :rules="rules" ref="workorder">
+        <el-row>
+          <el-col :span="8"
+            ><el-form-item label="毛坯号" prop="blankNumber">
+              <el-input v-model="workorderItem.blankNumber" placeholder="毛坯号"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="成品零件号" prop="finishedPartNumber">
+              <el-input v-model="workorderItem.finishedPartNumber" placeholder="毛坯号"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="产品描述" prop="productDescription">
+              <el-input v-model="workorderItem.productDescription" placeholder="产品描述"></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8"
+            ><el-form-item label="颜色" prop="colour"> <el-input v-model="workorderItem.colour" placeholder="颜色"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="规格" prop="specifications">
+              <el-input v-model="workorderItem.specifications" placeholder="规格"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="编码号" prop="codeNumber">
+              <el-input v-model="workorderItem.codeNumber" placeholder="编码号"></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8"
+            ><el-form-item label="车数" prop="vehicleNumber">
+              <el-input v-model="workorderItem.vehicleNumber" placeholder="毛坯号"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="挂具摆放数" prop="hangNumber">
+              <el-input v-model="workorderItem.hangNumber" placeholder="毛坯号"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="上件数" prop="previousNumber">
+              <el-input v-model="workorderItem.previousNumber" placeholder="产品描述"></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8"
+            ><el-form-item label="双组号缸号" prop="cylinderNumber">
+              <el-input v-model="workorderItem.cylinderNumber" placeholder="毛坯号"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="备注1" prop="remark1"> <el-input v-model="workorderItem.remark1" placeholder="毛坯号"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="备注2" prop="remark2"> <el-input v-model="workorderItem.remark2" placeholder="产品描述"></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8"
+            ><el-form-item label="年" prop="cylinderNumber"> <el-input v-model="workorderItem.year" placeholder="毛坯号"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="周" prop="remark1"> <el-input v-model="workorderItem.week" placeholder="毛坯号"></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="8"
+            ><el-form-item label="日" prop="remark2">
+              <el-select v-model="workorderItem.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-select> </el-form-item
+          ></el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getWorkoderList, dowmloadWorkorder,deleteAllWorkorder} from '@/api/productManagement/workoder_v2.js'
+import { getWorkoderList, dowmloadWorkorder, deleteAllWorkorder, addNewworkorder, deleteworkorder,updateworkorder} from '@/api/productManagement/workoder_v2.js'
 import { getToken } from '@/utils/auth'
+import { t } from 'vxe-table'
 export default {
   name: 'workorder2',
   data() {
@@ -136,6 +219,12 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      // 新增修改工单模态框
+      dialog: {
+        title: '',
+        open: false,
+        form: {},
+      },
       loading_1: true,
       workorder_table_data: [],
       upload: {
@@ -161,6 +250,27 @@ export default {
           week: 0,
         },
       },
+      // 新增或者修改表格
+      workorderItem: {
+        blankNumber: '',
+        finishedPartNumber: '',
+        productDescription: '',
+        colour: '',
+        specifications: '',
+        codeNumber: null,
+        vehicleNumber: null,
+        hangNumber: null,
+        previousNumber: null,
+        cylinderNumber: null,
+        remark1: '',
+        remark2: '',
+        year: new Date().getFullYear(),
+        week: null,
+        date: null,
+      },
+      rules: {
+        finishedPartNumber: [{ required: true, message: '成品零件号不能为空', trigger: 'blur' }],
+      },
     }
   },
   mounted() {
@@ -233,9 +343,9 @@ export default {
       this.download_.query.date = this.search.date
     },
 
-    //todo 删除本周计划
+    //todo 删除本周工单
     handleAllworkorder() {
-      if (this.search.week == undefined||this.search.date == undefined  ) {
+      if (this.search.week == undefined || this.search.date == undefined) {
         return
       }
       const query = {
@@ -245,14 +355,14 @@ export default {
       }
 
       this.$modal
-        .confirm('是否确认删除本周所有生产计划？')
+        .confirm('是否确认删除本周所有生产工单？')
         .then(function () {
           return deleteAllWorkorder(query)
           // return deleteworkplan(query)
         })
         .then((res) => {
           if (res.code == 200) {
-            if (res.data>1) {
+            if (res.data > 1) {
               this.$notify.success('删除成功')
               this.getList()
             } else {
@@ -263,6 +373,114 @@ export default {
         })
         .catch(() => {})
     },
+
+    //todo 新增生产工单
+    addworkorder() {
+      this.dialog.title = '新增生产工单'
+      this.dialog.open = true
+      this.flag = 'insert'
+      this.workorderItem.year = this.search.year
+      this.workorderItem.week = this.search.week
+      this.workorderItem.date = this.search.date
+    },
+    //todo 新增或者修改 提交按钮
+    submitForm() {
+      const query = { ...this.workorderItem }
+      ;(query.codeNumber = Number(query.codeNumber)),
+        (query.qualificationRate = Number(query.qualificationRate)),
+        (query.vehicleNumber = Number(query.vehicleNumber)),
+        (query.hangNumber = Number(query.hangNumber)),
+        (query.previousNumber = Number(query.previousNumber)),
+        (query.year = Number(query.year)),
+        (query.week = Number(query.week)),
+        (query.date = Number(query.date))
+
+      if (this.flag == 'insert') {
+        this.$refs['workorder'].validate((valid) => {
+          if (valid) {
+            addNewworkorder(query).then((res) => {
+              if (res.code == 200) {
+                this.$notify.success('新增成功')
+                this.getList()
+                this.dialog.open = false
+                // 清空表单
+                this.clearworkplanItem()
+              }
+            })
+          }
+        })
+      } else if (this.flag == 'update') {
+        this.$refs['workorder'].validate((valid) => {
+          if (valid) {
+            updateworkorder(query).then((res) => {
+              if (res.code == 200) {
+                this.$notify.success('修改成功')
+                this.getList()
+                this.dialog.open = false
+                // 清空表单
+                //this.resetForm('workplan')
+                this.clearworkplanItem()
+              }
+            })
+          }
+        })
+      }
+    },
+
+    //todo  清空表单
+    clearworkorderItem() {
+      Object.keys(this.workorderItem).forEach((key) => {
+        this.workorderItem[key] = null
+      })
+    },
+    //todo 返回
+    cancel() {
+      this.dialog.open = false
+      this.clearworkorderItem()
+    },
+
+    //todo 删除事件
+    deleteitem(row) {
+      this.$modal
+        .confirm('是否确认删除生产工单名称为' + row.productDescription + '"的数据项？')
+        .then(function () {
+          return deleteworkorder(row.id)
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            if (res.data == 1) {
+              this.$notify.success('删除成功')
+              this.getList()
+            } else {
+              this.$notify.error('删除失败')
+            }
+          }
+        })
+        .catch(() => {})
+    },
+
+    //todo 修改生产工单
+    updateitem(row) {
+      this.dialog.open = true
+      this.flag = 'update'
+      this.dialog.title = '修改生产工单'
+      this.workorderItem.id = row.id
+      this.workorderItem.blankNumber = row.blankNumber
+      this.workorderItem.finishedPartNumber = row.finishedPartNumber
+      this.workorderItem.productDescription = row.productDescription
+      this.workorderItem.colour = row.colour
+      this.workorderItem.specifications = row.specifications
+      this.workorderItem.codeNumber = row.codeNumber
+      this.workorderItem.vehicleNumber = row.vehicleNumber
+      this.workorderItem.hangNumber = row.hangNumber
+      this.workorderItem.previousNumber = row.previousNumber
+      this.workorderItem.cylinderNumber = row.cylinderNumber
+      this.workorderItem.remark1 = row.remark1
+      this.workorderItem.remark2 = row.remark2
+      this.workorderItem.year = row.year
+      this.workorderItem.week = row.week
+      this.workorderItem.date = row.date
+    },
   },
 }
 </script>
diff --git a/src/views/productManagement/workplan2.vue b/src/views/productManagement/workplan2.vue
index 57c53f3..5e80069 100644
--- a/src/views/productManagement/workplan2.vue
+++ b/src/views/productManagement/workplan2.vue
@@ -582,6 +582,13 @@ export default {
           }
         })
         .catch(() => {})
+    },
+
+        //todo   新增生产计划
+        addworkplan() {
+      this.dialog.title = '新增生产计划'
+      this.dialog.open = true
+      this.flag = 'insert'
     },
   },
 }