日常提交

vue/src/axios/index.js

@@ -2,6 +2,7 @@ import router from '../router'
 import axios from 'axios'
 import qs from 'qs'
 import config from '../../static/config'
+//import config from '../../public/config'
 import {
   Message,
   Loading

vue/src/views/ux/billManage/WMSOutputSumReport/index.vue

@@ -875,9 +875,7 @@ export default {
     /** 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "state") {
-        return { 0: "新建", 2: "成功", 1: "失败" }[
-          row[column.property]
-        ];
+        return { 0: "新建", 2: "成功", 1: "失败" }[row[column.property]];
       }
       if (
         column.property == "settleInputDate" ||
@@ -898,9 +896,13 @@ export default {
       this.showExcelImport = false;
     },
 
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.JobversionValue != "") {
         this.listQuery.version = this.JobversionValue;
       }
@@ -921,6 +923,9 @@ export default {
         .catch(() => {
           this.listLoading = false;
         });
+      //清空 同步WMS至SAP信息
+      this.resultData.errSize = 0;
+      this.resultData.successMessage = "";
     },
     /** 筛选操作 */
     handleFilter() {

vue/src/views/ux/billManage/sparepartOutOrder/detail.vue

@@ -345,6 +345,11 @@ export default {
       tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
       tempsTabs.push({ label: "寄售库存", prop: "stockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
+       tempsTabs.push({
+        label: "实际出库数量",
+        prop: "realityNumber",
+        width: 160,
+      });
       tempsTabs.push({ label: "状态", prop: "state", width: 100 });
       return tempsTabs;
     },
@@ -406,7 +411,7 @@ export default {
         logic: 0,
         column: column,
         action: 0,
-        value: params.value,
+        value: params.value,realityNumber
       };
       this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);

vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue

@@ -1,4 +1,4 @@
-<!--发票与结算核对明细-->
+<!--红旗工厂备件明细-->
 <template>
   <div class="cr-body-content">
     <!--功能栏-->
@@ -364,7 +364,7 @@
               ></i>
             </template>
 
-            <el-row>
+            <!-- <el-row>
               <el-col :md="4" :xs="24">
                 <el-form-item label="订货看板编号" />
               </el-col>
@@ -393,7 +393,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
 
             <el-row>
               <!-- <el-col :md="4" :xs="24">