소스 검색

前端gjy

gjy 3 년 전
부모
커밋
a0868ece0e

+ 1 - 1
src/views/outboundManagement/component/route.js

@@ -8,7 +8,7 @@ const outboundManagementRouter = {
     alwaysShow: true, // will always show the root menu
     meta: {
         title: 'outboundManagement',
-        module: 'contractManagement',
+        module: 'outbound',
         icon: '-hetongguanli'
     },
     children: [

+ 4 - 4
src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -203,7 +203,7 @@
           label="净重"
         ></el-table-column>
         <el-table-column
-          width="300"
+          width="120"
           class="table_td"
           prop="settlementWeight"
           label="结算重量(吨)"
@@ -539,7 +539,6 @@ export default {
   },
   activated() {
     this.getContractList()
-    this.getList()
     this.showType = this.isShow
   },
   methods: {
@@ -984,6 +983,7 @@ export default {
           this.contractNoList = response
           this.option = this.contractNoList
        this.contractNo = this.option[0].contractNo
+       this.getList()
         })
     },
     handleRemove(file) {
@@ -1311,7 +1311,7 @@ export default {
 .el-input--small {
   font-size: 13px;
   width: 390px;
-  margin-left: 74%;
+  margin-left: 38%;
 }
 /deep/.el-table .el-table__header .cell,
 .el-table .el-table__body .cell {
@@ -1358,7 +1358,7 @@ hr {
 .inputChenge {
   width: 100%;
   display: inline-flex;
-  margin-left: -69%;
+  margin-left: -28%;
 }
 .inputs {
   margin: 0 auto;

+ 23 - 4
src/views/warehouse/costmanagement.vue

@@ -51,7 +51,7 @@
     </BaseHeaderLayout>
       <el-table
         class="wenzi"
-        :data="warehouseList.records"
+        :data="warehouseList"
         style="width: 100%; margin-top: 20px"
         height="780"
       >
@@ -164,7 +164,13 @@ export default {
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       warehouseList: [],
-      warehouseList1: [],
+      warehouseList1: [{
+        value: '全部仓库',
+        id: '',
+        count: '',
+        purchasePriceList: [],
+        No:''
+      }],
       deptBudgetList: {},
       historyList: [],
       deptBudgetTotal: 0,
@@ -246,7 +252,13 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          this.warehouseList1 = []
+          this.warehouseList1 = [{
+        value: '全部仓库',
+        id: '',
+        count: '',
+        purchasePriceList: [],
+        No:''
+      }]
           for (let i = 0; i < response.length; i++) {
             this.warehouseList1.push({
               value: response[i].warehouseName,
@@ -283,7 +295,14 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          this.warehouseList = response
+          var arr=[]
+          for (let i = 0; i < response.records.length; i++) {
+            if(response.records[i].storage!=0){
+              arr.push(response.records[i])
+            }
+            
+          }
+          this.warehouseList = arr
           this.deptBudgetTotal=response.total
         })
     },