前端

src/views/warehouse/costmanagement.vue

@@ -79,6 +79,14 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    ></el-pagination>
       <el-dialog title="修改加权成本价格" :visible.sync="editvisible">
         <el-form >
           <el-form-item label="价格（元/吨）" >
@@ -274,6 +282,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.warehouseList = response
+          this.deptBudgetTotal=response.total
         })
     },
     handleExamine(row) {

src/views/warehouse/warehouselocation.vue

@@ -119,7 +119,7 @@
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :current-page="currentPage"
-      :page-size="deptCircularPage.pageSize"
+      :page-size="pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="deptBudgetTotal"
     >
@@ -453,25 +453,6 @@ export default {
         })
      
     },
-    //查看
-    handleLook() {
-      this.$router.push({ path: 'warehouseManagementLook' })
-    },
-    //添加
-    handleAdd() {
-      this.$router.push({ path: 'warehouseManagementAdd' })
-    },
-    //编辑
-    handleEdit() {
-      this.$router.push({ path: 'warehouseManagementEdit' })
-    },
-    handleDelete() {
-      this.$router.push({ path: 'warehouseManagementDelete' })
-    },
-    //任务
-    handlTask(){
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
-    },
     handleClose() {
       this.accessoryTFs = false
     },
@@ -529,6 +510,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.warehouseList = response
+          this.deptBudgetTotal=response.total
           this.counttotal()
         })
     },

src/views/warehouse/weightedsubsidiary.vue

@@ -70,8 +70,8 @@
             <ws-option
               v-for="item in goodnameList"
               :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
+              :label="item.goodsName"
+              :value="item.goodsName"
             />
           </ws-select>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
@@ -251,8 +251,8 @@ export default {
   methods: {
       selectgoodsName(e) {
       for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.goodsNameKey = this.goodnameList[i].constKey
+        if (this.goodnameList[i].goodsName == e) {
+          this.goodsNameKey = this.goodnameList[i].goodsNameKey
         }
       }
     },
@@ -328,7 +328,8 @@ export default {
               id: response[i].id,
               count: response[i].count,
               purchasePriceList: response[i].purchasePriceList,
-              No:response[i].commonWarehouseNo
+              No:response[i].commonWarehouseNo,
+              goodsNameInfos:response[i].goodsNameInfos
             })
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
@@ -370,6 +371,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.warehouseList = response
+          this.deptBudgetTotal=response.total
           this.counttotal()
         })
     },