From 78ac83961e2c943399751295bc0c647b9146c695 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 19 Jun 2024 13:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=BB=84=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js          |  14 ++++
 src/images/xinrui/menu/FR13.png | Bin 0 -> 3239 bytes
 src/main.js                     |   3 +-
 src/pages/login/Home.vue        |   3 +-
 src/pages/proj/ManualGroup.vue  | 136 ++++++++++++++++++++++++++++++++
 src/router/index.js             |   5 ++
 6 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 src/images/xinrui/menu/FR13.png
 create mode 100644 src/pages/proj/ManualGroup.vue

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 643448f..cb84892 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -192,3 +192,17 @@ export const createP2PTask = (scode, ecode) => post('api/pda/createP2PTask', {
   start_point_code: scode,
   end_point_code: ecode
 })
+
+/**
+ * 人工组盘
+ */
+// 点位下拉框
+export const getAllYZList = () => post('api/pda/getAllYZList', {})
+// 人工组盘
+export const pdaToGroup = (code, vcode, qty, weight, is) => post('api/pda/pdaToGroup', {
+  point_code: code,
+  vehicle_code: vcode,
+  qty: qty,
+  weight: weight,
+  is_full: is
+})
diff --git a/src/images/xinrui/menu/FR13.png b/src/images/xinrui/menu/FR13.png
new file mode 100644
index 0000000000000000000000000000000000000000..972a4920c553af88167556f4f3050860baf61319
GIT binary patch
literal 3239
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

literal 0
HcmV?d00001

diff --git a/src/main.js b/src/main.js
index 46d8f57..0fb4fbf 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,7 +14,7 @@ import { Dialog, toast } from '@config/mUtils.js'
 import filter from '@config/filter.js'
 import { baseUrl } from '@config/env.js'
 // import Vconsole from 'vconsole'
-import { Select, Option, RadioGroup, Radio } from 'element-ui'
+import { Select, Option, RadioGroup, Radio, Switch } from 'element-ui'
 import JSEncrypt from 'jsencrypt'
 
 Vue.prototype._ = _
@@ -34,6 +34,7 @@ Vue.use(Select)
 Vue.use(Option)
 Vue.use(RadioGroup)
 Vue.use(Radio)
+Vue.use(Switch)
 // let VConsole = new Vconsole()
 // Vue.use(VConsole)
 Vue.config.productionTip = false
diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue
index c72be07..f49a92f 100644
--- a/src/pages/login/Home.vue
+++ b/src/pages/login/Home.vue
@@ -69,7 +69,8 @@ export default {
             {sec_menu_id: 2, path: '/PointManage', title: '窑前货架', query: 'YQHJ'},
             {sec_menu_id: 3, path: '/PointManage', title: '窑后货架', query: 'YHHJ'}
           ]},
-        {menu_id: 12, path: '/CallCarry', title: '呼叫搬运', icon: 'FR12', sonTree: []}
+        {menu_id: 12, path: '/CallCarry', title: '呼叫搬运', icon: 'FR12', sonTree: []},
+        {menu_id: 13, path: '/ManualGroup', title: '人工组盘', icon: 'FR13', sonTree: []}
       ],
       show: false,
       secM: []
diff --git a/src/pages/proj/ManualGroup.vue b/src/pages/proj/ManualGroup.vue
new file mode 100644
index 0000000..de126ef
--- /dev/null
+++ b/src/pages/proj/ManualGroup.vue
@@ -0,0 +1,136 @@
+<template>
+  <section>
+    <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="option"
+            :active="active"
+            :open="open"
+            @toggleItem="toggleItem"
+            @dropdownMenu="dropdownMenu">
+            </dropdown-menu>
+          </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">
+            <input class="filter-input filter-scan-input" type="number" v-model="val2">
+          </div>
+        </div>
+        <div class="bottom-filter-tip">
+          <div class="filter-label txtjustify">物料重量</div>
+          <div class="fxcol mgl20">
+            <input class="filter-input filter-scan-input" type="number" v-model="val3">
+          </div>
+        </div>
+        <div class="bottom-filter-tip">
+          <div class="filter-label txtjustify">是否满垛</div>
+          <div class="fxcol mgl20">
+            <el-switch
+              v-model="val4"
+              active-color="#e74f1a"
+              inactive-color="#c9c9c9">
+            </el-switch>
+          </div>
+        </div>
+      </div>
+    </section>
+    <section class="submit-bar">
+      <button class="btn submit-button" :class="{'btn-disabled' : active === '' || val1 === '' || val2 === '' || val3 === ''}" :disabled="disabled" @click="_pdaToGroup">确定</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 DropdownMenu from '@components/DropdownMenu.vue'
+import {getAllYZList, pdaToGroup} from '@config/getData2'
+export default {
+  components: {
+    NavBar,
+    DropdownMenu,
+    SearchBox
+  },
+  data () {
+    return {
+      option: [],
+      active: '',
+      open: false,
+      val1: '',
+      val2: null,
+      val3: null,
+      val4: false,
+      disabled: false
+    }
+  },
+  created () {
+    this._getAllYZList()
+  },
+  methods: {
+    /** 查询点位 */
+    async _getAllYZList () {
+      let res = await getAllYZList()
+      if (res.code === '1') {
+        this.option = [...res.result]
+        this.option.map(el => {
+          this.$set(el, 'value', el.point_code)
+          this.$set(el, 'label', el.point_name)
+        })
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    toggleItem () {
+      if (!this.open) {
+        this.open = true
+      } else {
+        this.open = false
+      }
+    },
+    dropdownMenu (i) {
+      this.active = i + ''
+      this.open = false
+    },
+    /** 确认 */
+    async _pdaToGroup () {
+      this.disabled = true
+      if (this.val1 === '' || this.val2 === '' || this.val3 === '' || this.active === '') {
+        this.disabled = false
+        return
+      }
+      try {
+        let res = await pdaToGroup(this.option[this.active].value, this.val1, this.val2, this.val3, this.val4 ? '1' : '0')
+        if (res.code === '1') {
+          this.toast(res.desc)
+          this.toCancle()
+        } else {
+          this.Dialog(res.desc)
+        }
+        this.disabled = false
+      } catch (e) {
+        this.disabled = false
+      }
+    },
+    /** 取消 */
+    toCancle () {
+      this.active = ''
+      this.val1 = ''
+      this.val2 = ''
+      this.val3 = ''
+      this.val4 = false
+      this.disabled = false
+    }
+  }
+}
+</script>
diff --git a/src/router/index.js b/src/router/index.js
index 2b1f3ec..43953f5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,6 +21,7 @@ const CreateChargingTask = r => require.ensure([], () => r(require('../pages/pro
 const ManualUnstack = r => require.ensure([], () => r(require('../pages/proj/ManualUnstack')), 'ManualUnstack')
 const PointManage = r => require.ensure([], () => r(require('../pages/proj/PointManage')), 'PointManage')
 const CallCarry = r => require.ensure([], () => r(require('../pages/proj/CallCarry')), 'CallCarry')
+const ManualGroup = r => require.ensure([], () => r(require('../pages/proj/ManualGroup')), 'ManualGroup')
 
 Vue.use(Router)
 
@@ -112,6 +113,10 @@ export default new Router({
     {
       path: '/CallCarry', // 呼叫搬运
       component: CallCarry
+    },
+    {
+      path: '/ManualGroup', // 人工组盘
+      component: ManualGroup
     }
   ],
   scrollBehavior (to, from, savedPosition) {