no message

src/views/auxiliaryFittings/purchasingManagement/mixins/form_tpl.js

@@ -604,11 +604,11 @@ export default {
                               this.formData['websitName'] = ''
                             }
                             if (~['partsStorage', 'partsReturn'].indexOf(this.pageType)) {
-                              if(val){
-                                peijianList({ isShowStockQty: true, websitId: val,  "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }] }).then((res) => { 
-                                  this.peijianList = res.data.records 
+                              if (val) {
+                                peijianList({ isShowStockQty: true, websitId: val, "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }] }).then((res) => {
+                                  this.peijianList = res.data.records
                                 })
-                              }else{
+                              } else {
                                 this.peijianList = []
                               }
                             }
@@ -829,16 +829,30 @@ export default {
 
       var req = [
         getWebsit({ type: "C", status: true }),
-        listPageV2({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }] })
       ]
 
       var runs = [
         (res) => { this.getWebsitList = res.data.filter(item => item.type == "C") },
-        (res) => { this.listPageV2Data = res.data.records }
       ]
 
       if (~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials'].indexOf(this.pageType)) {
         req.push(...[
+          listPageV2({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }, { "param": "a.vender_type", "compare": "=", "value": ["A", "M"] }] })
+        ])
+        runs.push(...[
+          (res) => { this.listPageV2Data = res.data.records }
+        ])
+      } else if (~['partsStorage', 'partsReturn'].indexOf(this.pageType)) {
+        req.push(...[
+          listPageV2({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }, { "param": "a.vender_type", "compare": "=", "value": ["P", "A"] }] })
+        ])
+        runs.push(...[
+          (res) => { this.listPageV2Data = res.data.records }
+        ])
+      }
+
+      if (~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials'].indexOf(this.pageType)) {
+        req.push(...[
           materialCategoryList({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }, { "param": "a.category_level", "compare": "=", "value": "1" }] }),
           materialCategoryList({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }, { "param": "a.category_level", "compare": "=", "value": "2" }] }),
         ])
@@ -846,10 +860,9 @@ export default {
           (res) => { this.materialCategoryListL1 = res.data.records },
           (res) => { this.materialCategoryListL2 = res.data.records }
         ])
-      }
-      if (~['partsStorage', 'partsReturn'].indexOf(this.pageType) && this.formData.websitId) {
+      }else if (~['partsStorage', 'partsReturn'].indexOf(this.pageType) && this.formData.websitId) {
         req.push(...[
-          peijianList({isShowStockQty: true, websitId: this.formData.websitId,   "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }] })
+          peijianList({ isShowStockQty: true, websitId: this.formData.websitId, "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }] })
         ])
         runs.push(...[
           (res) => { this.peijianList = res.data.records },