Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -513,7 +513,7 @@
         //分页
         currentPage: 1,
         cost: '',
-        pageSize: 10,
+        pageSize: 50,
         isShowPrint: false,
         typeList: ['干粮', '潮粮'],
         disablednotarize: false,

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -388,7 +388,7 @@
         refresh: 60,
         isShowBalance: false,
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 50,
         deptCircularPage: {},
         deptBudgetTotal: 0,
         pList: [],
@@ -593,7 +593,7 @@
               warehouseName: that.warehouseName,
               managementType: 1,
               serviceManagementType: that.inWarehouseType,
-              // loadingstatus: 1,
+              loadingstatus: 1,
               // statusType:1
             })
             .toPromise()
@@ -613,7 +613,7 @@
               warehouseName: that.warehouseName,
               managementType: 1,
               serviceManagementType: that.inWarehouseType,
-              // loadingstatus: 1,
+              loadingstatus: 1,
               // statusType:1
             })
             .toPromise()
@@ -832,44 +832,44 @@
           .then((response) => {
             this.purchasePriceList = response
           })
-        // this.refreshClick(1)
-        getweighingList({
-            compId: localStorage.getItem('ws-pf_compId'),
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchKeyWord: '',
-            warehouseName: this.warehouseName,
-            managementType: 1,
-            serviceManagementType: this.inWarehouseType,
-            // statusType:1
-          })
-          .toPromise()
-          .then((response) => {
-            this.common.commonWeighingList = response.records
-            this.makeData()
-          })
-          .catch((response) => {
-            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          })
-        getweighingList({
-            compId: localStorage.getItem('ws-pf_compId'),
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchKeyWord: '',
-            statusType: this.statusType,
-            warehouseName: this.warehouseName,
-            managementType: 1,
-            serviceManagementType: this.inWarehouseType,
-            // statusType:1
-          })
-          .toPromise()
-          .then((response) => {
-            this.deptBudgetTotal = response.total
-            this.weighingList = response.records
-          })
-          .catch((response) => {
-            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          })
+        this.refreshClick(1)
+        // getweighingList({
+        //     compId: localStorage.getItem('ws-pf_compId'),
+        //     currentPage: this.currentPage,
+        //     pageSize: this.pageSize,
+        //     searchKeyWord: '',
+        //     warehouseName: this.warehouseName,
+        //     managementType: 1,
+        //     serviceManagementType: this.inWarehouseType,
+        //     // statusType:1
+        //   })
+        //   .toPromise()
+        //   .then((response) => {
+        //     this.common.commonWeighingList = response.records
+        //     this.makeData()
+        //   })
+        //   .catch((response) => {
+        //     // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+        //   })
+        // getweighingList({
+        //     compId: localStorage.getItem('ws-pf_compId'),
+        //     currentPage: this.currentPage,
+        //     pageSize: this.pageSize,
+        //     searchKeyWord: '',
+        //     statusType: this.statusType,
+        //     warehouseName: this.warehouseName,
+        //     managementType: 1,
+        //     serviceManagementType: this.inWarehouseType,
+        //     // statusType:1
+        //   })
+        //   .toPromise()
+        //   .then((response) => {
+        //     this.deptBudgetTotal = response.total
+        //     this.weighingList = response.records
+        //   })
+        //   .catch((response) => {
+        //     // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+        //   })
       },
       makeData() {
         this.mList = []

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -224,11 +224,10 @@
         timestamp: '',
         //分页
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 50,
         deptCircularPage: {},
         deptBudgetTotal: 0,
         deptBudgetTotal1: 0,
-        deptBudgetTotal1: 0,
         managementType: 3,
         isShowPrint: false,
         printData: {},

src/views/outboundManagement/weighingManagementNew.vue

@@ -337,7 +337,7 @@
         warehouseList: [],
         warehouseList1: [],
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 50,
         submitAllow: false,
         deliveryList: [],
         positionInfos: [],
@@ -1571,7 +1571,7 @@
         if (day < 10) {
           day = '0' + day
         }
-        return date.getFullYear() + mouth + date.getDate()
+        return date.getFullYear() + mouth + day
       },
       contractNoChange(e) {
         this.warehouseCount = this.warehouseCount1

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1504,7 +1504,7 @@
 				if (this.dataList1.taskTypeKey == 2) {
 					this.dataList1.inOutType = '采购入库'
 					this.dataList1.inOutTypeKey = '1'
-					this.flag = 0
+					this.flag = 8
 				} else if (this.dataList1.taskTypeKey == 3) {
 					this.disabled = true
 					this.gradestatus=false