From 2756e75aafd50a0e35d51aacb1bcadc45597025f Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Wed, 16 Mar 2022 10:12:36 +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/lang/i18n/en/module/basicData.js          |  5 +-
 src/lang/i18n/zh/module/basicData.js          |  5 +-
 src/views/QualityManager/scrap/index.vue      |  3 +-
 src/views/basicData/Warehouse/CurrentTask.vue |  3 +-
 .../basicData/Warehouse/HistoricalTask.vue    |  3 +-
 .../Warehouse/ProcessStorageManagement.vue    |  3 +-
 .../basicData/Warehouse/StorageBoxInfo.vue    |  4 +-
 .../basicData/Warehouse/StorageBoxRack.vue    |  4 +-
 .../Warehouse/components/CurrentTask-add.vue  |  4 +-
 .../Warehouse/components/CurrentTaskInfo.vue  |  4 +-
 .../components/HistoricalTaskInfo.vue         |  5 +-
 .../ProcessStorageManagement-info.vue         |  7 +--
 .../components/StorageBoxRack-add.vue         |  6 +--
 .../components/processStorageLink.vue         | 52 +++++++++++--------
 .../components/processStorageType.vue         |  3 +-
 .../Warehouse/components/testdata.js          |  4 +-
 .../components/ExecutionInfoDetail.vue        |  5 +-
 .../components/ProcessInfoDetail.vue          |  5 +-
 .../orderManage/components/processLinkBtn.vue |  8 +--
 19 files changed, 68 insertions(+), 65 deletions(-)

diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js
index e8a59dc..eb84b4a 100644
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-15 18:33:48
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-16 10:10:59
  * @Description: file content
  */
 export default {
@@ -31,6 +31,7 @@ export default {
     Tips: 'Tips',
     TipsBefore: 'Are you sure you want to delete',
     TipsStorageBefore: 'Confirm to add location:',
+    PleaseAddLocationFirst: 'Please Add Location First!',
     Description: 'Description',
     Remarks: 'Remarks',
     Yes: 'Yes',
diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js
index 146e589..9e873f9 100644
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-15 18:33:48
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-16 10:10:43
  * @Description: file content
  */
 export default {
@@ -31,6 +31,7 @@ export default {
     Tips: '提示',
     TipsBefore: '确定删除',
     TipsStorageBefore: '确定添加库位:',
+    PleaseAddLocationFirst: '请先添加库位!',
     Description: '描述',
     Remarks: '备注',
     Or: '或',
diff --git a/src/views/QualityManager/scrap/index.vue b/src/views/QualityManager/scrap/index.vue
index 90f64af..6b90dea 100644
--- a/src/views/QualityManager/scrap/index.vue
+++ b/src/views/QualityManager/scrap/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 11:24:48
+ * @LastEditTime: 2022-03-16 09:54:40
  * @Description:
 -->
 <template>
@@ -11,7 +11,6 @@
       :model="formData"
       :inline="true"
       size="medium"
-      label-width="80px"
     >
       <el-form-item :label="$t('module.basicData.ScrapInfo.PlateId')" prop="substrateId">
         <el-input v-model="formData.substrateId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />
diff --git a/src/views/basicData/Warehouse/CurrentTask.vue b/src/views/basicData/Warehouse/CurrentTask.vue
index 4714f3c..20a2251 100644
--- a/src/views/basicData/Warehouse/CurrentTask.vue
+++ b/src/views/basicData/Warehouse/CurrentTask.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:35:17
+ * @LastEditTime: 2022-03-16 09:45:43
  * @Description:
 -->
 <template>
@@ -12,7 +12,6 @@
       :model="formData"
       :inline="true"
       size="medium"
-      label-width="100px"
     >
       <el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType">
         <el-select v-model="formData.taskType" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskType')])" clearable>
diff --git a/src/views/basicData/Warehouse/HistoricalTask.vue b/src/views/basicData/Warehouse/HistoricalTask.vue
index eb0026b..a68e39e 100644
--- a/src/views/basicData/Warehouse/HistoricalTask.vue
+++ b/src/views/basicData/Warehouse/HistoricalTask.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:37:13
+ * @LastEditTime: 2022-03-16 09:46:13
  * @Description:
 -->
 <template>
@@ -12,7 +12,6 @@
       :model="formData"
       :inline="true"
       size="medium"
-      label-width="100px"
     >
       <el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType">
         <el-select v-model="formData.taskType" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskType')])" clearable>
diff --git a/src/views/basicData/Warehouse/ProcessStorageManagement.vue b/src/views/basicData/Warehouse/ProcessStorageManagement.vue
index 24bd37a..7b15172 100644
--- a/src/views/basicData/Warehouse/ProcessStorageManagement.vue
+++ b/src/views/basicData/Warehouse/ProcessStorageManagement.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:35:21
+ * @LastEditTime: 2022-03-16 09:46:19
  * @Description:
 -->
 <template>
@@ -13,7 +13,6 @@
       :model="listQuery"
       :inline="true"
       size="medium"
-      label-width="100px"
     >
       <el-form-item :label="$t('module.art.processList.processName')" prop="key">
         <el-select
diff --git a/src/views/basicData/Warehouse/StorageBoxInfo.vue b/src/views/basicData/Warehouse/StorageBoxInfo.vue
index c4d6333..38396d7 100644
--- a/src/views/basicData/Warehouse/StorageBoxInfo.vue
+++ b/src/views/basicData/Warehouse/StorageBoxInfo.vue
@@ -2,12 +2,12 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 09:33:28
+ * @LastEditTime: 2022-03-16 09:45:26
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form ref="listQuery" :model="listQuery" :inline="true" label-width="120px" @keyup.enter.native="getList()">
+    <el-form ref="listQuery" :model="listQuery" :inline="true" @keyup.enter.native="getList()">
       <el-form-item :label="$t('module.basicData.Warehouse.StorageBoxNumber')" prop="code">
         <el-select
           v-model="listQuery.code"
diff --git a/src/views/basicData/Warehouse/StorageBoxRack.vue b/src/views/basicData/Warehouse/StorageBoxRack.vue
index 63c6095..0cc050d 100644
--- a/src/views/basicData/Warehouse/StorageBoxRack.vue
+++ b/src/views/basicData/Warehouse/StorageBoxRack.vue
@@ -2,12 +2,12 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 14:06:53
+ * @LastEditTime: 2022-03-16 09:46:26
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form ref="listQuery" :model="listQuery" :inline="true" label-width="120px" @keyup.enter.native="getList()">
+    <el-form ref="listQuery" :model="listQuery" :inline="true" @keyup.enter.native="getList()">
       <el-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
         <el-select
           v-model="listQuery.currLocationId"
diff --git a/src/views/basicData/Warehouse/components/CurrentTask-add.vue b/src/views/basicData/Warehouse/components/CurrentTask-add.vue
index 7eae90d..673a0ad 100644
--- a/src/views/basicData/Warehouse/components/CurrentTask-add.vue
+++ b/src/views/basicData/Warehouse/components/CurrentTask-add.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:55:22
+ * @LastEditTime: 2022-03-16 09:49:10
  * @Description:
 -->
 <template>
@@ -15,7 +15,7 @@
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="110px"
+        label-width="170px"
         label-position="left"
       >
         <el-col :span="12">
diff --git a/src/views/basicData/Warehouse/components/CurrentTaskInfo.vue b/src/views/basicData/Warehouse/components/CurrentTaskInfo.vue
index d5b9c5f..617913f 100644
--- a/src/views/basicData/Warehouse/components/CurrentTaskInfo.vue
+++ b/src/views/basicData/Warehouse/components/CurrentTaskInfo.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-14 15:55:39
+ * @LastEditTime: 2022-03-16 09:50:12
  * @Description:
 -->
 <template>
@@ -15,7 +15,7 @@
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="110px"
+        label-width="160px"
         label-position="left"
       >
         <el-col :span="8">
diff --git a/src/views/basicData/Warehouse/components/HistoricalTaskInfo.vue b/src/views/basicData/Warehouse/components/HistoricalTaskInfo.vue
index 8eaae5d..d89bf32 100644
--- a/src/views/basicData/Warehouse/components/HistoricalTaskInfo.vue
+++ b/src/views/basicData/Warehouse/components/HistoricalTaskInfo.vue
@@ -2,20 +2,21 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-01-13 16:22:39
+ * @LastEditTime: 2022-03-16 09:50:58
  * @Description:
 -->
 <template>
   <el-dialog
     :title="'btn.see' | i18nFilter"
     :visible.sync="visible"
+    width="60%"
   >
     <el-row :gutter="10">
       <el-form
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="110px"
+        label-width="170px"
         label-position="left"
       >
         <el-col :span="8">
diff --git a/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue b/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
index ed62891..dedf331 100644
--- a/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
+++ b/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 14:15:30
+ * @LastEditTime: 2022-03-16 09:52:07
  * @Description:
 -->
 <template>
@@ -65,11 +65,6 @@ const tableProps = [
     prop: 'name',
     label: i18n.t('module.basicData.cache.LocationName'),
     align: 'center'
-  },
-  {
-    prop: 'shelfName',
-    label: i18n.t('module.basicData.cache.locationType'),
-    align: 'center'
   }
 ]
 
diff --git a/src/views/basicData/Warehouse/components/StorageBoxRack-add.vue b/src/views/basicData/Warehouse/components/StorageBoxRack-add.vue
index 9dbb08f..a164734 100644
--- a/src/views/basicData/Warehouse/components/StorageBoxRack-add.vue
+++ b/src/views/basicData/Warehouse/components/StorageBoxRack-add.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 18:44:36
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-16 09:47:25
  * @Description:
 -->
 <template>
@@ -10,7 +10,7 @@
     :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
     :visible.sync="visible"
   >
-    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="120px" @keyup.enter.native="dataFormSubmit()">
+    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmit()">
       <el-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
         <el-select
           v-model="dataForm.currLocationId"
diff --git a/src/views/basicData/Warehouse/components/processStorageLink.vue b/src/views/basicData/Warehouse/components/processStorageLink.vue
index af03315..34a2fd4 100644
--- a/src/views/basicData/Warehouse/components/processStorageLink.vue
+++ b/src/views/basicData/Warehouse/components/processStorageLink.vue
@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 17:03:28
+ * @LastEditTime: 2022-03-16 10:11:10
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -302,29 +302,37 @@ export default {
       console.log(v)
     },
     submitLinkList() {
-      const tipArr = this.selectStorageList.map(item => {
-        return item.locationName
-      })
-      const obj = {
-        workSequenId: this.id,
-        processLocationStorageList: this.selectStorageList
-      }
-      this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
-        confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-        cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-        type: 'warning'
-      }).then(() => {
-        batchListAdd(obj).then(res => {
-          this.$message({
-            message: this.$t('module.basicData.visual.success'),
-            type: 'success',
-            duration: 1500,
-            onClose: () => {
-              this.selectStorageList.splice(0, this.selectStorageList.length)
-            }
+      if (this.selectStorageList.length) {
+        const tipArr = this.selectStorageList.map(item => {
+          return item.locationName
+        })
+        const obj = {
+          workSequenId: this.id,
+          processLocationStorageList: this.selectStorageList
+        }
+        this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
+          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
+          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
+          type: 'warning'
+        }).then(() => {
+          batchListAdd(obj).then(res => {
+            this.$message({
+              message: this.$t('module.basicData.visual.success'),
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.selectStorageList.splice(0, this.selectStorageList.length)
+              }
+            })
           })
+        }).catch(() => {})
+      } else {
+        this.$message({
+          message: this.$t('module.basicData.visual.PleaseAddLocationFirst'),
+          type: 'warning',
+          duration: 1500
         })
-      }).catch(() => {})
+      }
     },
     goback() {
       this.selectStorageList.splice(0, this.selectStorageList.length)
diff --git a/src/views/basicData/Warehouse/components/processStorageType.vue b/src/views/basicData/Warehouse/components/processStorageType.vue
index 4ec0f05..9e0fcdc 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-15 11:02:46
+ * @LastEditTime: 2022-03-16 09:47:01
  * @Description:
 -->
 <template>
@@ -15,7 +15,6 @@
       :model="dataForm"
       size="medium"
       :rules="dataRule"
-      label-width="110px"
       label-position="left"
     >
       <el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="portAttrId">
diff --git a/src/views/basicData/Warehouse/components/testdata.js b/src/views/basicData/Warehouse/components/testdata.js
index b31d5d0..2b9d359 100644
--- a/src/views/basicData/Warehouse/components/testdata.js
+++ b/src/views/basicData/Warehouse/components/testdata.js
@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 15:47:47
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 10:52:46
+ * @LastEditTime: 2022-03-16 09:43:36
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
  */
@@ -2605,7 +2605,7 @@ export default {
   selectStorageList: [],
   typeVisible: false,
   id: '',
-  bottomIndex: ['一', '二'],
+  bottomIndex: ['module.dashboard.first', 'module.dashboard.second'],
   current: 1,
   totalPage: 1
 }
diff --git a/src/views/orderManage/components/ExecutionInfoDetail.vue b/src/views/orderManage/components/ExecutionInfoDetail.vue
index cec2b37..734d0df 100644
--- a/src/views/orderManage/components/ExecutionInfoDetail.vue
+++ b/src/views/orderManage/components/ExecutionInfoDetail.vue
@@ -2,20 +2,21 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 10:50:00
+ * @LastEditTime: 2022-03-16 09:53:56
  * @Description:
 -->
 <template>
   <el-dialog
     :title="'btn.see' | i18nFilter"
     :visible.sync="visible"
+    width="70%"
   >
     <el-row :gutter="10">
       <el-form
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="110px"
+        label-width="180px"
         label-position="left"
       >
         <el-col :span="8">
diff --git a/src/views/orderManage/components/ProcessInfoDetail.vue b/src/views/orderManage/components/ProcessInfoDetail.vue
index c03e83c..2b0a242 100644
--- a/src/views/orderManage/components/ProcessInfoDetail.vue
+++ b/src/views/orderManage/components/ProcessInfoDetail.vue
@@ -2,20 +2,21 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:40:11
+ * @LastEditTime: 2022-03-16 09:53:00
  * @Description:
 -->
 <template>
   <el-dialog
     :title="'btn.see' | i18nFilter"
     :visible.sync="visible"
+    width="70%"
   >
     <el-row :gutter="10">
       <el-form
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="110px"
+        label-width="180px"
         label-position="left"
       >
         <el-col :span="8">
diff --git a/src/views/orderManage/components/processLinkBtn.vue b/src/views/orderManage/components/processLinkBtn.vue
index 6972940..0f3ff8a 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-10 14:25:50
+ * @LastEditTime: 2022-03-16 10:02:41
  * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
  * @Description:
 -->
@@ -13,7 +13,7 @@
       width="160"
     >
       <div>
-        <el-select v-model="value" placeholder="请选择">
+        <el-select v-model="value" :placeholder="$t('module.basicData.Warehouse.RelateProcess')">
           <el-option
             v-for="item in options"
             :key="item.id"
@@ -23,8 +23,8 @@
         </el-select>
       </div>
       <div style="text-align: right; margin: 0">
-        <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-        <el-button type="primary" size="mini" @click="emitClick">确定</el-button>
+        <el-button size="mini" type="text" @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
+        <el-button type="primary" size="mini" @click="emitClick">{{ 'btn.confirm' | i18nFilter }}</el-button>
       </div>
       <el-button slot="reference" type="text">{{ $t('module.basicData.Warehouse.RelateProcess') }}</el-button>
     </el-popover>