From 7be2ddee5df724279203ad3cb079f79c01ae3750 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 1 Aug 2023 10:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=BB=E5=AD=97=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js                        |  4 ++--
 .../lettering/lettering-machine-select.vue    |  4 ++--
 .../modules/lettering/lettering-task-list.vue | 21 +++++++++++++------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 9a94937..e24b687 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -393,8 +393,8 @@ export const kzDeviceList = () => post('api/produceWorkorder', {
 // 1.3确认上料
 export const kzSubmitkz = (arr) => post('api/pda/kz/submitkz', arr)
 // 1.1任务列表
-export const KzTasks = () => post('api/pda/kz/kzTasks', {
-  product_area: 'A1'
+export const KzTasks = (area) => post('api/pda/kz/kzTasks', {
+  product_area: area
 })
 // export const KzTasks = () => {
 //   let res = {
diff --git a/src/pages/modules/lettering/lettering-machine-select.vue b/src/pages/modules/lettering/lettering-machine-select.vue
index cad3d75..61a1a2b 100644
--- a/src/pages/modules/lettering/lettering-machine-select.vue
+++ b/src/pages/modules/lettering/lettering-machine-select.vue
@@ -20,7 +20,7 @@
                         <input type="number" class="filter-input" v-model="$route.query.weight" disabled>
                     </div>
                 </div>
-                <div class="search-item flex-end">
+                <div class="search-item_3 flex-end">
                     <button class="button button--primary" :class="{'button--defalut': dataList.length === 0}" @click="distribute">平均分配</button>
                     <button class="button button--primary" :class="{'button--defalut': dataList.length === 0}" @click="toCancle">取消分配</button>
                     <button class="button button--primary" :disabled="disabled1" :class="{'button--defalut': checkArr.length === 0}" @click="_kzSubmitkz">刻字机选择</button>
@@ -117,7 +117,7 @@ export default {
       }
       let total = 0
       let flag = false
-      this.dataList.map(el => {
+      this.checkArr.map(el => {
         total = accAdd(total, el.weight)
         if (el.weight === '') {
           flag = true
diff --git a/src/pages/modules/lettering/lettering-task-list.vue b/src/pages/modules/lettering/lettering-task-list.vue
index 7cf5944..9764f53 100644
--- a/src/pages/modules/lettering/lettering-task-list.vue
+++ b/src/pages/modules/lettering/lettering-task-list.vue
@@ -5,7 +5,7 @@
                 <div class="search-item">
                     <div class="search-label">车间</div>
                     <div class="filter_input_wraper">
-                        <el-select v-model="value1" filterable clearable placeholder="请选择" disabled>
+                        <el-select v-model="value1" filterable clearable placeholder="请选择">
                             <el-option
                               v-for="item in options1"
                               :key="item.value"
@@ -58,12 +58,12 @@
 </template>
 
 <script>
-import {KzTasks, operation} from '@config/getData2.js'
+import {dictAll, KzTasks, operation} from '@config/getData2.js'
 export default {
   data () {
     return {
-      options1: [{value: 'A1', label: 'A1'}],
-      value1: 'A1',
+      options1: [],
+      value1: '',
       dataList: [],
       pkId: '',
       pkObj: {},
@@ -72,12 +72,21 @@ export default {
     }
   },
   created () {
-    this._KzTasks()
+    this._dictAll()
   },
   methods: {
+    // 车间下拉框
+    async _dictAll () {
+      let res = await dictAll()
+      if (res.code === 200) {
+        this.options1 = [...res.content]
+        this.value1 = this.options1[0].value
+        this._KzTasks()
+      }
+    },
     // grid
     async _KzTasks () {
-      let res = await KzTasks()
+      let res = await KzTasks(this.value1)
       if (res.code === 200) {
         this.pkId = ''
         this.pkObj = {}