From 0adf1dad1e1f46c09d4513fb48612f421c5e0a58 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Thu, 10 Mar 2022 14:30:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/orderManage/00A.js                    | 10 ++++++-
 src/views/art/components/Process-add.vue      | 10 ++-----
 .../components/processStorageType.vue         | 19 ++++++++++--
 .../orderManage/components/processLinkBtn.vue | 29 +++++++++++--------
 4 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/api/orderManage/00A.js b/src/api/orderManage/00A.js
index 1c62726..a0c93df 100644
--- a/src/api/orderManage/00A.js
+++ b/src/api/orderManage/00A.js
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-01-17 14:55:09
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 14:59:07
+ * @LastEditTime: 2022-03-10 14:13:22
  * @Description:
  */
 
@@ -16,6 +16,14 @@ export function ProcessInfoList(data) { // 获取工单工艺列表
   })
 }
 
+export function ProcessInfoUpdata(data) { // 获取工单工艺列表
+  return request({
+    url: '/api/wms/work/order/update',
+    method: 'post',
+    data
+  })
+}
+
 export function ProcessInfoDetail(id) { // 获取工单工艺单条数据
   const data = {
     'id': id
diff --git a/src/views/art/components/Process-add.vue b/src/views/art/components/Process-add.vue
index 9683e14..dd281ce 100644
--- a/src/views/art/components/Process-add.vue
+++ b/src/views/art/components/Process-add.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:17:23
+ * @LastEditTime: 2022-03-09 16:53:23
  * @Description:
 -->
 <template>
@@ -24,7 +24,7 @@
           <el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
       </el-form-item> -->
-      <el-form-item :label="$t('module.art.processList.description')" prop="address">
+      <el-form-item :label="$t('module.art.processList.description')" prop="description">
         <el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.description')])" clearable />
       </el-form-item>
     </el-form>
@@ -88,10 +88,7 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           getInfo({ id: this.dataForm.id }).then(res => {
-            this.dataForm.id = res.data.id
-            this.dataForm.name = res.data.name
-            this.dataForm.type = res.data.type
-            this.dataForm.description = res.data.description
+            this.dataForm = res.data
             this.dataForm.equipmentIds = res.data.equipments.map(item => {
               return item.id
             })
@@ -101,7 +98,6 @@ export default {
     },
     // 表单提交
     dataFormSubmit() {
-      console.log(!this.dataForm.id)
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           const data = {
diff --git a/src/views/basicData/Warehouse/components/processStorageType.vue b/src/views/basicData/Warehouse/components/processStorageType.vue
index fc52776..a2a365a 100644
--- a/src/views/basicData/Warehouse/components/processStorageType.vue
+++ b/src/views/basicData/Warehouse/components/processStorageType.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 15:14:20
+ * @LastEditTime: 2022-03-10 14:27:47
  * @Description:
 -->
 <template>
@@ -14,6 +14,7 @@
       ref="dataForm"
       :model="dataForm"
       size="medium"
+      :rules="dataRule"
       label-width="110px"
       label-position="left"
     >
@@ -52,6 +53,14 @@ export default {
         storageType: 1,
         storageBoxName: ''
       },
+      dataRule: {
+        storageBoxName: [
+          {
+            required: true,
+            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.storageBox.name')]),
+            trigger: 'change' }
+        ]
+      },
       storageBoxArr: []
     }
   },
@@ -73,8 +82,12 @@ export default {
     },
     // 表单提交
     dataFormSubmit() {
-      this.visible = false
-      this.$emit('refreshDataList', this.storageId, this.dataForm)
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.visible = false
+          this.$emit('refreshDataList', this.storageId, this.dataForm)
+        }
+      })
     }
   }
 }
diff --git a/src/views/orderManage/components/processLinkBtn.vue b/src/views/orderManage/components/processLinkBtn.vue
index 36dc40f..6972940 100644
--- a/src/views/orderManage/components/processLinkBtn.vue
+++ b/src/views/orderManage/components/processLinkBtn.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-01-07 20:09:37
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 15:52:23
+ * @LastEditTime: 2022-03-10 14:25:50
  * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
  * @Description:
 -->
@@ -33,6 +33,7 @@
 
 <script>
 import { list } from '@/api/art-manage/art.js'
+import { ProcessInfoUpdata } from '@/api/orderManage/00A'
 export default {
   props: {
     injectData: {
@@ -43,14 +44,7 @@ export default {
   data() {
     return {
       visible: false,
-      options: [{
-        value: '选项1',
-        label: '工艺1'
-      }, {
-        value: '选项2',
-        label: '工艺2'
-      }
-      ],
+      options: [],
       value: ''
     }
   },
@@ -67,9 +61,20 @@ export default {
       })
     },
     emitClick() {
-      console.log(this.injectData)
-      console.log(this.value)
-      this.visible = false
+      const data = {
+        id: this.injectData.id,
+        subProcessId: this.value
+      }
+      ProcessInfoUpdata(data).then(res => {
+        this.$message({
+          message: this.$t('module.basicData.visual.success'),
+          type: 'success',
+          duration: 1500,
+          onClose: () => {
+            this.visible = false
+          }
+        })
+      })
     }
   }
 }