Merge branch 'lin_fix' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

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

@@ -33,7 +33,7 @@ export default {
   },
   computed: {
     // 事件组合
-    optionsEvensGroup(){
+    optionsEvensGroup() {
       return [
         [
           [
@@ -607,7 +607,7 @@ export default {
                             }
                             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) => {
+                                peijianList({ isShowStockQty: true, websitId: val, "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }, { "param": "a.norm_type", "compare": "=", "value": "M" }] }).then((res) => {
                                   this.peijianList = res.data.records
                                 })
                               } else {
@@ -862,9 +862,9 @@ export default {
           (res) => { this.materialCategoryListL1 = res.data.records },
           (res) => { this.materialCategoryListL2 = res.data.records }
         ])
-      }else 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" }, { "param": "a.norm_type", "compare": "=", "value": "M" }] })
         ])
         runs.push(...[
           (res) => { this.peijianList = res.data.records },