Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/weighingManagement.vue

@@ -98,7 +98,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="status" label="状态"></el-table-column>
-      <el-table-column width="270" prop="contractNo1" label="操作">
+      <el-table-column width="340" prop="contractNo1" label="操作">
         <template slot-scope="scope">
           <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' "
             v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`">毛重</el-button>

src/views/warehouse/warehouseManagementDelete.vue

@@ -76,8 +76,7 @@
         </el-table-column>
         <el-table-column prop="warehouseLocation" label="仓库所在地">
           <template scope="scope">
-            {{ scope.row.warehousePrivate }}{{ scope.row.warehouseCity
-            }}{{ scope.row.warehouseArea }}
+            {{ scope.row.warehousePrivate }}{{ scope.row.warehouseCity}}{{ scope.row.warehouseArea }}
           </template>
         </el-table-column>
         <el-table-column prop="residual" label="应余库存（吨）">
@@ -88,18 +87,10 @@
             <ws-button
               type="primary"
               @click="handleHide(scope.row)"
-              v-if="scope.row.showFlag == 0"
-              >显示</ws-button
-            >
-            <ws-button
-              type="primary"
-              @click="handleHide(scope.row)"
-              v-if="scope.row.showFlag == 1"
-              >隐藏</ws-button
-            >
+              v-if="scope.row.showFlag == 0">显示</ws-button>
+            <ws-button type="primary" @click="handleHide(scope.row)" v-if="scope.row.showFlag == 1">隐藏</ws-button>
             <ws-button type="primary" @click="handleDelete(scope.row)"
-              >删除</ws-button
-            >
+              >删除</ws-button>
           </template>
         </el-table-column>
       </el-table>

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -73,7 +73,7 @@
             <el-table-column prop="backOffice" label="操作人"> </el-table-column>
             <el-table-column prop="updateDate" label="保存时间">
             </el-table-column>
-            <el-table-column prop="address" label="操作" width="200">
+            <el-table-column prop="address" label="操作" width="400">
               <template slot-scope="scope">
                 <ws-button v-if="scope.row.inOutFlag =='2' " v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.in`
@@ -300,7 +300,9 @@
 
        },
       datechange() {
-        this.getList()
+        this.getList( this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType)
       },
       //返回按钮
       returnWarehouse() {
@@ -480,12 +482,16 @@
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val
-        this.getList()
+        this.getList( this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType)
       },
       handleCurrentChange(val) {
         this.currentPage = val
         console.log(`当前页: ${val}`)
-        this.getList()
+        this.getList( this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType)
       },
       //收
       getList(id, id1, id2) {
@@ -523,6 +529,7 @@
             })
             .toPromise()
             .then((response) => {
+              this.deptBudgetTotal = response.total
               this.improved = response
             })
         }
@@ -569,7 +576,9 @@
       this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
       this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
       this.currentPage = 1
-      this.getList()
+      this.getList( this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType)
     },
     // deletecontract(){},
     //删除