Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

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

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml

@@ -53,6 +53,7 @@
         <result column="order_main_unit_name" property="orderMainUnitName"/>
         <result column="sales_main_unit_id" property="salesMainUnitId"/>
         <result column="sales_main_unit_name" property="salesMainUnitName"/>
+        <result column="business_line_id_arr" property="businessLineIdArr"/>
         <result column="input_tax_rate" property="inputTaxRate"/>
         <result column="output_tax_rate" property="outputTaxRate"/>
         <result column="productId" property="productId"/>
@@ -71,8 +72,12 @@
             a.order_main_unit_id, JgFnUnitArrName(a.order_main_unit_id) as order_main_unit_name,
             a.sales_main_unit_id, JgFnUnitArrName(a.sales_main_unit_id) as sales_main_unit_name,
             a.input_tax_rate,
-            a.output_tax_rate
-        FROM jg_product a ${ew.customSqlSegment}
+            a.output_tax_rate,
+            b.business_line_id as business_line_id_arr
+        FROM jg_product a LEFT JOIN jg_product_business b ON a.id = b.product_id ${ew.customSqlSegment}
+        <if test="productWarehousePagination.businessLineIdArr != null and productWarehousePagination.businessLineIdArr != ''">
+            WHERE b.business_line_id like CONCAT('%',${productWarehousePagination.businessLineIdArr},'%')
+        </if>
         <if test="productWarehousePagination.sidx != null and productWarehousePagination.sidx != ''">
             ORDER BY ${productWarehousePagination.sidx} ${productWarehousePagination.sort}
         </if>

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-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java

@@ -296,5 +296,7 @@ public class ProductWarehouseEntity  {
     private String orderMainUnitName;
     @TableField(exist = false)
     private String salesMainUnitName;
+    @TableField(exist = false)
+    private String businessLineIdArr;
 
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/productwarehouse/ProductWarehousePagination.java

@@ -33,6 +33,9 @@ public class ProductWarehousePagination extends Pagination {
     /** 商品名称 */
     @JsonProperty("name")
     private Object name;
+    /** 业务线 */
+    @JsonProperty("businessLineIdArr")
+    private Object businessLineIdArr;
     /** 商品类型 */
     @JsonProperty("productTypeId")
     private Object productTypeId;

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/contractL/form.vue

@@ -1076,10 +1076,7 @@
                         changeData('contractlcommodity-taxRate', scope.$index)
                       "
                       placeholder="请输入"
-                      :disabled="
-                        judgeWrite('contractlcommodityList') ||
-                          judgeWrite('contractlcommodityList-taxRate')
-                      "
+                      :disabled="true"
                       clearable
                       addonAfter="%"
                       :style="{ width: '100%' }"
@@ -2430,7 +2427,6 @@ export default {
   },
   watch: {
     // "dataForm.contractType": function(val, oldVal) {
-    //   console.log(val);
     //   this.dataForm.subject = undefined;
     //   this.dataForm.subject2 = undefined;
     //   this.dataForm.subject3 = undefined;
@@ -2574,17 +2570,35 @@ export default {
             break;
         }
         this.dataForm.contractLCommodityList.push(item);
+        let filterArr = [];
+        this.dataForm.contractLCommodityList = this.dataForm.contractLCommodityList.filter(
+          val => {
+            if (filterArr.includes(val.commodityCode + val.procureUnit)) {
+              return false;
+            } else {
+              filterArr.push(val.commodityCode + val.procureUnit);
+              return true;
+            }
+          }
+        );
       }
     },
     choiceRaw() {
       this.BomgoodsBoxRawVisible = true;
-      // console.log('55555', this.dataForm.workOrderProductList)
       let excludeIdList = [];
       for (let i = 0; i < this.dataForm.contractLCommodityList.length; i++) {
         excludeIdList.push(this.dataForm.contractLCommodityList[i].productId);
       }
       this.$nextTick(() => {
-        this.$refs.BomGoodsRawBox.init(excludeIdList);
+        if (!this.dataForm.businessId) {
+          this.$message({
+            message: "请先选择业务线",
+            type: "error",
+            duration: 1000
+          });
+          return;
+        }
+        this.$refs.BomGoodsRawBox.init(excludeIdList, this.dataForm.businessId);
       });
     },
     chgContractType() {
@@ -2600,6 +2614,7 @@ export default {
       this.dataForm.subject = undefined;
       this.dataForm.subject2 = undefined;
       this.dataForm.subject3 = undefined;
+      this.dataForm.contractLCommodityList = [];
       this.paramListSubject11[2]["defaultValue"] = this.dataForm.businessId;
       this.paramListSubject21[2]["defaultValue"] = this.dataForm.businessId;
       this.paramListSubject12[2]["defaultValue"] = this.dataForm.businessId;
@@ -2677,16 +2692,12 @@ export default {
               this.dataForm.contractLCommodityList[index][
                 "contractlcommodityprocureUnitOptions"
               ] = procureUnitOptionsArr;
-              // console.log(procureUnitOptionsArr)
-              // this.contractlcommodityprocureUnitOptions = procureUnitOptionsArr
             }
           })
           .catch(() => {});
       }
     },
     changeData(model, index) {
-      console.log("changeData:");
-      console.log(model);
       this.fnChgTotalRate();
       if (model == "contractlcommodity-productId") {
         this.getProductInfoChg(index);
@@ -2697,6 +2708,19 @@ export default {
       if (model == "businessId") {
         this.chgBusinessId();
       }
+      if (model == "contractlcommodity-procureUnit") {
+        let filterArr = [];
+        this.dataForm.contractLCommodityList = this.dataForm.contractLCommodityList.filter(
+          val => {
+            if (filterArr.includes(val.commodityCode + val.procureUnit)) {
+              return false;
+            } else {
+              filterArr.push(val.commodityCode + val.procureUnit);
+              return true;
+            }
+          }
+        );
+      }
       this.isEdit = false;
       this.childIndex = index;
       let modelAll = model.split("-");
@@ -2832,7 +2856,6 @@ export default {
           });
           return;
         }
-        console.log(e);
       }
       return isOk;
     },

jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue

@@ -1151,6 +1151,13 @@ export default {
             message: "请输入",
             trigger: "blur"
           }
+        ],
+        jnpf_jg_product_business_jnpf_businessLineId: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "change"
+          }
         ]
       },
       productTypeIdOptions: [],

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

@@ -90,7 +90,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

@@ -99,23 +99,28 @@ export default {
         currentPage: 1,
         pageSize: 20,
         sort: "desc",
-        sidx: ""
+        sidx: "",
+        businessLineIdArr: ""
       },
-      excludeIdList: [],
       checked: []
     };
   },
   methods: {
-    init(excludeIdList, val) {
+    init(excludeIdList, business_line_id) {
       this.visible = true;
       this.listLoading = true;
-      if (excludeIdList) {
+      if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
+        if (!excludeIdList.page) {
+          this.listQuery.businessLineIdArr = business_line_id;
         }
+      }
+      console.log(this.listQuery);
       let query = {
         ...this.listQuery,
         dataType: 0,
         keyword: this.keyword,
+        excludeIdList: this.excludeIdList,
         type: 1
       };
       request({
@@ -149,7 +154,6 @@ export default {
       this.$emit("refreshDataList", this.checked);
     },
     handleSelectionChange(val) {
-      console.log(val);
       this.checked = val;
     }
   }

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,8 +125,8 @@ 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`,
           method: 'post',