Merge remote-tracking branch 'origin/master' into master

src/views/admin/meeting/modules/TicketModal.vue

@@ -84,7 +84,7 @@
               </a-radio>
               <div>
                 <a-input-number v-if='value === 2' placeholder='发送数量' @change='clickNumber'
-                                v-decorator="['num',{rules: [{ required: true, message: '数量不能为空'}]}]"
+                                v-model='publicSendNum'
                                 style='margin-top: 20px;width: 200px' />
               </div>
             </a-radio-group>
@@ -229,12 +229,12 @@ export default {
         },
         {
           title: '企业负责人',
-          dataIndex: 'contacts',
+          dataIndex: 'contacts'
         },
         {
           title: '联系电话',
           dataIndex: 'phone'
-        },
+        }
       ],
       CompanyList: [],
       notSelectEnterpriseDataList: [],
@@ -247,7 +247,8 @@ export default {
       confirmLoading: false,
       mdl: {},
       queryParam: {},
-      form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      publicSendNum: 0
     }
   },
   beforeCreate() {
@@ -256,7 +257,7 @@ export default {
   },
   methods: {
     clickNumber(value) {
-      this.mdl.num = value
+      this.publicSendNum = value
       // 数值改变
       this.selectEnterpriseDataList.forEach(item => {
         if (!item.moreNum) {
@@ -277,9 +278,9 @@ export default {
       this.selectEnterpriseDataList = this.selectEnterpriseDataList.map(item => {
         if (item.id == this.ticketId) {
           console.log('this.ticketNum ', this.ticketNum)
-          console.log('this.mdl.num ', this.mdl.num)
+          console.log('this.publicSendNum ', this.publicSendNum)
           item.moreNum = this.ticketNum
-          item.sumNum = item.moreNum + this.mdl.num
+          item.sumNum = item.moreNum + this.publicSendNum
         }
         return item
       })
@@ -330,6 +331,9 @@ export default {
       this.mdl = Object.assign(record)
       this.visible = true
       if (record.id > 0) {
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.mdl, 'id', 'title', 'content', 'duration', 'type', 'money', 'address', 'isVerification', 'enterpriseIds', 'isShow', 'startTime', 'endDate', 'remark', 'isDefault', 'version', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
+        })
         get(record.id).then(res => {
           // 选择企业
           this.selectEnterpriseDataList = res.selectCustomerList
@@ -337,10 +341,16 @@ export default {
           // 未选中企业
           this.notSelectEnterpriseDataList = res.notSelectCustomerList
           // this.notSelectEnterpriseIdList = res.notSelectCustomerList.map(item => item.id)
+
+          if (res.num) { // 有限制
+            this.value = 2
+            this.publicSendNum = res.num
+            this.notSelectEnterpriseDataList.map(item => item.sumNum = res.num)
+          } else { // 无限制
+            this.value = 1
+          }
         })
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.mdl, 'id', 'title', 'content', 'duration', 'type', 'money', 'address', 'isVerification', 'enterpriseIds', 'isShow', 'startTime', 'endDate', 'remark', 'isDefault', 'version', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
-        })
+
       } else {
         // 查询企业
         getTicketByCompany().then(res => {