no message

src/api/kmres.js

@@ -8,4 +8,13 @@ export function missionStateCallback(data) {
   })
 }
 
-export default { missionStateCallback }
+export function containerSynchronized(data) {
+  return request({
+    url: 'interfaces/api/amr/containerSynchronized',
+    method: 'post',
+    data
+  })
+}
+
+
+export default {missionStateCallback, containerSynchronized}

src/views/base-data/point/index.vue

@@ -33,6 +33,7 @@
         <el-select v-model="query.areaName"
                    style="width: 185px;"
                    clearable
+                   filterable
                    placeholder="请选择"
                    @keyup.enter.native="crud.toQuery"
                    class="filter-item"
@@ -46,6 +47,18 @@
           />
         </el-select>
 
+        <label class="el-form-item-label">是否启用</label>
+        <el-select v-model="query.enabled" clearable placeholder="请选择" style="width: 185px;" class="filter-item"
+                   @keyup.enter.native="crud.toQuery"
+        >
+          <el-option
+            v-for="baseStatus in dict.base_staus"
+            :key="baseStatus.id"
+            :label="baseStatus.label"
+            :value="baseStatus.value"
+          />
+        </el-select>
+
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->

src/views/base-data/stock/index.vue

@@ -47,8 +47,14 @@
         </el-select>
 
         <label class="el-form-item-label">库区</label>
-        <el-select v-model="query.areaName" style="width: 130px;" clearable placeholder="库区"
+        <el-select v-model="query.areaName"
-                   @keyup.enter.native="crud.toQuery" class="filter-item" @change="crud.toQuery"
+                   style="width: 185px;"
+                   clearable
+                   filterable
+                   placeholder="请选择"
+                   @keyup.enter.native="crud.toQuery"
+                   class="filter-item"
+                   @change="getArea()"
         >
           <el-option
             v-for="area in areas"
@@ -59,10 +65,22 @@
         </el-select>
 
         <label class="el-form-item-label">点位</label>
-        <el-input v-model="query.pointCode" clearable placeholder="点位" style="width: 130px;" class="filter-item"
+        <el-input v-model="query.pointCode" clearable placeholder="点位" style="width: 185px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"
         />
 
+        <label class="el-form-item-label">是否启用</label>
+        <el-select v-model="query.enabled" clearable placeholder="请选择" style="width: 185px;" class="filter-item"
+                   @keyup.enter.native="crud.toQuery"
+        >
+          <el-option
+            v-for="baseStatus in dict.base_staus"
+            :key="baseStatus.id"
+            :label="baseStatus.label"
+            :value="baseStatus.value"
+          />
+        </el-select>
+
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -82,8 +100,46 @@
           <el-button size="mini" type="success" icon="el-icon-upload2">导入</el-button>
         </el-upload>
 
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :loading="crud.delAllLoading"
+          @click="containerSynchronizedDialog=true"
+        >
+          同步AGV容器
+        </el-button>
+
+
       </crudOperation>
 
+      <!--   同步AGV容器弹窗   -->
+      <el-dialog title="同步AGV容器" :visible.sync="containerSynchronizedDialog" width="400px">
+        <el-form ref="containerSynchronizedForm" :model="containerSynchronizedForm" :rules="rules" size="small"
+                 label-width="80px">
+          <el-form-item label="库区" prop="areaCode" :rules="[{ required: true, message: '库区不能为空'}]">
+            <el-select v-model="containerSynchronizedForm.areaCode" value-key="id" filterable placeholder="请选择库区"
+                       style="width: 200px;">
+              <el-option
+                v-for="item in areaCodes"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+                <span style="float: left">{{ item.label }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="containerSynchronizedDialog= false">取 消</el-button>
+          <el-button type="primary" @click="containerSynchronized()">确 定</el-button>
+        </div>
+      </el-dialog>
+
 
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
@@ -225,6 +281,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import {getToken} from '@/utils/auth'
 import {mapGetters} from 'vuex'
+import crudKmres from "@/api/kmres";
 
 const defaultForm = {
   id: null,
@@ -277,7 +334,17 @@ export default {
   },
   data() {
     return {
-      //地标点数据
+      containerSynchronizedDialog: false,//同步AGV容器弹窗控制
+      containerSynchronizedForm: {
+        areaCode: null
+      },
+      areaCodes: [{
+        value: 'CPSXX-CX',
+        label: '成品库区'
+      }, {
+        value: 'DJBY-CX',
+        label: '大件库区'
+      }],
       fileList: [],
       areas: [],
       points: [],
@@ -340,7 +407,7 @@ export default {
       })
     },
     getArea() {
-      crudArea.queryAreaAll({enabled: true}).then(res => {
+      crudArea.queryAreaAll({}).then(res => {
         this.areas = res
       })
     },
@@ -351,6 +418,27 @@ export default {
     },
     filterTag(value, row) {
       return row.status === value
+    },
+    containerSynchronized() {
+      this.$refs['containerSynchronizedForm'].validate((valid) => {
+        if (valid) {
+          console.log(this.containerSynchronizedForm)
+          crudKmres.containerSynchronized({
+            areaCode: this.containerSynchronizedForm.areaCode
+          }).then(res => {
+            if (res.status == 200) {
+              this.containerSynchronizedDialog = false
+              this.crud.notify('同步成功!', CRUD.NOTIFICATION_TYPE.SUCCESS)
+              this.crud.toQuery()
+              this.containerSynchronizedForm = {areaCode: null}
+            } else {
+              this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR)
+            }
+          })
+        } else {
+          return false
+        }
+      })
     }
   }
 }

src/views/business-data/pick/index.vue

@@ -189,7 +189,6 @@
         </el-table-column>
         <el-table-column prop="cpCodeOrDpCode" label="成品代码/单品代码"/>
         <el-table-column prop="station" label="需求工位"/>
-        <el-table-column prop="point.code" label="翻包点位"/>
         <el-table-column prop="callPoint" label="叫料点位"/>
         <el-table-column prop="orderType" label="单据类型"/>
         <el-table-column prop="sourceId" label="回传状态">