Merge branch 'dev' into pre-production

src/page/index/index.vue

@@ -15,7 +15,7 @@
         <!-- 主体视图层 -->
         <div id="avue-view" v-show="!isSearch" v-if="isRefresh">
           <router-view #="{ Component }">
-            <keep-alive :include="$store.getters.tagsKeep">
+            <keep-alive>
               <component :is="Component" />
             </keep-alive>
           </router-view>

src/views/aftersales/VueTemp.vue

@@ -1449,7 +1449,7 @@ const ConfirmForm = () => {
     typesOf: 1,
   };
   processorEntityList.push(ResponsibleParty);
-  Indexform.value.processorEntityList = processorEntityList;
+  DataSubmit.processorEntityList = processorEntityList;
   let DataSubmit = { ...Indexform.value };
   delete DataSubmit.duty, //移除多余字段
     delete DataSubmit.processor; //移除多余字段
@@ -1659,12 +1659,15 @@ const selectionChange = list => {
 };
 
 /** 页码改变执行的回调 */
-const currentChange = () => {
-  console.log('2');
+const currentChange = (val) => {
+  page.value.currentPage=val
+  IndexTable();
 };
 // 每页多少条
 const sizeChange=(val)=>{
   console.log(val);
+  page.value.pageSize=val
+  IndexTable();
 }
 const changeProcessingResults = val => {
   // 首先删除取消的项目

src/views/distribution/checkInventoryTask/createTask.vue

@@ -838,6 +838,17 @@ const menuData = ref([
     search: false,
     head: true,
   },
+  {
+    prop: 'stockNum',
+    label: '数量',
+    type: 5,
+    values: '',
+    width: '260',
+    checkarr: [],
+    fixed: false,
+    search: true,
+    head: true,
+  },
   {
     prop: 'questType',
     label: '类型',
@@ -972,6 +983,17 @@ const InventoryDetails = ref([
     search: true,
     head: true,
   },
+  {
+    prop: 'stockNum',
+    label: '数量',
+    type: 5,
+    values: '',
+    width: '260',
+    checkarr: [],
+    fixed: false,
+    search: true,
+    head: true,
+  },
   {
     prop: 'trayCode',
     label: '托盘码',