盘点翻页搜索

src/router/views/index.js

@@ -1106,7 +1106,6 @@ export default [
     ],
   },
 
-<<<<<<< HEAD
 {
   path: '/aftersales/VueTemp',
   component: Layout,
@@ -1119,32 +1118,6 @@ 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'),
-//     },
-//   ],
-// },
->>>>>>> 3a3b27cb3544194e54396f3944da178754571726
 
   // {
   //   path: '/distribution/turndelivery/devtmp',

src/views/distribution/checkInventoryTask/createTask.vue

@@ -173,7 +173,7 @@
     </div>
     <!-- 弹窗详情 -->
 
-    <el-dialog v-model="PopupDetails" :title="!InventoryState?'盘点数据':'未盘点数据'" width="70%" :before-close="handleClose" :fullscreen="fullScreen">
+    <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" -->
@@ -503,7 +503,6 @@
       v-model="InventoryPopup"
       title="创建盘点任务"
       width="30%"
-      :before-close="InventoryPopupClose"
     >
       <el-form :model="formInventory" label-width="120px">
         <el-form-item label="商场名称">
@@ -543,7 +542,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>
@@ -1703,7 +1702,7 @@ const ViewEvent = val => {
 };
 
 // 未盘点数据请求
-const NotCountedFn = row => {
+const NotCountedFn = (row,Inso) => {
   TcPdloading.value = true;
   $_getDetailInfo({
     questStatus: 0,
@@ -1711,6 +1710,7 @@ const NotCountedFn = row => {
     questId: row.id,
     current: TccurrentPage.value, //页码
     size: TcpageSize.value, //条数
+    ...Inso
   }).then(res => {
     TcPdloading.value = false;
     console.log(res, '未盘点明细返回值');
@@ -2126,7 +2126,7 @@ const TcPageSizeChange = val => {
   TcpageSize.value = val;
   if (NotCounted.value) {
     //表示当前是未盘点翻页
-    NotCountedFn(UncheckedRow.value);
+    NotCountedFn(UncheckedRow.value,TcFrom.value);
   } else {
     console.log(val);
     TcViewEvent(row.value,TcFrom.value);
@@ -2140,7 +2140,7 @@ const TcSizeChange = val => {
   if (NotCounted.value) {
     //表示当前是未盘点翻页
 
-    NotCountedFn(UncheckedRow.value);
+    NotCountedFn(UncheckedRow.value,TcFrom.value);
   } else {
     console.log(val);
     TcViewEvent(row.value,TcFrom.value);
@@ -2336,9 +2336,7 @@ const InventorySubmit = () => {
   padding: 0 10px;
 }
 
-:deep(.cell) {
-  padding: 0;
-}
+
 
 .demo-pagination-block {
   flex: 1;