From 68b4f08c51df1cac8d92375bda4ad701919cef5e Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 5 Sep 2022 16:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData1.js         |  17 ++++--
 src/pages/login/Home.vue       |  10 +++-
 src/pages/proj/GroupPallet.vue |  72 ++++++++++++++++++++++
 src/pages/proj/SendMater.vue   | 105 +++++----------------------------
 src/router/index.js            |  52 ++++++++--------
 5 files changed, 138 insertions(+), 118 deletions(-)
 create mode 100644 src/pages/proj/GroupPallet.vue

diff --git a/src/config/getData1.js b/src/config/getData1.js
index a8e9a80..3efc4b3 100644
--- a/src/config/getData1.js
+++ b/src/config/getData1.js
@@ -3,33 +3,33 @@ import {post, post2} from '@config/http.js'
 
 // 指令管理
 // 1.1 查询未完成指令
-export const queryInstraction = (keyword, scode, ncode) => post2('api/ash/hand/insts', {
+export const queryInstraction = (keyword, scode, ncode) => post2('api/hand/insts', {
   keyword: keyword,
   start_devicecode: scode,
   next_devicecode: ncode
 })
 // 1.2 指令操作
-export const instOperation = (uuid, type) => post2('api/ash/hand/inst', {
+export const instOperation = (uuid, type) => post2('api/hand/inst', {
   inst_uuid: uuid,
   type: type
 })
 
 // 任务管理
 // 1.1 查询未完成指令
-export const queryTask = (keyword, scode, ncode) => post2('api/ash/hand/tasks', {
+export const queryTask = (keyword, scode, ncode) => post2('api/hand/tasks', {
   keyword: keyword,
   start_devicecode: scode,
   next_devicecode: ncode
 })
 // 1.2 指令操作
-export const taskOperation = (uuid, type) => post2('api/ash/hand/taskoperation', {
+export const taskOperation = (uuid, type) => post2('api/hand/taskoperation', {
   inst_uuid: uuid,
   type: type
 })
 
 // 送料
 // 1.1查询工序设备点位
-export const sendMaterialqueryDevice = () => post('api/pda/sendMaterial/queryDevice', {})
+export const sendMaterialqueryPoint = () => post('api/pda/sendMaterial/queryPoint', {})
 // 1.2压制叫料确定
 export const sendMaterialconfirm = (wid, did, pid, pcode, qty, vcode, isfull) => post('api/pda/sendMaterial/confirm', {
   workprocedure_id: wid,
@@ -66,3 +66,10 @@ export const sendEmptyconfirm = (pid, pcode, pname, vcode) => post('api/pda/send
   point_name: pname,
   vehicle_code: vcode
 })
+
+// 组盘-托盘数量绑定
+// 1.1托盘数量绑定确认
+export const emptyAndQtyconfirm = (vcode, qty) => post('api/pda/emptyAndQty/confirm', {
+  vehicle_code: vcode,
+  qty: qty
+})
diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue
index 4c8139b..08f33e5 100644
--- a/src/pages/login/Home.vue
+++ b/src/pages/login/Home.vue
@@ -15,7 +15,15 @@
     </section>
     <div class="con">
       <ul>
-        <li v-for="e in menuList" :key="e.menu_id" @click="toPage(e)">{{e.name}}</li>
+        <!-- <li v-for="e in menuList" :key="e.menu_id" @click="toPage(e)">{{e.name}}</li> -->
+        <li @click="goInner('/TaskManage')">任务管理</li>
+        <li @click="goInner('/ZlManage')">指令管理</li>
+        <li @click="goInner('/Password')">修改密码</li>
+        <li @click="goInner('/SendMater')">送料</li>
+        <li @click="goInner('/EquipCallMater')">叫料</li>
+        <li @click="goInner('/SendEmptyPallet')">送空托盘</li>
+        <li @click="goInner('/CallEmptyPallet')">呼叫空托盘</li>
+        <li @click="goInner('/GroupPallet')">组盘</li>
         <!-- <li @click="goInner('/TaskManage')">任务管理</li>
         <li @click="goInner('/ZlManage')">指令管理</li>
         <li @click="goInner('/Password')">修改密码</li>
diff --git a/src/pages/proj/GroupPallet.vue b/src/pages/proj/GroupPallet.vue
new file mode 100644
index 0000000..a245725
--- /dev/null
+++ b/src/pages/proj/GroupPallet.vue
@@ -0,0 +1,72 @@
+<template>
+  <section>
+    <nav-bar title="组盘"></nav-bar>
+    <section class="content mgt186">
+      <div class="filter-wraper">
+        <search-box
+        label="托盘"
+        v-model="val1"
+        :seaShow="false"
+        ></search-box>
+        <div class="bottom-filter-tip">
+          <div class="filter-label txtjustify">数量</div>
+          <div class="fxcol mgl20">
+            <input type="number" class="filter-input filter-scan-input" v-model="val2">
+          </div>
+        </div>
+      </div>
+    </section>
+    <section class="submit-bar">
+      <button class="btn submit-button" :class="{'btn-disabled' : val1 === '' || val2 === ''}" :disabled="disabled1" @click="_emptyAndQtyconfirm">确定</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 {emptyAndQtyconfirm} from '@config/getData1'
+export default {
+  name: 'GroupPallet',
+  components: {
+    NavBar,
+    SearchBox
+  },
+  data () {
+    return {
+      val1: '',
+      val2: '',
+      disabled1: false
+    }
+  },
+  methods: {
+    /** 确认 */
+    async _emptyAndQtyconfirm () {
+      this.disabled1 = true
+      if (this.val1 === '' || this.val2 === '') {
+        this.disabled1 = false
+        return
+      }
+      try {
+        let res = await emptyAndQtyconfirm(this.val1, this.val2)
+        if (res.code === '1') {
+          this.toast(res.desc)
+          this.toCancle()
+        } else {
+          this.Dialog(res.desc)
+        }
+        this.disabled1 = false
+      } catch (e) {
+        this.disabled1 = false
+      }
+    },
+    /** 取消 */
+    toCancle () {
+      this.val1 = ''
+      this.val2 = ''
+      this.disabled1 = false
+    }
+  }
+}
+</script>
diff --git a/src/pages/proj/SendMater.vue b/src/pages/proj/SendMater.vue
index 3d503aa..f8a7e59 100644
--- a/src/pages/proj/SendMater.vue
+++ b/src/pages/proj/SendMater.vue
@@ -3,18 +3,6 @@
     <nav-bar title="送料"></nav-bar>
     <section class="content mgt186">
       <div class="filter-wraper">
-        <div class="bottom-filter-tip">
-          <div class="filter-label txtjustify">工序</div>
-          <div class="fxcol mgl20 visible" >
-            <dropdown-menu
-            :option="option1"
-            :active="active1"
-            :open="open1"
-            @toggleItem="toggleItem1"
-            @dropdownMenu="dropdownMenu1">
-            </dropdown-menu>
-          </div>
-        </div>
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">设备</div>
           <div class="fxcol mgl20 visible" >
@@ -39,29 +27,6 @@
             </dropdown-menu>
           </div>
         </div>
-        <div class="bottom-filter-tip">
-          <div class="filter-label txtjustify">物料编码</div>
-          <div class="fxcol mgl20">
-            <input type="text" class="filter-input filter-scan-input" v-model="val3">
-          </div>
-        </div>
-        <search-box
-        label="托盘号"
-        v-model="val1"
-        :seaShow="false"
-        ></search-box>
-        <div class="bottom-filter-tip">
-          <div class="filter-label txtjustify">是否满托</div>
-          <div class="fxcol mgl20 visible" >
-            <dropdown-menu
-            :option="option4"
-            :active="active4"
-            :open="open4"
-            @toggleItem="toggleItem4"
-            @dropdownMenu="dropdownMenu4">
-            </dropdown-menu>
-          </div>
-        </div>
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">数量</div>
           <div class="fxcol mgl20">
@@ -71,7 +36,7 @@
       </div>
     </section>
     <section class="submit-bar">
-      <button class="btn submit-button" :class="{'btn-disabled' : val1 === '' || val2 === '' || active1 === '' || active2 === '' || active3 === '' || active4 === ''}" :disabled="disabled1" @click="_sendMaterialconfirm">确定</button>
+      <button class="btn submit-button" :class="{'btn-disabled' :val2 === '' || active1 === '' || active2 === '' || active3 === '' || active4 === ''}" :disabled="disabled1" @click="_sendMaterialconfirm">确定</button>
       <button class="btn submit-button" @click="toCancle">取消</button>
     </section>
   </section>
@@ -81,7 +46,7 @@
 import NavBar from '@components/NavBar.vue'
 import SearchBox from '@components/SearchBox.vue'
 import DropdownMenu from '@components/DropdownMenu.vue'
-import {sendMaterialqueryDevice, sendMaterialconfirm} from '@config/getData1'
+import {sendMaterialqueryPoint, sendMaterialconfirm} from '@config/getData1'
 export default {
   name: 'BindPalletPoint',
   components: {
@@ -91,42 +56,34 @@ export default {
   },
   data () {
     return {
-      val1: '',
       val2: '',
-      val3: '',
-      option1: [],
-      active1: '',
-      open1: false,
       option2: [],
       active2: '',
       open2: false,
       option3: [],
       active3: '',
       open3: false,
-      option4: [{value: '1', label: '是'}, {value: '2', label: '否'}],
-      active4: '',
-      open4: false,
       disabled1: false
     }
   },
   created () {
-    this._sendMaterialqueryDevice()
+    this._sendMaterialqueryPoint()
   },
   methods: {
     /** 查询点位 */
-    async _sendMaterialqueryDevice () {
-      let res = await sendMaterialqueryDevice()
+    async _sendMaterialqueryPoint () {
+      let res = await sendMaterialqueryPoint()
       if (res.code === '1') {
-        this.option1 = [...res.result.workprocedureja]
-        this.option1.map(el => {
-          this.$set(el, 'value', el.workprocedure_id)
-          this.$set(el, 'label', el.workprocedure_name)
-        })
-        // this.option2 = [...res.result.workprocedureja.deviceja]
-        // this.option2.map(el => {
-        //   this.$set(el, 'value', el.device_id)
-        //   this.$set(el, 'label', el.device_name)
+        // this.option1 = [...res.result.workprocedureja]
+        // this.option1.map(el => {
+        //   this.$set(el, 'value', el.workprocedure_id)
+        //   this.$set(el, 'label', el.workprocedure_name)
         // })
+        this.option2 = [...res.result.workprocedureja.deviceja]
+        this.option2.map(el => {
+          this.$set(el, 'value', el.device_id)
+          this.$set(el, 'label', el.device_name)
+        })
         // this.option3 = [...res.result.workprocedureja.deviceja.pointArr]
         // this.option3.map(el => {
         //   this.$set(el, 'value', el.point_id)
@@ -139,12 +96,12 @@ export default {
     /** 确认 */
     async _sendMaterialconfirm () {
       this.disabled1 = true
-      if (this.val1 === '' || this.val2 === '' || this.active1 === '' || this.active2 === '' || this.active3 === '' || this.active4 === '') {
+      if (this.val2 === '' || this.active2 === '' || this.active3 === '') {
         this.disabled1 = false
         return
       }
       try {
-        let res = await sendMaterialconfirm(this.option1[this.active1].value, this.option2[this.active2].value, this.option3[this.active3].value, this.option3[this.active3].point_code, this.val2, this.val1, this.option4[this.active4].value)
+        let res = await sendMaterialconfirm(this.option2[this.active2].value, this.option3[this.active3].value, this.option3[this.active3].point_code, this.val2)
         if (res.code === '1') {
           this.toast(res.desc)
           this.toCancle()
@@ -158,30 +115,11 @@ export default {
     },
     /** 取消 */
     toCancle () {
-      this.val1 = ''
       this.val2 = ''
-      this.active1 = ''
       this.active2 = ''
       this.active3 = ''
-      this.active4 = ''
       this.disabled1 = false
     },
-    toggleItem1 () {
-      if (!this.open1) {
-        this.open1 = true
-      } else {
-        this.open1 = false
-      }
-    },
-    dropdownMenu1 (i) {
-      this.active1 = i + ''
-      this.open1 = false
-      this.option2 = this.option1[this.active1].deviceja
-      this.option2.map(el => {
-        this.$set(el, 'value', el.device_id)
-        this.$set(el, 'label', el.device_name)
-      })
-    },
     toggleItem2 () {
       if (!this.open2) {
         this.open2 = true
@@ -208,17 +146,6 @@ export default {
     dropdownMenu3 (i) {
       this.active3 = i + ''
       this.open3 = false
-    },
-    toggleItem4 () {
-      if (!this.open4) {
-        this.open4 = true
-      } else {
-        this.open4 = false
-      }
-    },
-    dropdownMenu4 (i) {
-      this.active4 = i + ''
-      this.open4 = false
     }
   }
 }
diff --git a/src/router/index.js b/src/router/index.js
index 558655e..d7e1b01 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,11 +14,13 @@ const SendMater = r => require.ensure([], () => r(require('../pages/proj/SendMat
 const EquipCallMater = r => require.ensure([], () => r(require('../pages/proj/EquipCallMater')), 'EquipCallMater')
 const SendEmptyPallet = r => require.ensure([], () => r(require('../pages/proj/SendEmptyPallet')), 'SendEmptyPallet')
 const CallEmptyPallet = r => require.ensure([], () => r(require('../pages/proj/CallEmptyPallet')), 'CallEmptyPallet')
-const BindPalletPoint = r => require.ensure([], () => r(require('../pages/proj/BindPalletPoint')), 'BindPalletPoint')
-const CheckManage = r => require.ensure([], () => r(require('../pages/proj/CheckManage')), 'CheckManage')
-const SearchMater = r => require.ensure([], () => r(require('../pages/proj/SearchMater')), 'SearchMater')
-const ConveyorLine = r => require.ensure([], () => r(require('../pages/proj/ConveyorLine')), 'ConveyorLine')
-const BindMaterPoint = r => require.ensure([], () => r(require('../pages/proj/BindMaterPoint')), 'BindMaterPoint')
+const GroupPallet = r => require.ensure([], () => r(require('../pages/proj/GroupPallet')), 'GroupPallet')
+
+// const BindPalletPoint = r => require.ensure([], () => r(require('../pages/proj/BindPalletPoint')), 'BindPalletPoint')
+// const CheckManage = r => require.ensure([], () => r(require('../pages/proj/CheckManage')), 'CheckManage')
+// const SearchMater = r => require.ensure([], () => r(require('../pages/proj/SearchMater')), 'SearchMater')
+// const ConveyorLine = r => require.ensure([], () => r(require('../pages/proj/ConveyorLine')), 'ConveyorLine')
+// const BindMaterPoint = r => require.ensure([], () => r(require('../pages/proj/BindMaterPoint')), 'BindMaterPoint')
 
 Vue.use(Router)
 
@@ -80,25 +82,29 @@ export default new Router({
       component: CallEmptyPallet
     },
     {
-      path: '/BindPalletPoint', // 托盘点位绑定
-      component: BindPalletPoint
-    },
-    {
-      path: '/CheckManage', // 盘点管理
-      component: CheckManage
-    },
-    {
-      path: '/SearchMater', // 查找物料
-      component: SearchMater
-    },
-    {
-      path: '/ConveyorLine', // 入窑输送线规则
-      component: ConveyorLine
-    },
-    {
-      path: '/BindMaterPoint', // 托盘物料绑定
-      component: BindMaterPoint
+      path: '/GroupPallet', // 组盘
+      component: GroupPallet
     }
+    // {
+    //   path: '/BindPalletPoint', // 托盘点位绑定
+    //   component: BindPalletPoint
+    // },
+    // {
+    //   path: '/CheckManage', // 盘点管理
+    //   component: CheckManage
+    // },
+    // {
+    //   path: '/SearchMater', // 查找物料
+    //   component: SearchMater
+    // },
+    // {
+    //   path: '/ConveyorLine', // 入窑输送线规则
+    //   component: ConveyorLine
+    // },
+    // {
+    //   path: '/BindMaterPoint', // 托盘物料绑定
+    //   component: BindMaterPoint
+    // }
   ],
   scrollBehavior (to, from, savedPosition) {
     return { x: 0, y: 0 }