人工扫描托盘、查询任务号

src/config/getData2.js

@@ -122,3 +122,26 @@ export const produceTaskQueryInfo = () => post('api/pda/produceTask/queryInfo',
 export const produceTaskConfirm = (obj) => post('api/pda/produceTask/confirm', obj)
 // 1.3查询设备下拉框
 export const produceTaskQuerydevice = () => post('api/pda/produceTask/querydevice', {})
+
+/** 人工扫描托盘 */
+// 1.1查询任务
+// export const querytask = () => post('api/pda/group/querytask', {})
+export const querytask = () => {
+  let res = {
+    code: '1',
+    result: [{task_code: '001', start_point_code: '001111', next_point_code: 'ddffdf'}]
+  }
+  return res
+}
+// 1.2组盘确认
+// export const groupSubmit = (code, tcode) => post('api/pda/group/submit', {
+//   vehicle_code: code,
+//   task_code: tcode
+// })
+export const groupSubmit = (code, tcode) => {
+  let res = {
+    code: '1',
+    desc: 'ok'
+  }
+  return res
+}

src/pages/login/Home.vue

@@ -26,7 +26,8 @@
         <li @click="goInner('/BindPalletPoint')">托盘点位绑定</li>
         <li @click="goInner('/CheckManage')">盘点管理</li>
         <li @click="goInner('/ConveyorLine')">入窑输送线规则</li>
-        <li @click="goInner('/BindMaterPoint')">托盘物料绑定</li> -->
+        <li @click="goInner('/BindMaterPoint')">托盘物料绑定</li>
+        <li @click="goInner('/ManualScanPallet')">人工扫描托盘</li> -->
       </ul>
     </div>
   </section>
@@ -53,7 +54,7 @@ export default {
   methods: {
     toPage (e) {
       let name = e.path.substr(2)
-      if (name === 'CheckManage' || name === 'ConveyorLine' || name === 'BindMaterPoint' || name === 'SendMater') {
+      if (name === 'CheckManage' || name === 'ConveyorLine' || name === 'BindMaterPoint' || name === 'SendMater' || name === 'ManualScanPallet') {
         this.$store.dispatch('setKeepAlive', [name])
       }
       this.$router.push(e.path.substr(2))
@@ -74,7 +75,7 @@ export default {
     },
     goInner (path) {
       let name = path.substr(1)
-      if (name === 'CheckManage') {
+      if (name === 'CheckManage' || name === 'ConveyorLine' || name === 'BindMaterPoint' || name === 'SendMater' || name === 'ManualScanPallet') {
         this.$store.dispatch('setKeepAlive', [name])
       }
       this.$router.push(path)

src/pages/proj/ManualScanPallet.vue

@@ -0,0 +1,93 @@
+<template>
+  <section>
+    <nav-bar title="人工扫描托盘"></nav-bar>
+    <section class="content mgb110">
+      <div class="filter-wraper">
+        <search-box
+        label="托盘条码"
+        v-model="val1"
+        :seaShow="false"
+        ></search-box>
+        <div class="bottom-filter-tip">
+          <div class="fxcol fxrow relative">
+            <div class="filter-label txtjustify">任务号</div>
+            <div class="fxcol mgl20">
+              <input type="text" class="filter-input filter-scan-input" v-model="val2" disabled>
+            </div>
+          </div>
+          <div class="mgl20">
+            <button class="btn" @click="searchList">查询</button>
+          </div>
+        </div>
+      </div>
+    </section>
+    <section class="submit-bar">
+      <button class="btn submit-button" :class="{'btn-disabled' : val1 === '' || val2 === ''}" :disabled="disabled" @click="toSure">确定</button>
+      <button class="btn submit-button" @click="toCancle">取消</button>
+    </section>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar.vue'
+import SearchBox from '@components/SearchBox.vue'
+import {groupSubmit} from '@config/getData2.js'
+export default {
+  name: 'ManualScanPallet',
+  components: {
+    NavBar,
+    SearchBox
+  },
+  data () {
+    return {
+      val1: '',
+      val2: '',
+      result: {},
+      disabled: false
+    }
+  },
+  beforeRouteLeave (to, from, next) {
+    if (to.path === '/home' || to.path === '/login') {
+      this.$store.dispatch('setKeepAlive', [])
+    }
+    next()
+  },
+  activated () {
+    if (JSON.stringify(this.$store.getters.receiveMaterObj) !== '{}') {
+      this.val2 = this.$store.getters.receiveMaterObj.task_code
+    }
+  },
+  methods: {
+    /** 确认 */
+    async toSure () {
+      this.disabled = true
+      if (this.val1 === '' || this.val2 === '') {
+        this.disabled = false
+        return
+      }
+      try {
+        let res = await groupSubmit(this.val1, this.val2)
+        if (res.code === '1') {
+          this.toast(res.desc)
+          this.toCancle()
+        } else {
+          this.Dialog(res.desc)
+        }
+        this.disabled = false
+      } catch (e) {
+        this.disabled = false
+      }
+    },
+    /** 取消 */
+    toCancle () {
+      Object.assign(this.$data, this.$options.data())
+      this.$store.dispatch('receiveMaterObj', {})
+    },
+    searchList () {
+      this.$router.push({
+        path: '/SearchTaskNumber'
+      })
+    }
+  }
+}
+</script>

src/pages/proj/SearchTaskNumber.vue

@@ -0,0 +1,82 @@
+<template>
+  <section>
+    <nav-bar :inner="true" title="任务号查询"></nav-bar>
+    <section class="content mgt15 mgb110">
+      <div class="grid-wraper">
+        <div class="left_fixed">
+          <table class="layout-t left_layout_t">
+            <tr>
+              <th>任务号</th>
+            </tr>
+            <tr v-for="e in dataList" :key="e.task_code" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
+              <td>{{e.task_code}}</td>
+            </tr>
+          </table>
+        </div>
+        <div class="slide">
+          <table class="layout-t">
+            <tr>
+              <th>起点</th>
+              <th>终点</th>
+            </tr>
+            <tr v-for="e in dataList" :key="e.task_code" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
+              <td>{{e.start_point_code}}</td>
+              <td>{{e.next_point_code}}</td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </section>
+    <section class="submit-bar">
+      <button class="btn submit-button" :class="{'btn-disabled': pkId === ''}" @click="toSure">确认</button>
+      <button class="btn submit-button" @click="$router.back()">取消</button>
+    </section>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar.vue'
+import {querytask} from '@config/getData2.js'
+export default {
+  name: 'SearchTaskNumber',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      val1: '',
+      dataList: [],
+      pkId: '',
+      pkObj: {}
+    }
+  },
+  created () {
+    this._querytask()
+  },
+  methods: {
+    async _querytask () {
+      let res = await querytask()
+      if (res.code === '1') {
+        this.dataList = [...res.result]
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    toCheck (e) {
+      this.pkId = this.pkId !== e.task_code ? e.task_code : ''
+      this.pkObj = this.pkId !== e.task_code ? {} : e
+    },
+    toSure () {
+      if (this.pkId) {
+        this.$store.dispatch('receiveMaterObj', this.pkObj)
+        this.$router.push({
+          path: '/ManualScanPallet'
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+</style>

src/router/index.js

@@ -22,6 +22,8 @@ const BindMaterPoint = r => require.ensure([], () => r(require('../pages/proj/Bi
 const CYoutstore = r => require.ensure([], () => r(require('../pages/proj/CYoutstore')), 'CYoutstore')
 const PalletStatus = r => require.ensure([], () => r(require('../pages/proj/PalletStatus')), 'PalletStatus')
 const WorkorderDistribute = r => require.ensure([], () => r(require('../pages/proj/WorkorderDistribute')), 'WorkorderDistribute')
+const ManualScanPallet = r => require.ensure([], () => r(require('../pages/proj/ManualScanPallet')), 'ManualScanPallet')
+const SearchTaskNumber = r => require.ensure([], () => r(require('../pages/proj/SearchTaskNumber')), 'SearchTaskNumber')
 
 Vue.use(Router)
 
@@ -113,6 +115,14 @@ export default new Router({
     {
       path: '/WorkorderDistribute', // 工单下发
       component: WorkorderDistribute
+    },
+    {
+      path: '/ManualScanPallet', // 人工扫描托盘
+      component: ManualScanPallet
+    },
+    {
+      path: '/SearchTaskNumber', // 任务号查询
+      component: SearchTaskNumber
     }
   ],
   scrollBehavior (to, from, savedPosition) {