Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -61,6 +61,7 @@
 <script>
 <script>
 import { getZsStartNo, getZsEndNo, zsff, getZsglInfo } from "@/api/zsgl.js"
 import { getZsStartNo, getZsEndNo, zsff, getZsglInfo } from "@/api/zsgl.js"
 import { getSysSerialSingle } from "@/api/sysSerial.js"
 import { getSysSerialSingle } from "@/api/sysSerial.js"
+import axios from "axios";
 export default {
 export default {
   props: {
   props: {
     formData: {
     formData: {
@@ -110,7 +111,7 @@ export default {
         digit: '5'
         digit: '5'
       },
       },
       //用户列表
       //用户列表
-      usernames: ['张三', '李四'],
+      usernames: [],
       rules: {
       rules: {
         batchNo: [
         batchNo: [
           { required: true, message: '入库编号不能为空', trigger: 'blur' }
           { required: true, message: '入库编号不能为空', trigger: 'blur' }
@@ -133,8 +134,22 @@ export default {
       this.ywhSerial();
       this.ywhSerial();
       this.initStartNo();
       this.initStartNo();
     }
     }
+    this.getreceiver()
   },
   },
   methods: {
   methods: {
+        //领取人列表
+    /**
+     * @description: 领取人列表
+     * @author: renchao
+     */
+    getreceiver(){
+      let url=window._config.services.management+"/management/rest/users?organizationId="+this.formData.organizationId
+    axios.get(url).then(res => {
+      res.data.content.forEach((item) => {
+        this.usernames.push(item.name)
+      })
+        })
+    },
     //表单提交
     //表单提交
     /**
     /**
      * @description: 表单提交
      * @description: 表单提交

@@ -46,8 +46,12 @@
 <script>
 <script>
   import table from "@/utils/mixin/table";
   import table from "@/utils/mixin/table";
   import { datas, sendThis } from "./zsffdata";
   import { datas, sendThis } from "./zsffdata";
+  import { mapGetters } from "vuex";
   import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js"
   import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js"
-  export default {
+ export default {
+  computed: {
+    ...mapGetters(["userInfo"]),
+  },
     name: "zsff",
     name: "zsff",
     mixins: [table],
     mixins: [table],
     mounted () {
     mounted () {
@@ -99,8 +103,10 @@
        * @author: renchao
        * @author: renchao
        */
        */
       openDialog (bsmBatch) {
       openDialog (bsmBatch) {
+        console.log("this.userInfo",this.userInfo);
         this.$popupDialog("证书分发", "zsgl/zsff/components/addDialog", {
         this.$popupDialog("证书分发", "zsgl/zsff/components/addDialog", {
-          bsmBatch: bsmBatch
+          bsmBatch: bsmBatch,
+          organizationId:this.userInfo.organizationId
         }, "50%")
         }, "50%")
       },
       },
       /**
       /**