Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -190,6 +190,7 @@ import {getToken} from "@/util/auth";
 import {contrastObj, contrastList, contrastList2} from "@/util/contrastData";
 import {validatenull} from '@/util/validate'
 import check from "@/components/check/check";
+import {dateFormat} from "@/util/date";
 
 export default {
   name: "detailsPageEdit",
@@ -249,7 +250,7 @@ export default {
             label: "入库日期",
             prop: "stockTime",
             type: "datetime",
-            value: new Date(),
+            value: dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss'),
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [

src/views/salesManagement/outStock/config/mainList.json

@@ -141,25 +141,35 @@
       "prop": "specialRemarks",
       "index": 12,
       "width": 120
+    },{
+      "label": "计划出库数量",
+      "prop": "purchaseQuantity",
+      "index": 13,
+      "width": 120
+    },{
+      "label": "计划品名",
+      "prop": "planGoodsName",
+      "index": 14,
+      "width": 120
     },
     {
       "label": "制单人",
       "prop": "salesName",
-      "index": 13,
+      "index": 15,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "创建时间",
       "prop": "createTime",
-      "index": 14,
+      "index": 16,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "审核状态",
       "prop": "status",
-      "index": 15,
+      "index": 17,
       "width": 120,
       "type": "select",
       "dataType": "number",
@@ -173,7 +183,7 @@
     {
       "label": "备注",
       "prop": "orderRemark",
-      "index": 16,
+      "index": 18,
       "width": 120,
       "search": true,
       "searchSpan": 8,

src/views/salesManagement/outStock/detailsPage.vue

@@ -234,7 +234,7 @@ import checkSchedule from "../../../components/check/checkSchedule";
 import uploadFile from "@/components/upload-file/main";
 import {getToken} from "@/util/auth";
 import {contrastObj, contrastList, contrastList2} from "@/util/contrastData";
-import {getCurrentDate} from "@/util/date";
+import {dateFormat, getCurrentDate} from "@/util/date";
 import {validatenull} from '@/util/validate'
 import check from "@/components/check/check";
 
@@ -288,7 +288,7 @@ export default {
             label: "出库日期",
             prop: "stockTime",
             type: "datetime",
-            value: new Date(),
+            value: dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss'),
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
@@ -630,6 +630,7 @@ export default {
         done();
         if (valid) {
           this.dialogVisible = true
+              // ,purchaserId:this.form.purchaserId
           getStorage({storageTypeId: this.form.storageId}).then(res => {
             this.findObject(this.tableOption.column, "storageId").dicData = res.data;
             this.findObject(this.tableOptionTwo.column, "storageId").dicData = res.data;
@@ -1074,6 +1075,8 @@ export default {
       scanningCodeAddPc({
         storageId: this.form.storageId,
         purchaserId: this.form.purchaserId,
+        current:page.currentPage,
+        size:page.pageSize,
         ...obj
       }).then(res => {
         this.dialogList = res.data.data.records