Browse Source

bug修复

chenrui 4 years ago
parent
commit
24a357f817

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -24,7 +24,7 @@
           option-filter-prop="children"
           :filter-option="filterOption"
           style="width: 80%;">
-          <a-select-option v-for="item in supplierList" :key="item.supplierSn" :value="item.supplierSn">{{ item.supplierName }}</a-select-option>
+          <a-select-option v-for="item in supplierList" :key="item.supplierSn" :value="item.supplierSn" :disabled="item.enabledFlag==0">{{ item.supplierName }}</a-select-option>
         </a-select>
         <a-button icon="plus" size="small" @click="openSupplierModal=true" id="bulkWarehousingOrder-basicInfo-add-btn" style="margin-left: 10px;"></a-button>
       </a-form-model-item>

+ 6 - 6
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -23,10 +23,10 @@
           <a-col :md="6" :sm="24">
             <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <a-select
-                id="bulkWarehousingOrderList-supplierName"
+                id="bulkWarehousingOrderList-supplierSn"
                 placeholder="请选择供应商"
                 allowClear
-                v-model="queryParam.supplierName"
+                v-model="queryParam.supplierSn"
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
@@ -64,13 +64,13 @@
             <span class="table-page-search-submitButtons" style="margin-top: 3px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
-              <a-button
+              <!-- <a-button
                 style="margin-left: 8px"
                 type="danger"
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                id="bulkWarehousingOrderList-export">导出</a-button>
+                id="bulkWarehousingOrderList-export">导出</a-button> -->
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -152,7 +152,7 @@ export default {
       // 查询参数
       queryParam: {
         sparePartsPurchaseNo: '', //  散件单号
-        supplierName: undefined, //  供应商
+        supplierSn: undefined, //  供应商
         state: undefined, //  单据状态
         settleState: undefined //  结算状态
       },
@@ -272,7 +272,7 @@ export default {
     //  重置
     resetSearchForm () {
       this.queryParam.sparePartsPurchaseNo = ''
-      this.queryParam.supplierName = undefined
+      this.queryParam.supplierSn = undefined
       this.queryParam.state = undefined
       this.queryParam.settleState = undefined
       this.createDate = undefined