修改bug

src/lang/i18n/en/module/basicData.js

@@ -1,13 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:22:38
-=======
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:58:20
+ * @LastEditTime: 2022-03-15 10:17:01
->>>>>>> develop
  * @Description: file content
  */
 export default {

src/lang/i18n/zh/module/basicData.js

@@ -1,14 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:22:20
- * @Description: file content
-=======
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:58:12
+ * @LastEditTime: 2022-03-15 10:16:52
->>>>>>> develop
  */
 export default {
   visual: {

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-11 16:33:41
+ * @LastEditTime: 2022-03-15 11:03:18
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -117,26 +117,8 @@
                       )
                     "
                   >
-                    <div
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
-                      v-if="
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
                   </div>
                 </el-col>
               </el-row>
@@ -216,26 +198,8 @@
                       )
                     "
                   >
-                    <div
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
-                      v-if="
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
                   </div>
                 </el-col>
               </el-row>
@@ -283,26 +247,8 @@
                       )
                     "
                   >
-                    <div
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
-                      v-if="
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
-                        z.portList[
-                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
-                      "
-                      class="dashboard-layout-item-cricle"
-                      :style="{
-                        background:
-                          cassetteStatusObj[
-                            z.portList[
-                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                            ].cassetteList[0].status
-                          ]
-                      }"
-                    />
-                    {{
-                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
-                        .name
-                    }}
                   </div>
                 </el-col>
               </el-row>
@@ -353,13 +299,13 @@ export default {
         } else {
           this.typeVisible = true
           this.$nextTick(() => {
-            this.$refs.typeRef.init(item.id)
+            this.$refs.typeRef.init(item.id, item.name)
           })
         }
       }
     },
-    setStorageList(locationId, dataForm) {
+    setStorageList(locationId, locationName, dataForm) {
-      const obj = Object.assign({ locationId }, dataForm)
+      const obj = Object.assign({ locationId, locationName }, dataForm)
       this.selectStorageList.push(obj)
     },
     handleChange(v) {
@@ -367,7 +313,7 @@ export default {
     },
     submitLinkList() {
       const tipArr = this.selectStorageList.map(item => {
-        return item.locationId
+        return item.locationName
       })
       const obj = {
         id: this.id,

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-11 14:48:18
+ * @LastEditTime: 2022-03-15 11:02:46
  * @Description:
 -->
 <template>
@@ -49,6 +49,7 @@ export default {
     return {
       visible: false,
       locationId: '',
+      locationName: '',
       dataForm: {
         portAttrId: 1,
         storageId: ''
@@ -65,8 +66,9 @@ export default {
     }
   },
   methods: {
-    init(id) {
+    init(id, name) {
       this.locationId = id
+      this.locationName = name
       const listQuery = {
         current: 1,
         size: 999
@@ -78,6 +80,9 @@ export default {
           this.storageBoxArr.splice(0, this.list.length)
         }
       })
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+      })
       this.visible = true
     },
     // 表单提交
@@ -85,7 +90,7 @@ export default {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.visible = false
-          this.$emit('refreshDataList', this.locationId, this.dataForm)
+          this.$emit('refreshDataList', this.locationId, this.locationName, this.dataForm)
         }
       })
     }

src/views/orderManage/components/ExecutionInfoDetail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 09:05:38
+ * @LastEditTime: 2022-03-15 10:50:00
  * @Description:
 -->
 <template>
@@ -114,7 +114,7 @@
 </template>
 
 <script>
-import { ProcessInfoDetail } from '@/api/orderManage/00A'
+import { ExecutionInfoDetail } from '@/api/orderManage/00A'
 
 export default {
   data() {
@@ -146,7 +146,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
-          ProcessInfoDetail(this.dataForm.id).then(res => {
+          ExecutionInfoDetail(this.dataForm.id).then(res => {
             res.data.status = this.statusfilter('orderStatus', res.data.status)
             res.data.type = this.statusfilter('orderType', res.data.type)
             res.data.priority = this.statusfilter('priority', res.data.priority)