新储位

src/components/WarehouseAreaSelect/index.vue

+<template>
+  <div>
+    <div class="area-code"></div>
+    <el-button type="primary" size="mini" @click="dialogVisible = true">选择</el-button>
+
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+      append-to-body
+      :before-close="handleClose">
+      <span>这是一段信息</span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "WarehouseAreaSelect",
+
+  props: {
+    input: {
+      type: Array,
+      default: () => []
+    }
+  },
+
+  data() {
+    return {
+      dialogVisible: false
+    }
+  },
+
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/layout/components/Navbar.vue

@@ -94,10 +94,10 @@ export default {
     }
   },
   created() {
-    this.updateMessage()
-    setInterval(() => {
-    this.updateMessage()
-    }, 10000)
+    // this.updateMessage()
+    // setInterval(() => {
+    // this.updateMessage()
+    // }, 10000)
   },
   components: {
     Breadcrumb,

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -171,6 +171,11 @@
                     </el-form-item>
                   </template>
                 </el-table-column>
+                <el-table-column :label="$t('储位')" prop="orderLocationBackVOList">
+                  <template v-slot="{ row, column, $index }">
+                    <warehouse-area-select v-model="column"></warehouse-area-select>
+                  </template>
+                </el-table-column>
               </el-table>
 
             </el-form>
@@ -378,6 +383,7 @@ import { getFeeTypeByOrderProduct, getProductBrankPage } from '@/api/ecw/product
 import WorkFlow from "@/components/WorkFlow"
 import ProductSelector from "@/components/ProductSelector"
 import {cancelProcessInstance} from "@/api/bpm/processInstance"
+import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
 
 export default {
   name: 'editDialog',
@@ -385,7 +391,8 @@ export default {
   components: {
     dictSelector,
     WorkFlow,
-    ProductSelector
+    ProductSelector,
+    WarehouseAreaSelect
   },
 
   props: {

src/views/ecw/order/warehousing/index.vue

@@ -153,7 +153,7 @@
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
                            :order-id="orderId" :warehouse-id="warehouseId" :is-editing="isEdit"></warehouse-area-dialog>
 
-    <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit" :is-jiyun="order.type.indexOf('1') !== -1"></edit-dialog>
+    <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit" :is-jiyun="order.type && order.type.indexOf('1') !== -1"></edit-dialog>
 
 <!--  完成入仓  -->
     <el-dialog