1

src/components/assetsman/outboundApplication.vue

@@ -17,16 +17,16 @@
             </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">
-          <vxe-table-column field="Name" title="资产状态">
+          <vxe-table-column field="Name" title="申请状态">
             <template v-slot="{ row }">
               <span class="commonStyle hoverSpan1"></span>
               <span class="ColorSpan purpleSpan" v-if="row.ApplyStatus==1">待</span>
@@ -40,7 +40,7 @@
           <vxe-table-column field="OutNo" title="出库订单号"></vxe-table-column>
           <vxe-table-column field="Delivered" title="已发货数"></vxe-table-column>
           <vxe-table-column field="NotOutStock" title="未发货数"></vxe-table-column>
-          <vxe-table-column field="Name" title="资产状态">
+          <vxe-table-column field="Name" title="出库状态">
             <template v-slot="{ row }">
               <span  v-if="row.OutStatus==0">未出库</span>
               <span v-if="row.OutStatus==1">部分出库</span>
@@ -116,13 +116,13 @@
           Name: '拒绝'
         }],
         OutStatusList: [{
-          Id: 0,
+          Id: -1,
           Name: '全部'
         }, {
-          Id: 1,
+          Id: 0,
           Name: '未出库'
         }, {
-          Id: 2,
+          Id: 1,
           Name: '部分出库'
         }, {
           Id: 3,
@@ -131,8 +131,9 @@
         msg: {
           pageIndex: 1,
           pageSize: 15,
+          SupplierId:0,
           ApplyStatus: 0,
-          OutStatus: 0,
+          // OutStatus: 0,
         },
         Updatemsg: {
           ID: 0,

src/components/assetsman/outboundDetail.vue

@@ -77,6 +77,12 @@
           <vxe-table-column field="Specification" title="商品规格"></vxe-table-column>
           <vxe-table-column field="Number" title="购买数量"></vxe-table-column>
           <vxe-table-column field="nowBound" title="正在出库"></vxe-table-column>
+           <template v-slot:empty>
+            <span>
+             
+              <p>仓库中暂无商品</p>
+            </span>
+          </template>
         </vxe-table>
       </div>
     </div>