4月17问题修改

jnpf-java-boot/jnpf-permission/jnpf-permission-controller/src/main/java/jnpf/permission/controller/UserController.java

@@ -420,6 +420,7 @@ public class UserController extends SuperController<UserService, UserEntity> {
                 }
             }
             ListVO<UserSelectorVO> vo = new ListVO<>();
+            jsonToList = jsonToList.stream().filter(json -> !StringUtil.equals(json.getFullName(), "管理员/admin")).collect(Collectors.toList());
             vo.setList(jsonToList);
             return ActionResult.success(vo);
         }

jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/ProductGoodsBox.vue

@@ -85,7 +85,7 @@ export default {
     init(excludeIdList) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue

@@ -70,7 +70,7 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('customerStarRating')">
             <jnpf-form-tip-item label="客户星级" v-if="judgeShow('customerStarRating')" prop="customerStarRating">
-              <JnpfSelect v-model="dataForm.customerStarRating" @change="changeData('customerStarRating', -1)"
+              <JnpfSelect v-model="dataForm.customerStarRating" @change="customerStarRatingChangeData"
                 placeholder="请选择" :disabled="judgeWrite('customerStarRating')" clearable :style='{ "width": "100%" }'
                 :options="customerStarRatingOptions" :props="customerStarRatingProps">
               </JnpfSelect>
@@ -560,7 +560,7 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('settlementMethod')">
             <jnpf-form-tip-item label="结算方式" v-if="judgeShow('settlementMethod')" prop="settlementMethod">
-              <JnpfRadio v-model="dataForm.settlementMethod" @change="changeData('settlementMethod', -1)"
+              <JnpfRadio v-model="dataForm.settlementMethod" @change="settlementMethodChangeData"
                 :disabled="judgeWrite('settlementMethod')" optionType="default" direction="horizontal"
                 :style='{ "width": "100%" }' size="default" :options="settlementMethodOptions"
                 :props="settlementMethodProps">
@@ -2159,6 +2159,40 @@ export default {
   },
   mounted() { },
   methods: {
+    customerStarRatingChangeData(){
+      let settlementMethodName = this.settlementMethodOptions.filter((item)=>{
+          if(this.dataForm.settlementMethod==item.id){
+            		return item.fullName
+      		}
+      })
+      let customerStarRatingName = this.customerStarRatingOptions.filter((item)=>{
+          if(this.dataForm.customerStarRating==item.id){
+            		return item.fullName
+      		}
+      })
+      this.defaultAccountPeriodRules.forEach(item => {
+        if (customerStarRatingName[0].fullName == item.creditRating && item.settlementType == settlementMethodName[0].fullName) {
+          this.defaultAccountPeriod = item;
+        }
+      });
+    },
+    settlementMethodChangeData(){
+      let settlementMethodName = this.settlementMethodOptions.filter((item)=>{
+          if(this.dataForm.settlementMethod==item.id){
+            		return item.fullName
+      		}
+      })
+      let customerStarRatingName = this.customerStarRatingOptions.filter((item)=>{
+          if(this.dataForm.customerStarRating==item.id){
+            		return item.fullName
+      		}
+      })
+      this.defaultAccountPeriodRules.forEach(item => {
+        if (customerStarRatingName[0].fullName == item.creditRating && item.settlementType == settlementMethodName[0].fullName) {
+          this.defaultAccountPeriod = item;
+        }
+      });
+    },
     changeData(model, index) {
       this.isEdit = false
       this.childIndex = index
@@ -2553,18 +2587,21 @@ export default {
       queryDefaultAccountPeriodRules('1').then(res => {
         if (res.data.tableField102) {
           this.defaultAccountPeriodRules = res.data.tableField102
-          var customerStarRating = this.dataForm.customerStarRating
-          if (this.dataForm.customerStarRating == '517682428312028165') {
-            this.defaultAccountPeriod = res.data.tableField102[0]
-          } else if (this.dataForm.customerStarRating == '517682463938446341') {
-            this.defaultAccountPeriod = res.data.tableField102[1]
-          } else if (this.dataForm.customerStarRating == '517682488533844997') {
-            this.defaultAccountPeriod = res.data.tableField102[2]
-          } else if (this.dataForm.customerStarRating == '517682518925771781') {
-            this.defaultAccountPeriod = res.data.tableField102[3]
-          } else if (this.dataForm.customerStarRating == '517682574965867525') {
-            this.defaultAccountPeriod = res.data.tableField102[4]
+          let settlementMethodName = this.settlementMethodOptions.filter((item)=>{
+              if(this.dataForm.settlementMethod==item.id){
+                		return item.fullName
           		}
+          })
+          let customerStarRatingName = this.customerStarRatingOptions.filter((item)=>{
+              if(this.dataForm.customerStarRating==item.id){
+                		return item.fullName
+          		}
+          })
+          this.defaultAccountPeriodRules.forEach(item => {
+            if (customerStarRatingName[0].fullName == item.creditRating && item.settlementType == settlementMethodName[0].fullName) {
+              this.defaultAccountPeriod = item;
+            }
+          });
         } else {
           this.$confirm('请先配置账期规则', '提示', {
             showCancelButton: false, //是否显示取消按钮

jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/Warehousingstorageoutbound.vue

@@ -74,7 +74,7 @@ export default {
     init(excludeIdList) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementaccountList.vue

@@ -83,25 +83,25 @@ export default {
     init(excludeIdList, accountSubjectName, contractCode, accountState) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
-      if (accountSubjectName) {
+      if (accountSubjectName && typeof(accountSubjectName) == 'string') {
         this.accountSubjectName = accountSubjectName;
       }
-      if (contractCode) {
+      if (contractCode && typeof(contractCode) == 'string') {
         this.contractCode = contractCode;
       }
-      if (accountState) {
+      if (accountState && typeof(accountState) == 'string') {
         this.accountState = accountState;
       }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
-        accountSubjectName: accountSubjectName,
-        contractCode: contractCode,
-        accountState: accountState,
+        accountSubjectName: this.accountSubjectName,
+        contractCode: this.contractCode,
+        accountState: this.accountState,
         dataType: 0,
         queryFlowTaskPass: '1'//查询审批通过的
       }

jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementcostList.vue

@@ -100,10 +100,10 @@ export default {
     init(excludeIdList, subjectId) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
-      if (subjectId) {
+      if (subjectId && typeof(subjectId) == 'string') {
         this.subjectId = subjectId;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue

@@ -70,7 +70,7 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('customerStarRating')">
             <jnpf-form-tip-item label="服务商星级" v-if="judgeShow('customerStarRating')" prop="customerStarRating">
-              <JnpfSelect v-model="dataForm.customerStarRating" @change="changeData('customerStarRating',-1)"
+              <JnpfSelect v-model="dataForm.customerStarRating" @change="customerStarRatingChangeData"
                 placeholder="请选择" :disabled="judgeWrite('customerStarRating')" clearable :style='{"width":"100%"}'
                 :options="customerStarRatingOptions" :props="customerStarRatingProps">
               </JnpfSelect>
@@ -548,7 +548,7 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('settlementMethod')">
             <jnpf-form-tip-item label="结算方式" v-if="judgeShow('settlementMethod')" prop="settlementMethod">
-              <JnpfRadio v-model="dataForm.settlementMethod" @change="changeData('settlementMethod',-1)"
+              <JnpfRadio v-model="dataForm.settlementMethod" @change="settlementMethodChangeData"
                 :disabled="judgeWrite('settlementMethod')" optionType="default" direction="horizontal"
                 :style='{"width":"100%"}' size="default" :options="settlementMethodOptions"
                 :props="settlementMethodProps">
@@ -2107,6 +2107,40 @@
     },
     mounted() {},
     methods: {
+      customerStarRatingChangeData(){
+        let settlementMethodName = this.settlementMethodOptions.filter((item)=>{
+            if(this.dataForm.settlementMethod==item.id){
+                  return item.fullName
+            }
+        })
+        let customerStarRatingName = this.customerStarRatingOptions.filter((item)=>{
+            if(this.dataForm.customerStarRating==item.id){
+                  return item.fullName
+            }
+        })
+        this.defaultAccountPeriodRules.forEach(item => {
+          if (customerStarRatingName[0].fullName == item.creditRating && item.settlementType == settlementMethodName[0].fullName) {
+            this.defaultAccountPeriod = item;
+          }
+        });
+      },
+      settlementMethodChangeData(){
+        let settlementMethodName = this.settlementMethodOptions.filter((item)=>{
+            if(this.dataForm.settlementMethod==item.id){
+                  return item.fullName
+            }
+        })
+        let customerStarRatingName = this.customerStarRatingOptions.filter((item)=>{
+            if(this.dataForm.customerStarRating==item.id){
+                  return item.fullName
+            }
+        })
+        this.defaultAccountPeriodRules.forEach(item => {
+          if (customerStarRatingName[0].fullName == item.creditRating && item.settlementType == settlementMethodName[0].fullName) {
+            this.defaultAccountPeriod = item;
+          }
+        });
+      },
       changeData(model, index) {
         this.isEdit = false
         this.childIndex = index
@@ -2501,18 +2535,21 @@
         queryDefaultAccountPeriodRules('3').then(res => {
           if(res.data.tableField102){
             this.defaultAccountPeriodRules = res.data.tableField102
-            var customerStarRating = this.dataForm.customerStarRating
-            if(this.dataForm.customerStarRating == '517682428312028165'){
-              this.defaultAccountPeriod = res.data.tableField102[0]
-            }else if(this.dataForm.customerStarRating == '517682463938446341'){
-              this.defaultAccountPeriod = res.data.tableField102[1]
-            }else if(this.dataForm.customerStarRating == '517682488533844997'){
-              this.defaultAccountPeriod = res.data.tableField102[2]
-            }else if(this.dataForm.customerStarRating == '517682518925771781'){
-              this.defaultAccountPeriod = res.data.tableField102[3]
-            }else if(this.dataForm.customerStarRating == '517682574965867525'){
-              this.defaultAccountPeriod = res.data.tableField102[4]
+            let settlementMethodName = this.settlementMethodOptions.filter((item)=>{
+                if(this.dataForm.settlementMethod==item.id){
+                      return item.fullName
                 }
+            })
+            let customerStarRatingName = this.customerStarRatingOptions.filter((item)=>{
+                if(this.dataForm.customerStarRating==item.id){
+                      return item.fullName
+                }
+            })
+            this.defaultAccountPeriodRules.forEach(item => {
+              if (customerStarRatingName[0].fullName == item.creditRating && item.settlementType == settlementMethodName[0].fullName) {
+                this.defaultAccountPeriod = item;
+              }
+            });
           }else{
             this.$confirm('请先配置账期规则', '提示', {
               showCancelButton: false, //是否显示取消按钮

jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue

@@ -70,7 +70,7 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('customerStarRating')">
             <jnpf-form-tip-item label="供应商星级" v-if="judgeShow('customerStarRating') && dataForm.calssify != 3" prop="customerStarRating">
-              <JnpfSelect v-model="dataForm.customerStarRating" @change="changeData('customerStarRating',-1)"
+              <JnpfSelect v-model="dataForm.customerStarRating" @change="customerStarRatingChangeData"
                 placeholder="请选择" :disabled="judgeWrite('customerStarRating')" clearable :style='{"width":"100%"}'
                 :options="customerStarRatingOptions" :props="customerStarRatingProps">
               </JnpfSelect>
@@ -548,7 +548,7 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('settlementMethod')">
             <jnpf-form-tip-item label="结算方式" v-if="judgeShow('settlementMethod')" prop="settlementMethod">
-              <JnpfRadio v-model="dataForm.settlementMethod" @change="changeData('settlementMethod',-1)"
+              <JnpfRadio v-model="dataForm.settlementMethod" @change="settlementMethodChangeData"
                 :disabled="judgeWrite('settlementMethod')" optionType="default" direction="horizontal"
                 :style='{"width":"100%"}' size="default" :options="settlementMethodOptions"
                 :props="settlementMethodProps">
@@ -2107,6 +2107,40 @@
     },
     mounted() {},
     methods: {
+      customerStarRatingChangeData(){
+        let settlementMethodName = this.settlementMethodOptions.filter((item)=>{
+            if(this.dataForm.settlementMethod==item.id){
+                  return item.fullName
+            }
+        })
+        let customerStarRatingName = this.customerStarRatingOptions.filter((item)=>{
+            if(this.dataForm.customerStarRating==item.id){
+                  return item.fullName
+            }
+        })
+        this.defaultAccountPeriodRules.forEach(item => {
+          if (customerStarRatingName[0].fullName == item.creditRating && item.settlementType == settlementMethodName[0].fullName) {
+            this.defaultAccountPeriod = item;
+          }
+        });
+      },
+      settlementMethodChangeData(){
+        let settlementMethodName = this.settlementMethodOptions.filter((item)=>{
+            if(this.dataForm.settlementMethod==item.id){
+                  return item.fullName
+            }
+        })
+        let customerStarRatingName = this.customerStarRatingOptions.filter((item)=>{
+            if(this.dataForm.customerStarRating==item.id){
+                  return item.fullName
+            }
+        })
+        this.defaultAccountPeriodRules.forEach(item => {
+          if (customerStarRatingName[0].fullName == item.creditRating && item.settlementType == settlementMethodName[0].fullName) {
+            this.defaultAccountPeriod = item;
+          }
+        });
+      },
       changeData(model, index) {
         this.isEdit = false
         this.childIndex = index
@@ -2501,18 +2535,21 @@
         queryDefaultAccountPeriodRules('2').then(res => {
           if(res.data.tableField102){
             this.defaultAccountPeriodRules = res.data.tableField102
-            var customerStarRating = this.dataForm.customerStarRating
-            if(this.dataForm.customerStarRating == '517682428312028165'){
-              this.defaultAccountPeriod = res.data.tableField102[0]
-            }else if(this.dataForm.customerStarRating == '517682463938446341'){
-              this.defaultAccountPeriod = res.data.tableField102[1]
-            }else if(this.dataForm.customerStarRating == '517682488533844997'){
-              this.defaultAccountPeriod = res.data.tableField102[2]
-            }else if(this.dataForm.customerStarRating == '517682518925771781'){
-              this.defaultAccountPeriod = res.data.tableField102[3]
-            }else if(this.dataForm.customerStarRating == '517682574965867525'){
-              this.defaultAccountPeriod = res.data.tableField102[4]
+            let settlementMethodName = this.settlementMethodOptions.filter((item)=>{
+                if(this.dataForm.settlementMethod==item.id){
+                      return item.fullName
                 }
+            })
+            let customerStarRatingName = this.customerStarRatingOptions.filter((item)=>{
+                if(this.dataForm.customerStarRating==item.id){
+                      return item.fullName
+                }
+            })
+            this.defaultAccountPeriodRules.forEach(item => {
+              if (customerStarRatingName[0].fullName == item.creditRating && item.settlementType == settlementMethodName[0].fullName) {
+                this.defaultAccountPeriod = item;
+              }
+            });
           }else{
             this.$confirm('请先配置账期规则', '提示', {
               showCancelButton: false, //是否显示取消按钮

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/AllProductBox.vue

@@ -85,7 +85,7 @@ export default {
     init(excludeIdList) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/BomProductGoodsBox.vue

@@ -87,6 +87,7 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      val: '',
       checked: []
     }
   },
@@ -94,15 +95,18 @@ export default {
     init(excludeIdList, val) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (val && typeof(val) == 'string') {
+        this.val = val;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
-        id: val,
+        id: this.val,
       }
       /* GoodsList(query).then(res => {
         this.list = res.data.list

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/BomProductGoodsBoxOnly.vue

@@ -75,6 +75,7 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      val: '',
       checked: [],
       multipleTable: []
     }
@@ -83,15 +84,18 @@ export default {
     init(excludeIdList, val) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (val && typeof(val) == 'string') {
+        this.val = val;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
-        id: val,
+        id: this.val,
       }
 
       request({

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/BusinesslineGoodsBox.vue

@@ -93,7 +93,7 @@ export default {
     init(excludeIdList) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ClassTeamGoodsBox.vue

@@ -72,7 +72,7 @@ export default {
     init(excludeIdList) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ClassTimeGoodsBox.vue

@@ -71,7 +71,7 @@ export default {
     init(excludeIdList) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/DriverGoodsBox.vue

@@ -69,7 +69,7 @@ export default {
     init(excludeIdList) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/InspectionVoucher.vue

@@ -71,6 +71,7 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      val: '',
       checked: []
     }
   },
@@ -79,15 +80,18 @@ export default {
       console.log(val);
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (val && typeof(val) == 'string') {
+        this.val = val;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
-        documentType: val,
+        documentType: this.val,
 
       }
       /* GoodsList(query).then(res => {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/InspectionVoucherOnly.vue

@@ -73,6 +73,7 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      val: '',
       checked: []
     }
   },
@@ -80,15 +81,18 @@ export default {
     init(excludeIdList, val) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (val && typeof(val) == 'string') {
+        this.val = val;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
-        documentType: val,
+        documentType: this.val,
 
       }
       /* GoodsList(query).then(res => {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/InventoryProductGoodsBox.vue

@@ -76,6 +76,8 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      var: '',
+      var1: '',
       checked: []
     }
   },
@@ -83,16 +85,22 @@ export default {
     init(excludeIdList, val, val1) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (val && typeof(val) == 'string') {
+        this.val = val;
+      }
+      if (val1 && typeof(val1) == 'string') {
+        this.val1 = val1;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
-        warehouseId: val,
-        cargoId: val1,
+        warehouseId: this.val,
+        cargoId: this.val1,
         name: this.keyword,
       }
       request({

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucher.vue

@@ -71,6 +71,7 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      var: '',
       checked: []
     }
   },
@@ -79,15 +80,18 @@ export default {
       console.log(val);
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (val && typeof(val) == 'string') {
+        this.val = val;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
-        notId: val,
+        notId: this.val,
 
       }
       /* GoodsList(query).then(res => {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue

@@ -71,6 +71,7 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      var: '',
       checked: []
     }
   },
@@ -79,15 +80,18 @@ export default {
       console.log(val);
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (val && typeof(val) == 'string') {
+        this.val = val;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
-        notId: val,
+        notId: this.val,
 
       }
       /* GoodsList(query).then(res => {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductByContractBox.vue

@@ -94,7 +94,7 @@ export default {
     init(excludeIdList, val) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductGoodsBox.vue

@@ -86,7 +86,7 @@
       init(excludeIdList) {
         this.visible = true
         this.listLoading = true
-        if(excludeIdList){
+        if (excludeIdList && excludeIdList instanceof Array) {
           this.excludeIdList = excludeIdList;
         }
         let query = {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue

@@ -109,13 +109,14 @@ export default {
     init(excludeIdList, val) {
       this.visible = true;
       this.listLoading = true;
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {
         ...this.listQuery,
         dataType: 0,
         keyword: this.keyword,
+        excludeIdList: this.excludeIdList,
         type: 1
       };
       request({

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ReportlossProductGoodsBox.vue

@@ -77,6 +77,7 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      val: '',
       checked: []
     }
   },
@@ -84,15 +85,18 @@ export default {
     init(excludeIdList, val) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (val && typeof(val) == 'string') {
+        this.val = val;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
-        id: val,
+        id: this.val,
       }
       request({
         url: `/api/scm/ProductWarehouse/postInventoryReportlossProductlist`,

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VehicleGoodsBox.vue

@@ -76,7 +76,7 @@ export default {
     init(excludeIdList) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
       let query = {

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue

@@ -71,6 +71,11 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      val: '',
+      val2: '',
+      val3: '',
+      businessId: '',
+      type: '',
       checked: []
     }
   },
@@ -78,20 +83,38 @@ export default {
     init(excludeIdList, val, val2, val3, businessId, type) {
       this.visible = true
       this.listLoading = true
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (val && typeof(val) == 'string') {
+        this.val = val;
+      }
+      if (val1 && typeof(val1) == 'string') {
+        this.val1 = val1;
+      }
+      if (val2 && typeof(val2) == 'string') {
+        this.val2 = val2;
+      }
+      if (val3 && typeof(val3) == 'string') {
+        this.val3 = val3;
+      }
+      if (businessId && typeof(businessId) == 'string') {
+        this.businessId = businessId;
+      }
+      if (type && typeof(type) == 'string') {
+        this.type = type;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
-        businessType: val,
-        documentType: val2,
-        productIdList: val3,
-        businessOrderId: businessId,
+        businessType: this.val,
+        documentType: this.val2,
+        productIdList: this.val3,
+        businessOrderId: this.businessId,
       }
-      if (type == '1') {
+      if (this.type == '1') {
         //收货订单获取凭证列表和关联的商品
         request({
           url: `/api/scm/Voucher/getVoucherList`,
@@ -102,7 +125,7 @@ export default {
           this.listLoading = false
           this.total = res.data.pagination.total
         })
-      } else if (type == '2') {
+      } else if (this.type == '2') {
         //退货订单获取凭证列表和关联的商品
         request({
           url: `/api/scm/Voucher/returnOrderGetVoucherList`,