Merge branch 'wsm' of http://139.196.39.194:9021/chenc/cd-work-flow-web into wsm

src/views/oa/ConferenceApplyList.vue

@@ -108,14 +108,19 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)" v-show="record.notified!='是'">编辑</a>
 
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-divider type="vertical"  v-show="record.notified!='是'"/>
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-show="record.notified!='是'">
                   <a>删除</a>
                 </a-popconfirm>
           <a-divider type="vertical" />
           <a @click="print(record)" :href="printMouldUrl"  target="_blank">打印</a>
+
+          <a-divider type="vertical" />
+          <a-popconfirm title="发送通知后不能再变更会议信息，确定通知与会人员吗?" @confirm="() => handleNotify(record.id)" v-show="record.notified!='是'">
+            <a>通知</a>
+          </a-popconfirm>
           <!-- <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -136,7 +141,7 @@
 </template>
 
 <script>
-
+  import { getAction } from '@/api/manage'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ConferenceApplyModal from './modules/ConferenceApplyModal'
   import JDate from '@/components/jeecg/JDate.vue'
@@ -244,6 +249,12 @@
             width:160,
             dataIndex: 'otherPerson'
           },
+          {
+            title:'已通知',
+            align:"center",
+            width:100,
+            dataIndex: 'notified'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -259,6 +270,7 @@
           deleteBatch: "/conferenceApply/conferenceApply/deleteBatch",
           exportXlsUrl: "/conferenceApply/conferenceApply/exportXls",
           importExcelUrl: "conferenceApply/conferenceApply/importExcel",
+          notify: "/conferenceApply/conferenceApply/notify",
         },
         dictOptions:{},
       }
@@ -278,7 +290,23 @@
       },
       print(record){
         this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834590233121345536'+'?id='+record.id
-      }
+      },
+      handleNotify: function (id) {
+        if(!this.url.notify){
+          this.$message.error("请设置url.notify!")
+          return
+        }
+        var that = this;
+        getAction(that.url.notify, {id: id}).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message);
+            that.loadData();
+          } else {
+            that.$message.warning(res.message);
+          }
+        });
+      },
+
     }
   }
 </script>

src/views/oa/modules/ConferenceApplyModal.vue

@@ -47,12 +47,12 @@
         </a-col>
         <a-col span="8">
           <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-date placeholder="请选择开始时间" @change="changeStartTime" v-decorator="[ 'startTime', validatorRules.startTime]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+            <j-date placeholder="请选择开始时间" @change="changeStartTime" v-decorator="[ 'startTime', validatorRules.startTime]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm" style="width: 100%"/>
           </a-form-item>
         </a-col>
         <a-col span="8">
           <a-form-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-date placeholder="请选择结束时间" @change="changeEndTime" v-decorator="[ 'endTime', validatorRules.endTime]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+            <j-date placeholder="请选择结束时间" @change="changeEndTime" v-decorator="[ 'endTime', validatorRules.endTime]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm" style="width: 100%"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -255,11 +255,11 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         console.log("this.model",this.model)
-        this.userIds = this.model.attendPerson;
+        this.userIds = this.model.attendPersonIds;
         this.userNames = this.model.attendPerson;
         this.orgCode = this.model.attendDept;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'conferenceTitle','postedPerson','postedDept','postedDate','conferenceDate','startTime','endTime','conferenceAddress','attendPerson','attendDept','otherPerson','conferenceContent','file','conferenceType'))
+          this.form.setFieldsValue(pick(this.model,'conferenceTitle','postedPerson','postedDept','postedDate','conferenceDate','startTime','endTime','conferenceAddress','attendPerson','attendPersonIds','attendDept','otherPerson','conferenceContent','file','conferenceType'))
         })
       },
       close () {
@@ -283,6 +283,7 @@
             }
             let formData = Object.assign(this.model, values);
             formData.attendPerson = this.userNames;
+            formData.attendPersonIds = this.userIds;
             formData.attendDept = this.orgCode;
             console.log("表单提交数据",formData)
             httpAction(httpurl,formData,method).then((res)=>{
@@ -329,7 +330,7 @@
         }
      },
       popupCallback(row){
-        this.form.setFieldsValue(pick(row,'conferenceTitle','postedPerson','postedDept','postedDate','conferenceDate','startTime','endTime','conferenceAddress','attendPerson','attendDept','otherPerson','conferenceContent','file'))
+        this.form.setFieldsValue(pick(row,'conferenceTitle','postedPerson','postedDept','postedDate','conferenceDate','startTime','endTime','conferenceAddress','attendPersonIds','attendPerson','attendDept','otherPerson','conferenceContent','file'))
       },
       selectOK(rows, idstr) {
         if (!rows) {