瀏覽代碼

bug 修复

lilei 3 年之前
父節點
當前提交
bbabad255a

+ 3 - 2
src/views/bulkManagement/bulkReturnGoods/basicInfoModal.vue

@@ -25,7 +25,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" :disabled="item.enabledFlag==0">{{ item.supplierName }}</a-select-option>
+            <a-select-option v-for="item in supplierList" :key="item.supplierSn" :pyCode="item.pyCode" :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>
@@ -114,7 +114,8 @@ export default {
       })
     },
     filterOption (input, option) {
-      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+      option.data.attrs.pyCode.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
     // 新增供应商 成功
     handleOk () {

+ 3 - 2
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -25,7 +25,7 @@
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
-                  <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" :pyCode="item.pyCode" :value="item.supplierSn">{{ item.supplierName }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -221,7 +221,8 @@ export default {
     },
     filterOption (input, option) {
       return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+        option.data.attrs.pyCode.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
     //  重置

+ 3 - 2
src/views/bulkManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -25,7 +25,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" :disabled="item.enabledFlag==0">{{ item.supplierName }}</a-select-option>
+            <a-select-option v-for="item in supplierList" :key="item.supplierSn" :pyCode="item.pyCode" :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>
@@ -129,7 +129,8 @@ export default {
     },
     filterOption (input, option) {
       return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+        option.data.attrs.pyCode.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
     // 供应商下拉数据

+ 3 - 2
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -25,7 +25,7 @@
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
-                  <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" :pyCode="item.pyCode" :key="item.supplierSn" :value="item.supplierSn">{{ item.supplierName }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -317,7 +317,8 @@ export default {
     },
     filterOption (input, option) {
       return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+        option.data.attrs.pyCode.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
     //  导出

+ 5 - 5
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -80,6 +80,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="">
                   <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
+                  <a-checkbox v-model="queryParam.productEnabledFlag" id="inventoryQueryList-productEnabledFlag">显示禁用产品</a-checkbox>
                 </a-form-item>
               </a-col>
             </template>
@@ -183,6 +184,7 @@ export default {
         productTypeSn2: '', //  产品分类2
         productTypeSn3: '', //  产品分类3
         zeroQtyFlag: false, //  库存情况
+        productEnabledFlag: false, // 显示禁用产品
         minUnsalableDays: undefined, // 滞销天数最小值
         maxUnsalableDays: undefined // 滞销天数最大值
       },
@@ -223,11 +225,8 @@ export default {
             parameter.sortAlias = 'stock'
           }
           const params = Object.assign(parameter, this.queryParam)
-          if (params.zeroQtyFlag) {
-            params.zeroQtyFlag = '0'
-          } else {
-            params.zeroQtyFlag = ''
-          }
+          params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
+          params.productEnabledFlag = params.productEnabledFlag ? '0' : '1'
           return stockList(params).then(res => {
             let data
             if (res.status == 200) {
@@ -329,6 +328,7 @@ export default {
       this.queryParam.brandName = undefined
       this.queryParam.productTypeName = undefined
       this.queryParam.zeroQtyFlag = false
+      this.queryParam.productEnabledFlag = false
       this.productTypeSn = []
       this.queryParam.minUnsalableDays = undefined, // 滞销天数最小值
       this.queryParam.maxUnsalableDays = undefined, // 滞销天数最大值

+ 3 - 2
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -26,7 +26,7 @@
                   option-filter-prop="children"
                   :filter-option="filterOption"
                   @change="tragetTypeChange">
-                  <a-select-option v-for="item in supplierList" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn">{{ item.purchaseTargetName }}</a-select-option>
+                  <a-select-option v-for="item in supplierList" :pyCode="item.pyCode" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn">{{ item.purchaseTargetName }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -316,7 +316,8 @@ export default {
     },
     filterOption (input, option) {
       return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+        option.data.attrs.pyCode.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
     // 获取供应商数据