From dc235ae180771d5b12921e754a49c4e184fb7054 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Wed, 26 Jun 2024 17:21:52 +0800
Subject: [PATCH] no message

---
 src/api/asnDetail.js                             | 6 +++---
 src/views/business-data/asnDetail/index.vue      | 8 ++++----
 src/views/business-data/businessTask/agvTask.vue | 2 +-
 src/views/business-data/pickDetail/index.vue     | 6 +-----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/api/asnDetail.js b/src/api/asnDetail.js
index 2f93db4..0b2cb13 100644
--- a/src/api/asnDetail.js
+++ b/src/api/asnDetail.js
@@ -48,9 +48,9 @@ export function collectMOCreate(data) {
   })
 }
 
-export function doBindStock(data) {
+export function materialIn(data) {
   return request({
-    url: 'api/app/bindStock',
+    url: 'api/app/materialIn',
     method: 'post',
     data
   })
@@ -58,4 +58,4 @@ export function doBindStock(data) {
 
 
 
-export default { add, del,edit,doCheckAsn,collectMOCreate,updateContainer}
+export default { add, del,edit,doCheckAsn,collectMOCreate,materialIn}
diff --git a/src/views/business-data/asnDetail/index.vue b/src/views/business-data/asnDetail/index.vue
index 40a8196..cb05453 100644
--- a/src/views/business-data/asnDetail/index.vue
+++ b/src/views/business-data/asnDetail/index.vue
@@ -242,7 +242,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="doManLiaoCancel">取消</el-button>
-        <el-button type="primary" @click="submitBindStock">确认</el-button>
+        <el-button type="primary" @click="submitMaterialIn">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
@@ -289,7 +289,7 @@
 </template>
 
 <script>
-import crudAsnDetail, {add, updateContainer, doBindStock} from '@/api/asnDetail'
+import crudAsnDetail, {add, updateContainer, doBindStock, materialIn} from '@/api/asnDetail'
 import CRUD, {presenter, header, form, crud} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -589,12 +589,12 @@ export default {
       })
     },
 
-    submitBindStock() {
+    submitMaterialIn() {
       this.$refs['manLiaoform'].validate(valid => {
         if (!valid) {
           return
         }
-        doBindStock(this.BindStock).then(res => {
+        materialIn(this.BindStock).then(res => {
           if (res.status = 200) {
             this.manliao = false;//关闭窗口
             this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
diff --git a/src/views/business-data/businessTask/agvTask.vue b/src/views/business-data/businessTask/agvTask.vue
index 802a1ac..8125868 100644
--- a/src/views/business-data/businessTask/agvTask.vue
+++ b/src/views/business-data/businessTask/agvTask.vue
@@ -140,7 +140,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="jobPriority" label="优先级" width="60"/>
-        <el-table-column prop="jobMessage" label="返回报文" :show-overflow-tooltip="true" width="150"/>
+        <el-table-column prop="jobsage" label="返回报文" :show-overflow-tooltip="true" width="150"/>
         <el-table-column prop="createTime" label="创建时间" width="140"/>
         <el-table-column prop="startTime" label="开始时间" width="140"/>
         <el-table-column prop="endTime" label="完成时间" width="140"/>
diff --git a/src/views/business-data/pickDetail/index.vue b/src/views/business-data/pickDetail/index.vue
index 8d25263..f789161 100644
--- a/src/views/business-data/pickDetail/index.vue
+++ b/src/views/business-data/pickDetail/index.vue
@@ -120,11 +120,7 @@
             <div>{{ scope.row.item.name }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态">
-          <template slot-scope="scope">
-            {{ dict.label.pick_status[scope.row.status] }}
-          </template>
-        </el-table-column>
+
         <el-table-column prop="orderQty" label="订单数量"/>
         <el-table-column prop="allocatedQty" label="分配数量"/>
         <el-table-column prop="pickedQty" label="拣货数量"/>