From 609e196f9bd2c0f2fca813f595bcaf62fcf24966 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Wed, 26 Feb 2025 15:17:54 +0800
Subject: [PATCH] no message

---
 src/views/business-data/pick/index.vue        | 45 +++++++++++--------
 .../business-data/pickDetail/pickTask.vue     | 39 ++++++++++++++--
 2 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index 9d3b080..d7a3198 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -66,7 +66,7 @@
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="85px">
 
           <el-form-item label="工单编码" prop="gdCode">
-            <el-select v-model="form.gdCode" @focus="getGd()" filterable clearable placeholder="请选择"
+            <el-select v-model="form.gdCode" disabled @focus="getGd()" filterable  placeholder="请选择"
                        style="width: 350px;"
                        class="filter-item"
             >
@@ -80,13 +80,13 @@
           </el-form-item>
 
           <el-form-item label="顺序号" prop="lineNo">
-            <el-input v-model="form.lineNo" style="width: 350px;" oninput="value=value.replace(/^0|[^0-9]/g,'')"
+            <el-input v-model="form.lineNo" disabled style="width: 350px;" oninput="value=value.replace(/^0|[^0-9]/g,'')"
                       min="1"
             />
           </el-form-item>
 
           <el-form-item label="状态" prop="status">
-            <el-select v-model="form.status" filterable placeholder="请选择" style="width: 350px;">
+            <el-select v-model="form.status" disabled filterable placeholder="请选择" style="width: 350px;">
               <el-option
                 v-for="item in dict.pick_status"
                 v-if="item.value==='OPEN'"
@@ -98,7 +98,7 @@
           </el-form-item>
 
           <el-form-item label="成品代码/单品代码" prop="cpCodeOrDpCode">
-            <el-select v-model="form.cpCodeOrDpCode" @focus="getItemAndBigItem()" filterable placeholder="请选择"
+            <el-select v-model="form.cpCodeOrDpCode" disabled @focus="getItemAndBigItem()" filterable placeholder="请选择"
                        style="width: 350px;"
             >
               <el-option
@@ -111,7 +111,11 @@
           </el-form-item>
 
           <el-form-item label="需求工位" prop="station">
-            <el-input v-model="form.station" style="width: 350px;"/>
+            <el-input v-model="form.station" disabled style="width: 350px;"/>
+          </el-form-item>
+
+          <el-form-item label="叫料点位" prop="callPoint">
+            <el-input v-model="form.callPoint" style="width: 350px;"/>
           </el-form-item>
 
         </el-form>
@@ -198,23 +202,28 @@
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="创建时间"/>
-<!--        <el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" align="center">
+        <el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" align="center">
           <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :show-dle="false"
+            />
 
-            <el-button
-              type="primary"
-              v-show="false"
-              icon="el-icon-s-promotion"
-              align="center"
-              size="mini"
-              @click="returnPick(scope.row)"
-            >
-              手工回传
-            </el-button>
+            <!--            <el-button
+                          type="primary"
+                          v-show="false"
+                          icon="el-icon-s-promotion"
+                          align="center"
+                          size="mini"
+                          @click="returnPick(scope.row)"
+                        >
+                          手工回传
+                        </el-button>-->
 
           </template>
 
-        </el-table-column>-->
+        </el-table-column>
 
       </el-table>
       <!--分页组件-->
@@ -249,7 +258,7 @@ const defaultForm = {
   code: null,
   lineNo: null,
   status: null,
-  beCall: null
+  callPoint: null
 }
 export default {
   name: 'Pick',
diff --git a/src/views/business-data/pickDetail/pickTask.vue b/src/views/business-data/pickDetail/pickTask.vue
index 8b3500f..dff65e3 100644
--- a/src/views/business-data/pickDetail/pickTask.vue
+++ b/src/views/business-data/pickDetail/pickTask.vue
@@ -59,6 +59,19 @@
                   class="filter-item" @keyup.enter.native="crud.toQuery"
         />
         <rrOperation :crud="crud"/>
+        <!--        重置-->
+        <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
+        </el-button>
+      </div>
+      <div class="statusButton" style="border-bottom: solid lightgray 1px;">
+        <el-radio-group v-model="radio3" @change="clickChange" size="small">
+          <el-radio-button label="全部"> 全部</el-radio-button>
+          <el-radio-button label="待执行">待执行</el-radio-button>
+          <el-radio-button label="已到站">已到站</el-radio-button>
+          <el-radio-button label="已完成">已完成</el-radio-button>
+        </el-radio-group>
+
+
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name">
@@ -221,7 +234,7 @@ export default {
   dicts: ['task_status'],
   cruds() {
     return CRUD({
-        query: {taskType: ['PICK']},
+        query: {taskType: 'PICK', taskStatus: 'ARRIVED'},
         title: '出库任务',
         url: 'api/task',
         idField: 'id',
@@ -231,7 +244,7 @@ export default {
           add: false,
           edit: false,
           del: false,
-          reset: true,
+          reset: false,
           download: true
         },
         queryOnPresenterCreated: true
@@ -240,6 +253,7 @@ export default {
   },
   data() {
     return {
+      radio3: '已到站',
       permission: {
         add: ['admin', 'task:add'],
         edit: ['admin', 'task:edit'],
@@ -320,7 +334,7 @@ export default {
       this.fbPickingForm.itemName = data.itemKey.item.name
       this.fbPickingForm.srcPointCode = data.srcPointCode
       this.fbPickingForm.dstPointCode = data.dstPointCode
-      this.fbPickingForm.planQty = data.planQty-data.moveQty
+      this.fbPickingForm.planQty = data.planQty - data.moveQty
       this.fbPickingForm.moveQty = data.planQty //默认拣货数量为计划数量
       this.fbPickingForm.srcOrderNumber = data.itemKey.orderNumber
       this.fbPickingDialog = true
@@ -350,6 +364,25 @@ export default {
         }
       })
     },
+    resetQuery() {
+      this.radio3 = '已到站';
+      this.crud.resetQuery()
+    },
+    clickChange(lab) {
+      if (lab === '全部') {
+        this.query.taskStatus = ''
+        this.crud.toQuery()
+      } else if (lab === '待执行') {
+        this.query.taskStatus = 'OPEN'
+        this.crud.toQuery()
+      } else if (lab === '已到站') {
+        this.query.taskStatus = 'ARRIVED'
+        this.crud.toQuery()
+      } else if (lab === '已完成') {
+        this.query.taskStatus = 'FINISH'
+        this.crud.toQuery()
+      }
+    }
   }
 }
 </script>