From 7fa8853c2440ba415e19718ab640e455bfaf7c86 Mon Sep 17 00:00:00 2001
From: FOAM <491460741@qq.com>
Date: Tue, 21 Oct 2025 18:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8D=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base-data/point/index.vue               | 13 +++++++++++++
 src/views/business-inv/countMove/index.vue        | 15 ++++-----------
 .../countMove/showCountMoveDetail.vue             |  2 ++
 src/views/business-pick/pickDetail/index.vue      |  5 +----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 4fec6e7..ffb0248 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -45,6 +45,19 @@
           :show-file-list="true">
           <el-button size="mini" type="success"   v-permission="permission.import" icon="el-icon-upload">导入</el-button>
         </el-upload>
+        <el-upload
+          class="upload-demo"
+          ref="upload"
+          slot='right'
+          style="float: right;padding-left: 5px"
+          :action="baseApi+'/api/importData/importPointUpdate'"
+          :file-list="fileList"
+          :on-success=handleSuccess
+          :on-error="handleError"
+          :headers="headers"
+          :show-file-list="true">
+          <el-button size="mini" type="success"   v-permission="permission.import" icon="el-icon-upload">更新导入</el-button>
+        </el-upload>
         <el-button
           slot="right"
           class="filter-item"
diff --git a/src/views/business-inv/countMove/index.vue b/src/views/business-inv/countMove/index.vue
index 10493a6..bcdf672 100644
--- a/src/views/business-inv/countMove/index.vue
+++ b/src/views/business-inv/countMove/index.vue
@@ -43,16 +43,8 @@
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
           <el-form-item label="出库库区" prop="srcArea">
-            <!--            <el-input v-model="form.area" style="width: 370px;"/>-->
-            <el-select v-model="form.srcArea" prop="srcArea" value-key="id" style="width: 250px" clearable filterable>
-              <el-option
-
-                v-for="item in areaOptions"
-                :key="item.id"
-                :label="item.code"
-                :value="item"
-              />
-            </el-select>
+          <AreaSelect v-model="form.srcArea" prop="srcArea" value-key="id" style="width: 250px"   class="filter-item"   clearable filterable :bexb="null">
+          </AreaSelect>
           </el-form-item>
           <el-form-item label="目标库区" prop="dstArea">
             <!--            <el-input v-model="form.area" style="width: 370px;"/>-->
@@ -155,11 +147,12 @@ import pagination from '@crud/Pagination.vue'
 import {queryAreaList} from "@/api/area";
 import {queryPointList} from "@/api/point";
 import {generatePrepFlag} from "@/api/pickInstruction";
+import AreaSelect from "@/views/generic-component/AreaSelect.vue";
 
 const defaultForm = { id: null, code: null, name: null, srcArea: null, dstArea: null, dstPoint: null,  type: null,  remark: null, sourceName: null, sourceId: null,}
 export default {
   name: 'CountMove',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: {AreaSelect, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['count_status', 'count_type'],
   cruds() {
diff --git a/src/views/business-inv/countMove/showCountMoveDetail.vue b/src/views/business-inv/countMove/showCountMoveDetail.vue
index a6d2379..898b360 100644
--- a/src/views/business-inv/countMove/showCountMoveDetail.vue
+++ b/src/views/business-inv/countMove/showCountMoveDetail.vue
@@ -61,6 +61,8 @@
         <el-table-column :show-overflow-tooltip="true" prop="srcPoint.code" label="原库位"/>
         <el-table-column :show-overflow-tooltip="true" prop="dstPoint.code" label="目标库位"/>
         <el-table-column :show-overflow-tooltip="true" prop="itemKey.propC1" label="批次号"/>
+        <el-table-column :show-overflow-tooltip="true" prop="itemKey.propC2" label="税别"/>
+        <el-table-column :show-overflow-tooltip="true" prop="srcStockCode" label="箱单号"/>
       </el-table>
       <!--分页组件-->
       <pagination/>
diff --git a/src/views/business-pick/pickDetail/index.vue b/src/views/business-pick/pickDetail/index.vue
index d73b40d..1813589 100644
--- a/src/views/business-pick/pickDetail/index.vue
+++ b/src/views/business-pick/pickDetail/index.vue
@@ -128,9 +128,6 @@
         <el-table-column label="操作" width="150px" align="center">
 
           <template slot-scope="scope">
-            <el-button size="mini" :disabled="scope.row.status!='OPEN'" type="primary" icon="el-icon-edit"
-                       @click="editPick(scope.row)"
-            />
             <template>
               <el-popconfirm
                 title="确定删除吗？"
@@ -231,7 +228,7 @@ export default {
   cruds() {
     return CRUD({
       title: '制造叫料明细',
-      url: 'api/pickDetail/queryPickDetailZsc',
+      url: 'api/pickDetail/queryPickDetailZzjl',
       idField: 'id',
       sort: 'id,desc',
       crudMethod: { ...crudPickDetail },