前端孟祥旭

src/views/warehouse/warehouseManagementList.vue

@@ -41,7 +41,7 @@
         >
       </template>
       <template slot="left">
-        <div style="margin-top: 20px">
+        <div style="margin-top: 2px">
     <el-radio-group v-model="warehouseType" @change="changeradio"  size="small">
       <el-radio-button label="1" >自有库</el-radio-button>
       <el-radio-button label="2" >临时库</el-radio-button>
@@ -49,7 +49,7 @@
     </el-radio-group>
   </div>
       </template>
-      <template slot="right">
+      <template slot="right" >
         <ws-input
           v-model="warehouseName"
           placeholder="请输入仓库名"
@@ -80,7 +80,7 @@
         /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div>
+    <div v-show="this.warehouseType == '1'"> 
       <el-table
         class="wenzi"
         :data="warehouseList"
@@ -179,6 +179,97 @@
         </el-table-column>
       </el-table>
     </div>
+    
+      <div v-show="this.warehouseType == '2'">
+      <el-table
+        class="wenzi"
+        :data="warehouseList"
+        style="width: 100%; margin-top: 20px"
+        height="780"
+      >
+        <el-table-column prop="index" label="序号" width="80">
+        </el-table-column>
+        <el-table-column prop="warehouseName" label="仓库名" width="80">
+        </el-table-column>
+        <el-table-column prop="address" label="临时库地址">
+          <template slot-scope="scope">
+            <div
+              v-if="scope.row.address != 'null' && scope.row.address != null"
+            >
+              {{ scope.row.address }}
+            </div>
+          </template>
+        </el-table-column>
+        
+        <el-table-column label="入库量（吨）">
+          <template slot-scope="scope">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
+              {{ item.inNetWeight }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="出库量（吨）">
+          <template slot-scope="scope">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
+              {{ item.outNetWeight }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="应余量（吨）">
+          <template slot-scope="scope">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
+             {{ item.storage }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="seller" label="出入库" width="300">
+          <template slot-scope="scope">
+            <ws-button
+              class="completed"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              待完成（{{ scope.row.number }}）
+            </ws-button>
+            <ws-button
+              class="putstorage"
+              @click="warehousing(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              入库
+            </ws-button>
+            <ws-button
+              class="deliverystorage"
+              @click="delivery(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              出库
+            </ws-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="操作" width="200">
+          <template slot-scope="scope">
+            <div class="record" @click="record(scope.row)">记录</div>
+            <div class="adjustment" @click="loss(scope.row)">清仓</div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
   </div>
 </template>
 <script>
@@ -254,6 +345,7 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    
     //出库
     delivery(item) {
       this.$router.push({
@@ -588,4 +680,7 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
+/deep/.el-radio-button:first-child .el-radio-button__inner{
+  margin-left: 10px;
+}
 </style>