Merge branch 'pre-production'

src/views/aftersales/aftersalesWorkOrder.vue

@@ -2,6 +2,7 @@
   <div class="content_max">
     <!-- 菜单  -->
     <el-tabs type="border-card" v-model="tabValue" @tab-change="tabChenge" class="el_tabs">
+      <div>  </div>
       <el-tab-pane :name="item.name" :label="item.label" v-for="item in TabList" :key="item.name">
       </el-tab-pane>
       <div class="content_right">
@@ -2783,8 +2784,7 @@ const CompletedSubmission = () => {
   display: flex;
   align-items: flex-end;
   margin-bottom: 10px;
-  position: fixed;
+
-    bottom: 0;
 }
 .el-times {
   :deep(.el-input__wrapper) {
@@ -3022,10 +3022,15 @@ const CompletedSubmission = () => {
 :deep(.el_tabs) {
   width: 100%;
   display: flex;
-  flex-direction: column;
+  // flex-direction: column;
+  flex-wrap: wrap;
   .el-tabs__content {
     padding: 0;
   }
+  .el-tabs__header{
+    height: 37px;
+    width: 100%;
+  }
 }
 :deep(.avue-crud__pagination) {
   padding-top: 2px !important;
@@ -3050,4 +3055,7 @@ const CompletedSubmission = () => {
   justify-content: flex-end;
   margin-top: 10px;
 }
+:deep(.avue-crud__header){
+  align-items: center;
+}
 </style>

src/views/distribution/checkInventoryTask/createTask.vue

@@ -2462,17 +2462,17 @@ const InventorySubmit = () => {
     InventoryPopup.value = false; //关闭创建盘点任务弹窗
     loading.value = true; //开启表格加载
     console.log(SubData, '处理好的数据');
-    // postAddtaskQuest(SubData).then(res => {
+    postAddtaskQuest(SubData).then(res => {
-    //   onLoad(); //体积之后初始化页面
+      onLoad(); //体积之后初始化页面
-    //   if ((res.data.code = 200)) {
+      if ((res.data.code = 200)) {
-    //     ElMessage({
+        ElMessage({
-    //       message: res.data.msg,
+          message: res.data.msg,
-    //       type: 'success',
+          type: 'success',
-    //     });
+        });
-    //     onLoad(); //体积之后初始化页面
+        onLoad(); //体积之后初始化页面
-    //   }
+      }
-    //   console.log(res, '盘点计划提交成功');
+      console.log(res, '盘点计划提交成功');
-    // });
+    });
     return;
   }