带配货相关修改

src/components/Pagination/index.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { scrollTo } from '@/utils/scroll-to'
+import {scrollTo} from '@/utils/scroll-to'
 
 export default {
   name: 'Pagination',
@@ -62,8 +62,7 @@ export default {
     }
   },
   data() {
-    return {
+    return {};
-    };
   },
   computed: {
     currentPage: {
@@ -88,13 +87,13 @@ export default {
       if (this.currentPage * val > this.total) {
         this.currentPage = 1
       }
-      this.$emit('pagination', { page: this.currentPage, limit: val })
+      this.$emit('pagination', {page: this.currentPage, limit: val})
       if (this.autoScroll) {
         scrollTo(0, 800)
       }
     },
     handleCurrentChange(val) {
-      this.$emit('pagination', { page: val, limit: this.pageSize })
+      this.$emit('pagination', {page: val, limit: this.pageSize})
       if (this.autoScroll) {
         //分页向上滚动效果
         // scrollTo(0, 800)
@@ -109,6 +108,7 @@ export default {
   background: #fff;
   padding: 32px 16px;
 }
+
 .pagination-container.hidden {
   display: none;
 }

src/views/inout/DialogCreateOrder.vue

@@ -9,7 +9,7 @@
         style="margin-bottom: -15px"
       >
         <el-button-group
-          style="display: flex; margin: 0px 0 10px 80%; height: 35px"
+          style="display: flex; margin: 0px 0 15px 75%; height: 35px"
         >
           <el-button
             size="mini"
@@ -22,11 +22,12 @@
           >草稿保存
           </el-button>
           <el-button size="mini" type="primary" @click.native="submit()"
+                     v-if="curAction.checkWebNew != 2  || viewType !=1"
           >立即提交
           </el-button>
           <el-button size="mini" type="primary" @click.native="submit(1)"
-                     v-if="curAction.checkWebNew == 3"
+                     v-if="curAction.checkWebNew > 1  && viewType == 1"
-          >未配货提交
+          >待配货提交
           </el-button>
         </el-button-group>
         <el-row>
@@ -636,7 +637,6 @@ export default {
       this.orderFormData.checkPreInOrders = null;
       this.checkPreInArray = [];
       this.curAction = this.getActionItem(item);
-      debugger
       if ((this.curAction.checkEnable && this.curAction.checkWebNew != 0) || this.viewType == 1) {
         //单据类型需要一次校验 或 单据类型为1，显示业务单据页面
         this.bizShow = true;
@@ -911,7 +911,6 @@ export default {
     },
 
     submit(val) {
-      debugger
       let tQuery = Object.assign(
         JSON.parse(JSON.stringify(this.orderFormData))
       );

src/views/inout/IoAuditedOrder.vue

@@ -164,7 +164,7 @@
             >撤回
             </el-button
             >
-<!--            <el-button-->
+            <!--            <el-button-->
             <!--              type="text"-->
             <!--              size="small"-->
             <!--              @click.native.stop="deleteDialog(scope.row)"-->
@@ -244,7 +244,7 @@
           ></el-table-column>
           <el-table-column
             label="扫码数量"
-            prop="scanCount" width="100"
+            prop="reCount" width="100"
           ></el-table-column>
           <el-table-column
             label="价格" width="100"
@@ -658,7 +658,7 @@ export default {
         limit: 10
       };
 
-      if(!isBlank(this.currentRow.billNo)) {
+      if (!isBlank(this.currentRow.billNo)) {
         this.getBizDetailList();
       }
     },
@@ -776,7 +776,7 @@ export default {
         limit: 10
       };
 
-      if(!isBlank(this.currentRow.billNo)) {
+      if (!isBlank(this.currentRow.billNo)) {
         this.getResultDetailList();
       }
     },
@@ -839,8 +839,7 @@ export default {
       return statusMap[status];
     },
   },
-  filters: {
+  filters: {},
-  },
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();

src/views/inout/PanelCreateOrderBizDetail.vue

@@ -72,7 +72,7 @@
 
       <el-table-column width="100"
                        label="扫码数量"
-                       prop="reCount"
+                       prop="scanCount"
                        v-if="viewType!=2"
                        show-overflow-tooltip
       ></el-table-column>