diff --git a/src/api/distribution/createTask.js b/src/api/distribution/createTask.js
index 5b79b70e..cc41a6a7 100644
--- a/src/api/distribution/createTask.js
+++ b/src/api/distribution/createTask.js
@@ -74,7 +74,14 @@ export const $_getDetailInfo = params => {
   });
 };
 
-
+// 查询货位信息
+export const $_getList = ( params) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsAllocation/list',
+    method: 'get',
+    params
+  })
+}
 
 /**
  * 盘点状态修改
@@ -181,8 +188,15 @@ export const $_taskQuestSelectStrip = params => {
     params,
   });
 };
-
-
+// 盘点导出
+export const $_exportGetContrastInfo = params => {
+  return request({
+    url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/export-getContrastInfo',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};
 
 
 // 盘点任务库存品
diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js
index 6833da4b..1a0a751d 100644
--- a/src/option/basicdata/basicdataGoodsAllocation.js
+++ b/src/option/basicdata/basicdataGoodsAllocation.js
@@ -200,8 +200,8 @@ export default {
       ],
     },
     {
-      label: '所在列',
-      prop: 'columnNum',
+      label: '所在层',
+      prop: 'layerNum',
       type: 'input',
       align: 'center',
       labelWidth: '100',
@@ -213,8 +213,8 @@ export default {
       width: 'fit-content',
     },
     {
-      label: '所在层',
-      prop: 'layerNum',
+      label: '所在列',
+      prop: 'columnNum',
       type: 'input',
       align: 'center',
       labelWidth: '100',
diff --git a/src/router/views/index.js b/src/router/views/index.js
index c4f8c8d6..de4a7f77 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1114,18 +1114,9 @@ export default [
       },
     ],
   },
-  {
-    path: '/aftersales/AbnormalworkOrder',
-    component: Layout,
-    redirect: '/aftersales/AbnormalworkOrder',
-    children: [
-      {
-        path: '/aftersales/AbnormalworkOrder',
-        name: '异常工单',
-        component: () => import('@/views/aftersales/abnormalworkOrder.vue'),
-      },
-    ],
-  },
+
+
+
   // 下面的代码为 商场客户端的页面
 
   {
@@ -1141,30 +1132,18 @@ export default [
     ],
   },
 
-  {
-    path: '/distribution/checkInventoryTask/createTaskTemp',
-    component: Layout,
-    redirect: '/distribution/checkInventoryTask/createTaskTemp',
-    children: [
-      {
-        path: '/distribution/checkInventoryTask/createTaskTemp',
-        name: '盘点重构',
-        component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'),
-      },
-    ],
-  },
-  // {
-  //   path: '/distribution/checkInventoryTask/createTaskTemp',
-  //   component: Layout,
-  //   redirect: '/distribution/checkInventoryTask/createTaskTemp',
-  //   children: [
-  //     {
-  //       path: '/distribution/checkInventoryTask/createTaskTemp',
-  //       name: '盘点重构',
-  //       component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'),
-  //     },
-  //   ],
-  // },
+{
+  path: '/aftersales/VueTemp',
+  component: Layout,
+  redirect: '/aftersales/VueTemp',
+  children: [
+    {
+      path: '/aftersales/VueTemp',
+      name: '工单',
+      component: () => import('@/views/aftersales/VueTemp.vue'),
+    },
+  ],
+},
 
   // {
   //   path: '/distribution/turndelivery/devtmp',
diff --git a/src/views/aftersales/VueTemp.vue b/src/views/aftersales/VueTemp.vue
new file mode 100644
index 00000000..7ee43309
--- /dev/null
+++ b/src/views/aftersales/VueTemp.vue
@@ -0,0 +1,249 @@
+<template>
+  <el-card class="box-card">
+    <el-table
+        v-loading="loading"
+        element-loading-text="数据正在更新中..."
+        :data="ElData"
+        border
+        style="width: 100%"
+        ref="tableRef"
+        @select-all="selectAll"
+        @select="selectChange"
+      >
+        <el-table-column type="selection" width="55" fixed />
+        <el-table-column type="index" fixed width="50" height="100" label="#" align="center" />
+
+        <!-- 
+            Type ===1 普通文本
+            Type ===2 图片显示
+            Type ===3 操作功能
+            label:    标题
+            width:    宽度
+            prop:     数据字段
+           -->
+
+        <el-table-column
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          :fixed="item.fixed"
+          align="center"
+          v-for="(item, index) in ElmenuData"
+          :key="item.label"
+        >
+          <el-table-column
+            :prop="item.prop"
+            :label="item.label"
+            :width="item.width"
+            :fixed="item.fixed"
+            align="center"
+          >
+          <!-- 头部搜索 -->
+            <template #header>
+              <el-input
+                clearable
+                v-if="item.type == 4"
+                v-model="item.values"
+                :placeholder="`请输入${item.label}`"
+              />
+            </template>
+            <!-- 内容主体 -->
+            <template #default="props">
+              <span v-if="4">{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
+              <div :class="ElBtnClass" v-if="item.type == 3">
+                <el-button
+                  :link="ElButtonS[0].link"
+                  :class="ElButtonS[0].class"
+                  :auto-insert-space="ElButtonS[0].space"
+                  :size="ElButtonS[0].size"
+                  :icon="ElButtonS[0].icon"
+                  @click="ViewEvent(props.row)"
+                  >明细</el-button
+                >
+              </div>     
+            
+            </template>
+          </el-table-column>
+        </el-table-column>
+
+      </el-table>
+  </el-card>
+</template>
+
+<script setup>
+// 按钮配置
+const ElButtonS = ref([
+  // 1.link    切换按钮样式(文本模式-false ,按钮模式-tre)
+  // 2.class   按钮样式名(用于切换按钮样式)
+  // 3.space   是否开启按钮文子直接间距(true开启 ,false关闭)
+  // 4.size    按钮尺寸默认小尺寸('large'| 'default'| 'small')
+  // 5.icon    按钮图标
+  // 6.table   按钮名称
+  {
+    link: false,
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'el-icon-view',
+    table: '详情',
+  },
+  {
+    link: false,
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'el-icon-view',
+    table: '延期',
+  },
+  {
+    link: false,
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'el-icon-view',
+    table: '编辑',
+  },
+  {
+    link: false,
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'el-icon-view',
+    table: '对比数据',
+  },
+]);
+
+
+
+
+
+const ElData=ref([
+    {
+        name:'产品名称1',
+        currentUsageWarehouse:'北京仓库1'
+    },
+    {
+        name:'产品名称2',
+        currentUsageWarehouse:'北京仓库2'
+    }
+])
+const ElmenuData = ref([
+  {
+    prop: 'name',
+    label: '异常类型',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'currentUsageWarehouse',
+    label: '发现节点',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'model',
+    label: '异常工单',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'purchaseAmount',
+    label: '运单号',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'state',
+    label: '订单自编号',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'user',
+    label: '车次号',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'deviceSerialNumber',
+    label: '一级品',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'userPosition',
+    label: '二级品',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'isDeposit',
+    label: '车辆线路',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 10,
+    values: '',
+    width: '280',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+]);
+
+
+
+</script>
+
+<style scoped lang='scss'>
+
+</style>
\ No newline at end of file
diff --git a/src/views/aftersales/abnormalworkOrder.vue b/src/views/aftersales/abnormalworkOrder.vue
deleted file mode 100644
index 4f3123dd..00000000
--- a/src/views/aftersales/abnormalworkOrder.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-  <el-tabs type="border-card" class="demo-tabs">
-    <el-tab-pane v-for="item in Tabs" :key="item.name">
-      <template #label>
-        <span class="custom-tabs-label">
-          <el-icon><component :is="item.icon" /></el-icon>
-          <span>{{ item.label }}</span>
-        </span>
-      </template>
-      <!-- 顶部搜索框 -->
-      <el-form :inline="true" :model="formInput" class="demo-form-inline">
-        <el-form-item label="Approved by">
-          <el-input v-model="formInput.user" placeholder="Approved by" clearable />
-        </el-form-item>
-        <el-form-item label="Activity zone">
-          <el-select v-model="formInput.region" placeholder="Activity zone" clearable>
-            <el-option label="Zone one" value="shanghai" />
-            <el-option label="Zone two" value="beijing" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="Activity time">
-          <el-date-picker
-            v-model="formInput.date"
-            type="date"
-            placeholder="Pick a date"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSubmit">Query</el-button>
-        </el-form-item>
-      </el-form>
-    </el-tab-pane>
-  </el-tabs>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted, computed, watch } from 'vue';
-// 标题栏
-const Tabs = ref([
-  { label: '处理中', name: 0, icon: 'Monitor' },
-  { label: '理赔金额未出', name: 1, icon: 'Coin' },
-  { label: '处理完毕', name: 2, icon: 'Check' },
-  { label: '完结', name: 3, icon: 'Reading' },
-  { label: '仲裁中', name: 4, icon: 'List' },
-  { label: '全部', name: 5, icon: 'Notification' },
-]);
-// 搜索框
-const formInput = ref({}); //搜索框
-</script>
-
-<style lang="scss" scoped>
-.custom-tabs-label {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  i {
-    margin-right: 6px;
-  }
-}
-</style>
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 02ddb149..f82c04df 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -586,4 +586,10 @@ export default {
     margin-right: 0;
   }
 }
+:deep(.el-card){
+height: 100%;
+.el-card__body{
+  height: 100%;
+}
+}
 </style>
diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index 390b0af5..3ab59402 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -128,6 +128,13 @@
                   >对比数据</el-button
                 >
               </div>
+              <div v-if="item.type == 5 && item.prop == 'questNum'">
+                {{
+                props.row[item.prop] ? props.row[item.prop] : '/'
+              }}
+                <span class="el-exDc" @click="ExportDC(props.row)">导出</span>
+                
+              </div>
               <span v-if="item.type == 7">{{
                 props.row[item.prop] == 1 ? '全部' : props.row[item.prop] == 2 ? '全仓' : '/'
               }}</span>
@@ -166,7 +173,7 @@
     </div>
     <!-- 弹窗详情 -->
 
-    <el-dialog v-model="PopupDetails" title="盘点数据" width="70%" :before-close="handleClose">
+    <el-dialog v-model="PopupDetails" :title="!InventoryState?'盘点数据':'未盘点数据'" width="80%" :before-close="handleClose" :fullscreen="fullScreen">
       <div style="margin-bottom: 10px">
         <div style="display: flex">
           <!-- v-if="TcMInventoryStatus" -->
@@ -181,6 +188,11 @@
             <!-- v-if="NotCounted" -->
             <el-button type="primary" @click="NotInventoried">盘点</el-button>
           </div>
+
+          <div class="fullScreen" @click="BtnfullScreen"> 
+            <el-icon><FullScreen /></el-icon>
+          </div>
+
         </div>
       </div>
       <!-- 表格开始 -->
@@ -250,7 +262,7 @@
               </el-select>
             </template>
             <template #default="props">
-              <span v-if="item.type == 6 && item.prop == 'questStatus'">
+           <span v-if="item.type == 6 && item.prop == 'questStatus'">
                 {{
                   props.row[item.prop] == 0
                     ? '待盘点'
@@ -278,7 +290,6 @@
 
               <span v-if="item.type == 10">
                 <el-input
-                  @change="InputSo(item)"
                   clearable
                   :disabled="props.row.Checkbox"
                   v-model="props.row[item.prop]"
@@ -423,8 +434,19 @@
             </el-checkbox-group>
           </el-form-item>
 
-          <el-form-item label="新的货位:">
-            <el-input v-model="WrapBarEditing.groundingPositionCode" placeholder="请输入" />
+       
+
+          <el-form-item label="新的货位">
+            <el-select-v2
+            v-model="WrapBarEditing.groundingPositionCode"
+            style="width:240px"
+            filterable
+            remote
+            :remote-method="remoteMethod"
+            clearable
+            :options="optionss"
+            placeholder="请输入货位"
+          />
           </el-form-item>
         </el-form>
 
@@ -492,7 +514,6 @@
       v-model="InventoryPopup"
       title="创建盘点任务"
       width="30%"
-      :before-close="InventoryPopupClose"
     >
       <el-form :model="formInventory" label-width="120px">
         <el-form-item label="商场名称">
@@ -532,7 +553,7 @@
         </el-form-item>
       </el-form>
       <template #footer>
-        <span class="dialog-footer">
+        <span class="dialog-footer">  
           <el-button @click="InventoryPopup = false">取消</el-button>
           <el-button type="primary" @click="InventorySubmit"> 提交 </el-button>
         </span>
@@ -557,7 +578,7 @@
     <!-- 对比信息弹窗 -->
     <el-dialog v-model="dialogcontrast" title="对比信息" width="70%">
       <div class="dbExPo">
-        <!-- <el-button type="primary" @click="MXexport">导出</el-button> -->
+        <el-button type="primary" @click="MXexport">导出</el-button>
       </div>
       <!-- 表格开始 -->
       <el-table
@@ -641,6 +662,8 @@ import {
   $_materialList,
   $_submit,
   $_questDetailIds,
+  $_exportGetContrastInfo,
+  $_getList,
 } from '@/api/distribution/createTask';
 import { ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
@@ -682,7 +705,7 @@ const NotCounted = ref(false); //为盘点信息
 const UncheckedRow = ref({}); //未盘点当前行存储数据
 const InventoryStatus = ref(false); //盘点中的状态修改
 const InventoryInput = ref(null); //用来存储盘点状态定制品选怎的第几个input
-// const InventoryData=ref([]);//盘带状态修改保存的数据
+const InventoryState=ref(false);//盘带状态修改保存的数据
 const TcMInventoryStatus = ref(true); //盘点弹窗按钮权限控制
 const TcStatusModification = ref(false); //表示当前在修改状态
 const TcStateSwitching = ref(false); //默认表示定制品状态
@@ -692,6 +715,8 @@ const TcReaJoin = ref([]); //零担库存品状态10，20，30...
 const TcDataaddition = ref(false); //数据新增弹唱
 const Fromnewlyadded = ref({}); //数据新增
 const Statusjudgment = ref(false); //新增按钮
+const DbEx=ref(null);//对比明细导出
+const fullScreen=ref(false);//是否全屏
 const radioList = ref([
   { label: 0, txt: '在库', input: 'stockNum', disabled: true },
   { label: 1, txt: '破损', input: 'wornNum', disabled: true },
@@ -752,6 +777,17 @@ const menuData = ref([
     search: true,
     head: true,
   },
+  {
+    prop: 'marketName',
+    label: '收货单位',
+    type: 4,
+    values: '',
+    width: '250',
+    checkarr: [],
+    fixed: false,
+    search: true,
+    head: true,
+  },
   {
     prop: 'brandName',
     label: '品牌名称',
@@ -822,28 +858,29 @@ const menuData = ref([
 
 // 弹窗盘点
 const InventoryDetails = ref([
-  {
-    prop: 'orderPackageCode',
-    label: '包条',
+{
+    prop: 'orderCode',
+    label: '订单自编号',
     type: 5,
     values: '',
     width: '260',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     search: true,
     head: true,
   },
   {
-    prop: 'orderCode',
-    label: '订单自编号',
+    prop: 'orderPackageCode',
+    label: '包条',
     type: 5,
     values: '',
     width: '260',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     search: true,
     head: true,
   },
+
   {
     prop: 'questTarget',
     label: '品类',
@@ -899,6 +936,17 @@ const InventoryDetails = ref([
   {
     prop: 'positionCode',
     label: '货位',
+    type: 5,
+    values: '',
+    width: '260',
+    checkarr: [],
+    fixed: false,
+    search: true,
+    head: true,
+  },
+  {
+    prop: 'materialName',
+    label: '物料名称',
     type: 4,
     values: '',
     width: '260',
@@ -918,7 +966,39 @@ const InventoryDetails = ref([
     search: true,
     head: true,
   },
-
+  {
+    prop: 'trayName',
+    label: '托盘名称',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
+  {
+    prop: 'updateUser',
+    label: '盘点人',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
+  {
+    prop: 'updateTime',
+    label: '盘点时间',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
   {
     prop: 'firsts',
     label: '一级品类',
@@ -952,7 +1032,17 @@ const InventoryDetails = ref([
     search: true,
     head: true,
   },
-
+  {
+    prop: 'brandName',
+    label: '品牌',
+    type: 4,
+    values: '',
+    width: '250',
+    checkarr: [],
+    fixed: false,
+    search: true,
+    head: true,
+  },
   {
     prop: 'categoryName',
     label: '产品名称',
@@ -996,7 +1086,18 @@ const contrast = ref([
     values: '',
     width: '260',
     checkarr: [],
-    fixed: false,
+    fixed: true,
+    search: true,
+    head: true,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '包条',
+    type: 5,
+    values: '',
+    width: '260',
+    checkarr: [],
+    fixed: true,
     search: true,
     head: true,
   },
@@ -1154,6 +1255,17 @@ const contrast = ref([
     search: false,
     head: true,
   },
+  {
+    prop: 'trayName',
+    label: '托盘名称',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
   {
     prop: 'groundingPositionCode',
     label: '新货位',
@@ -1243,7 +1355,10 @@ const IndexPd=(val)=>{
     }
   });
 }
-
+// 弹窗全屏
+const BtnfullScreen=()=>{
+  fullScreen.value=!fullScreen.value;
+}
 
 function onLoad() {
   getDictionaryBiz('logpm_unit').then(res => {
@@ -1327,6 +1442,7 @@ const InputSo = val => {
         });
       }
     });
+   
     return;
   }
   if (val.prop == 'materialCode') {
@@ -1378,14 +1494,29 @@ const InputSo = val => {
 const TcAddData = () => {
   TcDataaddition.value = true; //新增弹窗显示
 };
-// 对比明细导出
-const MXexport = () => {
+// 对比数据导出公共函数
+const DbExTc=(data)=>{
+  $_exportGetContrastInfo({
+    id:data.id,
+    questNum:data.questNum
+  }).then(res=>{
+    console.log(res,'导出');
+    downloadXls(res.data,  `${data.questNum}对比明细.xlsx`)
+  })
+}
+// 盘点对比导出
+const ExportDC = (val) => {
   // 触发下载函数
-  downloadXls(url, '滞留运单.xlsx');
-
-  // 释放临时 URL
-  // URL.revokeObjectURL(url);
+console.log(val);
+DbExTc(val)
 };
+// 对比数据导出
+const MXexport=()=>{
+  // 触发下载函数
+DbExTc(DbEx.value)
+}
+
+
 // 新增任务按钮(搜索不到出现此按钮)
 const TcDataadditionsubmit = () => {
   console.log(Fromnewlyadded.value);
@@ -1523,6 +1654,7 @@ const comparativeData = val => {
   dialogcontrast.value = true; //显示对比数据表格
   contrastloading.value = true; //开启表格加载
   console.log(val, '对比数据当前行');
+  DbEx.value=val;//存储当前行数据用于导出
   let data = {};
   data.questNum = val.questNum;
   data.questId = val.id;
@@ -1537,7 +1669,7 @@ const searchReset = () => {
   SoInfoData.value = {};
 };
 
-const TcViewEvent = val => {
+const TcViewEvent = (val,Inso) => {
   Statusjudgment.value = false; //关闭新增按钮
   TcPdloading.value = true;
   console.log(val, '要传递的对象');
@@ -1546,6 +1678,7 @@ const TcViewEvent = val => {
     questId: val.id,
     current: TccurrentPage.value, //页码
     size: TcpageSize.value, //条数
+    ...Inso
   };
   console.log(data, '要提交的数据');
 
@@ -1561,6 +1694,10 @@ const TcViewEvent = val => {
 };
 // 点击详情按钮
 const ViewEvent = val => {
+  InventoryDetails.value.forEach(item=>{
+    item.values=null
+  })
+  InventoryState.value=false;//修改标题（盘点数据）
   TccurrentPage.value = 1; //重置页码
   NotCounted.value = false; //关闭未盘点
   row.value = val;
@@ -1576,7 +1713,7 @@ const ViewEvent = val => {
 };
 
 // 未盘点数据请求
-const NotCountedFn = row => {
+const NotCountedFn = (row,Inso) => {
   TcPdloading.value = true;
   $_getDetailInfo({
     questStatus: 0,
@@ -1584,6 +1721,7 @@ const NotCountedFn = row => {
     questId: row.id,
     current: TccurrentPage.value, //页码
     size: TcpageSize.value, //条数
+    ...Inso
   }).then(res => {
     TcPdloading.value = false;
     console.log(res, '未盘点明细返回值');
@@ -1597,14 +1735,20 @@ const NotCountedFn = row => {
 
 // 未盘点明细
 const DetailsNotCounted = row => {
+  InventoryDetails.value.forEach(item=>{
+    item.values=null
+  })
+
+  InventoryState.value=true;//修改弹窗标题（未盘点数据），
+  TcFrom.value={};//重置搜索
   TccurrentPage.value = 1; //重置页码
   UncheckedRow.value = row; //存储当前点击行的数据
-  console.log(row.value, '点击盘点了');
-
+  console.log(row.value,'存储好的数据');
   NotCounted.value = true; //展开未盘点
   TcPdloading.value = true;
   PopupDetails.value = true;
-  NotCountedFn(UncheckedRow.value);
+  NotCountedFn(row);
+  row.value = row;
 };
 // 未盘点转已盘点按钮
 const NotInventoried = val => {
@@ -1623,7 +1767,7 @@ const NotInventoried = val => {
       id: item.id,
       questStatus: (item.questStatus = 1),
       questId: item.questId,
-      questNum: UncheckedRow.value.questNum,
+      questNum:UncheckedRow.value.questNum,
     });
   });
   console.log(data, '未盘点处理好的值');
@@ -1848,6 +1992,19 @@ const StatusDetermination = () => {
   }
 };
 
+
+const optionss = ref([])
+const loadings = ref(false)
+const list =  ref([])
+const remoteMethod = (query) => {
+  if (query !== '') {
+      optionss.value = list.value.filter((item) => {
+        return item.label.toLowerCase().includes(query.toLowerCase())
+      })
+  } else {
+    optionss.value = []
+  }
+}
 // 多选数据状态处理
 const Tclist = val => {
   console.log(val);
@@ -1865,6 +2022,22 @@ const Tclist = val => {
 };
 // 盘点详情编辑
 const InventoryEditing = val => {
+  $_getList({
+    current: 1, //页码
+    size: 10000, //条数
+    warehouseId:val.warehouseId,
+  }).then(res=>{
+    console.log(res);
+    
+    if(res.data.data.records){
+  list.value=   res.data.data.records.map((item) => {  
+  return { value:`${item.id}`, label: `${item.qrCode}` }
+})
+console.log(list.value);
+    }
+  })
+
+
   counting.value = {}; //重置数据值对象
   WrapBarEditing.value.radio = null;
   readList.value = [];
@@ -1898,10 +2071,11 @@ const InventoryEditing = val => {
 // 信息编辑弹窗提交
 const InformationEditing = () => {
   TcPdloading.value = true;
+  console.log(WrapBarEditing.value,'WrapBarEditing.value');
   let data = [
     {
       orderCode: WrapBarEditing.value.orderCode, //订单编号
-      groundingPositionCode: WrapBarEditing.value.positionCode, //新的货位
+      groundingPositionCode: WrapBarEditing.value.groundingPositionCode, //新的货位
       stockNum: counting.value.stockNum, //在库数量
       lossNum: counting.value.lossNum, //丢失数量
       deliveNum: counting.value.deliveNum, //配送数量
@@ -1914,6 +2088,12 @@ const InformationEditing = () => {
       id: Tcrow.value.id,
     },
   ];
+  if(WrapBarEditing.value.groundingPositionCode){
+   let val = list.value.find(obj => obj.value == WrapBarEditing.value.groundingPositionCode);
+   console.log(data,'货位处理好的数据');
+    data[0].groundingAllocationId=val.value;
+    data[0].groundingPositionCode=val.label
+  }
   if (!TcStateSwitching.value) {
     //为假表示当前走定制品规则
     let InputMax = counting.value[radioList.value[InventoryInput.value].input]; //存储当前输入框最大值
@@ -1967,13 +2147,18 @@ const InformationEditing = () => {
 const TcChenge = (event, val) => {
   console.log(event, val);
   TcPdloading.value = true;
+  console.log(row.value,'必须参数');
+  console.log(row.value.questNum,'questNum');
+  let quest=row.value.questNum
+  let qstId=row.value.id
   let data = {
-    questNum: row.value.questNum,
-    questId: row.value.id,
     current: TccurrentPage.value, //页码
     size: TcpageSize.value, //条数
     ...TcFrom.value,
+    questNum:quest,
+    questId:qstId,
   };
+
   console.log(data, '要提交的数据');
 
   $_getDetailInfo(data).then(res => {
@@ -1992,10 +2177,10 @@ const TcPageSizeChange = val => {
   TcpageSize.value = val;
   if (NotCounted.value) {
     //表示当前是未盘点翻页
-    NotCountedFn(UncheckedRow.value);
+    NotCountedFn(UncheckedRow.value,TcFrom.value);
   } else {
     console.log(val);
-    TcViewEvent(row.value);
+    TcViewEvent(row.value,TcFrom.value);
   }
 };
 
@@ -2006,10 +2191,10 @@ const TcSizeChange = val => {
   if (NotCounted.value) {
     //表示当前是未盘点翻页
 
-    NotCountedFn(UncheckedRow.value);
+    NotCountedFn(UncheckedRow.value,TcFrom.value);
   } else {
     console.log(val);
-    TcViewEvent(row.value);
+    TcViewEvent(row.value,TcFrom.value);
   }
 };
 // 弹窗翻页
@@ -2116,11 +2301,12 @@ const InventorySubmit = () => {
     //
     SubData.list = [];
     // 结束时间
-    SubData.endTime = formInventory.value.time[0];
+    SubData.endTime = formInventory.value.time[1];
     // 开始时间
-    SubData.startTime = formInventory.value.time[1];
+    SubData.startTime = formInventory.value.time[0];
     InventoryPopup.value = false; //关闭创建盘点任务弹窗
     loading.value = true; //开启表格加载
+    console.log(SubData,'处理好的数据');
     postAddtaskQuest(SubData).then(res => {
       onLoad(); //体积之后初始化页面
       if ((res.data.code = 200)) {
@@ -2149,15 +2335,15 @@ const InventorySubmit = () => {
   }
 
   // 结束时间
-  SubData.endTime = formInventory.value.time[0];
+  SubData.endTime = formInventory.value.time[1];
   // 开始时间
-  SubData.startTime = formInventory.value.time[1];
+  SubData.startTime = formInventory.value.time[0];
   console.log(SubData, '处理好要提交的数据');
   InventoryPopup.value = false; //关闭创建盘点任务弹窗
-  postAddtaskQuest(SubData).then(res => {
-    console.log(res, '盘点计划提交成功');
-    onLoad(); //体积之后初始化页面
-  });
+  // postAddtaskQuest(SubData).then(res => {
+  //   console.log(res, '盘点计划提交成功');
+  //   onLoad(); //体积之后初始化页面
+  // });
 };
 </script>
 
@@ -2201,9 +2387,7 @@ const InventorySubmit = () => {
   padding: 0 10px;
 }
 
-:deep(.cell) {
-  padding: 0;
-}
+
 
 .demo-pagination-block {
   flex: 1;
@@ -2242,6 +2426,7 @@ const InventorySubmit = () => {
   display: flex;
   justify-content: flex-end;
   margin-top: 80px;
+ 
 }
 
 .Tcstate {
@@ -2286,4 +2471,42 @@ const InventorySubmit = () => {
   justify-content: flex-end;
   margin-bottom: 10px;
 }
+.el-exDc{
+  margin-left: 20px;
+  color: #10d070;
+  cursor: pointer;
+}
+:deep(.el-dialog){
+  display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    .el-dialog__footer{
+      flex: 1;
+    }
+    .dialog-footer{
+    display: flex;
+    align-items: flex-end;
+  }
+}
+.fullScreen{
+  display: flex;
+    margin-left: auto;
+    align-items: center;
+    justify-content: center;
+    i{
+      width: 20px;
+    height: 20px;
+    svg{
+      height: 100%;
+    width: 100%;
+    }
+    }
+}
+:deep(.el-input__wrapper){
+  height: 30px;
+
+}
+:deep(.el-input__inner){
+  height: 100% !important;
+}
 </style>
diff --git a/src/views/distribution/checkInventoryTask/createTaskaaa.vue b/src/views/distribution/checkInventoryTask/createTaska.vue
similarity index 100%
rename from src/views/distribution/checkInventoryTask/createTaskaaa.vue
rename to src/views/distribution/checkInventoryTask/createTaska.vue
diff --git a/vite.config.js b/vite.config.js
index d2453eba..e1c949ee 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -20,9 +20,11 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.101:8888',
           // 老zyc
             // target: 'http://192.168.10.75:8777',
-            target: 'http://192.168.6.137:8777',
-          // 新zyc
-          //  target: 'http://192.168.10.200:13000',
+             // 新zyc
+            target: 'http://192.168.6.141:8777',
+         
+          // tjj
+          //  target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.94:8888',
           // target: 'http://test.api.huitongys.com',
           // target: 'http://h5uapi.huitongys.com',