1

src/components/assetsman/outboundApplication.vue

@@ -17,12 +17,12 @@
             </el-option>
           </el-select>
         </li>
-        <!-- <li>
+        <li>
           <el-select size="small" v-model="msg.OutStatus" @change="msg.pageIndex=1,getList()">
             <el-option v-for="item in OutStatusList" :key="item.Id" :label="item.Name" :value="item.Id">
             </el-option>
           </el-select>
-        </li> -->
+        </li>
       </ul>
       <div>
         <vxe-table stripe style="margin-top:15px" :loading="loading" :data="tableData">
@@ -125,7 +125,7 @@
           Id: 1,
           Name: '部分出库'
         }, {
-          Id: 3,
+          Id: 2,
           Name: '全部出库'
         }],
         msg: {
@@ -133,7 +133,7 @@
           pageSize: 15,
           SupplierId:0,
           ApplyStatus: 0,
-          // OutStatus: 0,
+          OutStatus: -1,
         },
         Updatemsg: {
           ID: 0,

src/components/assetsman/procurementDetails.vue

@@ -26,31 +26,6 @@
 
 
 
-         <el-table-column prop="Id" label="ID" width="60"></el-table-column>
-        <el-table-column prop="ImageList" label="封面图" width="80" align='center'>
-            <template slot-scope="scope">
-                <img :src="scope.row.MaterialModel.ImageList[0]" alt="" style="width: 50px; height: 50px;">
-            </template>
-        </el-table-column>
-        <el-table-column prop="Name" label="商品名称" >
-            <template slot-scope="scope">
-                <span>{{scope.row.MaterialModel.Name}}</span>
-            </template>
-        </el-table-column>  
-        <el-table-column prop="GoodsSpecificationList" label="规格" >
-            <template slot-scope="scope">
-                <span v-for="(x,y) in scope.row.MaterialModel.GoodsSpecificationList" :key="y">{{x}} <span v-if="scope.row.MaterialModel.GoodsSpecificationList.length !== y+1"> , </span></span>
-            </template>
-        </el-table-column>  
-        <el-table-column prop="Number" label="采购数量" width="80"></el-table-column>
-        <el-table-column prop="StockInNum" label="已入数量" width="80">
-             <template slot-scope="scope">
-                 <span>{{scope.row.StockInNum!=null?scope.row.StockInNum:0}}</span>
-            </template>
-        </el-table-column>
-
-
-
             <vxe-table-column field="Id" title="ID" width='60'></vxe-table-column>
             <vxe-table-column field="GoodsName" title="封面图" width='80'>
                 <template  v-slot="{ row }">