Browse Source

Merge branch 'develop_yh56_4' of jianguan-web/qpls-md-html into pre-release

李磊 2 tháng trước cách đây
mục cha
commit
e9ae884c29

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1744712156597
+  "version": 1744860332617
 }

+ 5 - 0
src/views/common/productType.js

@@ -5,6 +5,7 @@ const ProductType = {
       <a-cascader
         @change="handleChange"
         change-on-select
+        :disabled="disabled"
         :value="defaultVal"
         expand-trigger="hover"
         :options="productTypeList"
@@ -35,6 +36,10 @@ const ProductType = {
     level: {
       type: Number,
       default: 3
+    },
+    disabled:{
+      type: Boolean,
+      default: false
     }
   },
   data () {

+ 15 - 2
src/views/salesManagement/salesQueryNew/chooseProductModal.vue

@@ -44,7 +44,7 @@
           <a-row type="flex" :gutter="5">
             <a-col flex="1.5">
               <a-form-model-item label="产品分类">
-                <ProductType id="productInfoList-productType" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
+                <ProductType id="productInfoList-productType" :disabled="vinInfoData&&vinInfoData.productTypeList&&vinInfoData.productTypeList.length>0" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
               </a-form-model-item>
             </a-col>
             <a-col flex="1.5">
@@ -525,13 +525,26 @@ export default {
         return asyncTask
           .then(result => {
             _this.disabled = false
+            const ret = result.filter((a) => {
+              return (
+                (params.productCode === undefined || a.productCode.includes(params.productCode)) &&
+                (params.productOrigCode === undefined || a.productOrigCode.includes(params.productOrigCode)) &&
+                (params.productName === undefined || a.productName.includes(params.productName)) &&
+                (params.brandSn === undefined || a.brandSn === params.brandSn) &&
+                (params.productTypeSn2 === undefined || a.productTypeSn2 === params.productTypeSn2) &&
+                (params.warehouseSn === undefined || a.warehouseSn === params.warehouseSn) &&
+                (params.existStockFlag === undefined || a.existStockFlag === params.existStockFlag)
+              )
+            })
+
             return {
-              list: result,
+              list: ret,
               pageNo: 1,
               pageSize: _this.pageSize
             }
           })
       } else {
+        console.log(11)
         return querySumByProductLocation(params).then(res => {
           let data
           if (res.status == 200) {