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

src/views/oa/modules/SyCarryModal.vue

@@ -138,7 +138,8 @@
           </span>
           <!-- 计划员 -->
            <span slot="jhyByData" slot-scope="text, record, index">
-                 <a-select  v-model="record.jhyByData" style="width:100%" show-search :filterOption="filterOption" @change="handleChange(record)"> 
+                 <a-select  v-model="record.jhyByData" style="width:100%" mode="multiple"
+                  show-search :filterOption="filterOption" @change="handleChange(record)"> 
                       <a-select-option
                      v-for="(item,index) in jhyNameOption"
                      :key="index"
@@ -284,7 +285,7 @@
            {
             // title: '计划员',
             dataIndex: 'jhyByData',
-             width: '9%',
+             width: '13%',
              ellipsis: true,
              scopedSlots: { customRender: 'jhyByData' },
              className: 'replacecolor',
@@ -293,7 +294,7 @@
            {
             title: '签名',
             dataIndex: 'jhyName',
-            width: '9%',
+            width: '11%',
              ellipsis: true,
              className: 'replacecolor'
            },
@@ -338,6 +339,9 @@
         getAction('/oa/syCarry/querySyCarryBByMainId', {id:id}).then((res) => {
           if(res.success){
               res.result.map(item =>{
+              if(item.jhyByData !==''&& item.jhyByData){
+                item.jhyByData = item.jhyByData.split(",")
+              }
               if(item.orderDate !==''&& item.orderDate){
                 item.orderDate = moment(item.orderDate)
               }
@@ -373,7 +377,7 @@
       },
       //获取计划员
       getOption(){
-        personList().then(res => {
+        personList({pageSize:'9999'}).then(res => {
                     if (res.success) {
                       res.result.records.map(item =>{
                         this.jhyNameOption.push({label:item.realname,value:item.username})
@@ -445,6 +449,15 @@
          if(valid){
             var obj = this.formState
             this.syCarryBTable.dataSource.map(item=>{
+             
+             console.log('ssssssssssss',item.jhyByData.toString());
+              if(item.jhyByData!=''&&item.jhyByData){
+                
+                 // item.jhyByData.forEach(t => {
+                 //    console.log('ssssssssssss',t);
+                 // })
+                item.jhyByData = item.jhyByData.toString();
+              }
               if(item.orderDate!==''&&item.orderDate){
                 item.orderDate = moment(item.orderDate).format('YYYY-MM-DD HH:mm:ss');
               }
@@ -471,7 +484,7 @@
                        this.$message.warning(res.message)
                      }
                  })
-            }
+            } 
          }
          })
        

src/views/oa/my-plan/add/savePlan.vue

@@ -66,6 +66,18 @@
             </a-range-picker>
           </a-form-item>
         </a-col>
+         <a-col :span="12">
+          <a-form-item label="时间">
+            <!-- 有 时分秒 -->
+            <a-time-picker
+              style="width:100%"
+              showTime
+              @change="continueTimeChange"
+              v-decorator="['planTime', {}]"
+            >
+            </a-time-picker>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row :gutter="24">
         <!-- <a-col :span="12">
@@ -197,18 +209,33 @@ export default {
     methods: {
     // 回显表单的赋值
         getFormInfo (e) {
-            // console.log('点击日程ID>>', this.formData.id)
+            console.log('点击日程ID>>', this.formData.planTime)
             this.$nextTick(() => {
-                this.addForm.setFieldsValue({
-                    title: this.formData.title,
-                    type: this.formData.type,
-                    degreeOfUrgency: this.formData.degreeOfUrgency,
-                    backgroundColor: this.formData.backgroundColor,
-                    continue: [
-                        moment(this.formData.startTime, 'YYYY/MM/DD HH:mm'),
-                        moment(this.formData.endTime, 'YYYY/MM/DD HH:mm')
-                    ]
-                })
+                if(this.formData.planTime !='' && this.formData.planTime != null){
+                  this.addForm.setFieldsValue({
+                      title: this.formData.title,
+                      planTime: moment(this.formData.planTime, 'YYYY/MM/DD HH:mm:ss'),
+                      type: this.formData.type,
+                      degreeOfUrgency: this.formData.degreeOfUrgency,
+                      backgroundColor: this.formData.backgroundColor,
+                      continue: [
+                          moment(this.formData.startTime, 'YYYY/MM/DD HH:mm'),
+                          moment(this.formData.endTime, 'YYYY/MM/DD HH:mm')
+                      ]
+                  })
+                }else{
+                  this.addForm.setFieldsValue({
+                      title: this.formData.title,
+                      type: this.formData.type,
+                      degreeOfUrgency: this.formData.degreeOfUrgency,
+                      backgroundColor: this.formData.backgroundColor,
+                      continue: [
+                          moment(this.formData.startTime, 'YYYY/MM/DD HH:mm'),
+                          moment(this.formData.endTime, 'YYYY/MM/DD HH:mm')
+                      ]
+                  })
+                }
+                
                 this.$refs.JEditor.myValue = this.formData.memo
                 console.log('走到这')
             })
@@ -224,6 +251,9 @@ export default {
                     scheduleObject.degreeOfUrgency = values.degreeOfUrgency
                     scheduleObject.startTime = values.continue[0].format('YYYY-MM-DD HH:mm:ss')
                     scheduleObject.endTime = values.continue[1].format('YYYY-MM-DD HH:mm:ss')
+                    if(values.planTime != null && values.planTime !=''){
+                      scheduleObject.planTime = values.planTime.format('YYYY-MM-DD HH:mm:ss')
+                    }
                     scheduleObject.backgroundColor = values.backgroundColor
                     scheduleObject.memo = this.$refs.JEditor.myValue
                     // 编辑--------------------------------------------
@@ -235,12 +265,14 @@ export default {
                                 this.$message.success('修改成功')
                                 this.savePlanModalVisible = false
                                 this.addForm.resetFields() // 清空表单
+                                this.formData.id=''
                                 this.$refs.JEditor.myValue = '' // 清空富文本
                                 this.fatherMethod() // 调用父组件的查询方法
                             } else {
                                 this.$message.success('修改成功')
                                 this.savePlanModalVisible = false
                                 this.addForm.resetFields() // 清空表单
+                                this.formData.id=''
                                 this.$refs.JEditor.myValue = '' // 清空富文本
                                 this.calTableMethod() // 调用父组件的查询方法
                             }

src/views/system/modules/AddCertificateManagement.vue

@@ -75,6 +75,15 @@
                  </a-select>
                </a-form-model-item>
             </a-col> -->
+            
+            <a-col :md="8" :sm="8">
+              <a-form-model-item label="公开" prop="isOpen">
+                 <a-select v-model="formState.isOpen">
+                    <a-select-option value="是">是</a-select-option>
+                    <a-select-option value="否">否</a-select-option>
+                 </a-select>
+               </a-form-model-item>
+            </a-col>
           </a-row>
           <a-row :gutter="24">
              <a-col :md="24" :sm="8">
@@ -130,7 +139,8 @@ export default {
             formState:{
               endDate:'',
               beginDate:'',
-              isMessage:'1'
+              isMessage:'1',
+              isOpen:'是'
             },
             inputMethod:'select',
             fileList:[],
@@ -142,6 +152,7 @@ export default {
               code:[{required: true, message: '证件编号不能为空!'}],
               manageId:[{required: true, message: '管理人不能为空!'}],
               isMessage:[{required: true, message: '是否邮件通知不能为空!'}],
+              isOpen:[{required: true, message: '是否公开不能为空!'}],
               beginDate:[{required: true, message: '起始日期不能为空!'}],
               endDate:[{required: true, message: '到期时间不能为空!'}],
             },

src/views/system/modules/SelectUserModal.vue

@@ -22,7 +22,7 @@
             </a-col> -->
             <a-col :span="10">
               <a-form-item label="用户名称">
-                <a-input placeholder="请输入用户名称" v-model="queryParam.realname"></a-input>
+                <j-input placeholder="请输入用户名称" v-model="queryParam.realname"></j-input>
               </a-form-item>
             </a-col>
            <a-col :span="10">
@@ -66,12 +66,13 @@
 </template>
 
 <script>
+  import JInput from '@/components/jeecg/JInput'
   import {filterObj} from '@/utils/util'
   import {getAction} from '@/api/manage'
   import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
   export default {
     name: "SelectUserModal",
-    components: {JSearchSelectTag},
+    components: { JInput,JSearchSelectTag},
     data() {
       return {
         title: "添加已有用户",