Merge remote-tracking branch 'origin/master'

jero-web/src/common/lang/en-us.js

@@ -707,6 +707,7 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'enclosure',
   // 认证
+  checkTheDeadline: 'Select the collection deadline of the parameter item',
   accountNumber: 'account Number',
   fullName: 'full Name',
   configurationInformation: 'configuration Information',

jero-web/src/common/lang/zh-cn.js

@@ -717,6 +717,7 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  checkTheDeadline: '选中参数项收集截止时间',
   accountNumber: '账号',
   fullName: '姓名',
   configurationInformation: '配置信息',

jero-web/src/components/TaskCutOffTime/index.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading'>
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='form'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter='24'>
+          <a-col :span='24'>
+            <a-form-model-item ref='paramsTemplateName' :label="$t('checkTheDeadline')" prop='paramsTemplateName'>
+              <a-date-picker show-time :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class='drawer-bootom-button'>
+      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
+      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+import axios from 'axios'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+import moment from 'moment'
+import eventBUs from '../../common/event'
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      loading: false,
+      editId: '',
+      newVisible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      rules: {},
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      selectedRowKeys: [],
+      pageNo: 1,
+      pageSize: 10,
+      pickerDate: '',
+    }
+  },
+  props: {
+    selectedRowKeysArray: {
+      type: String,
+      default: '',
+      require: true
+    }
+  },
+  mounted() {
+    this.loadData()
+  },
+  methods: {
+    loadData() {
+      this.loading = true
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.form
+      }
+      getAction(`sys/user/page`, params).then(res => {
+        if (res.success) {
+          this.areaTable = [...res.result.records]
+          this.total = res.result.total
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    searchReset() {
+      this.form = {}
+      this.loadData()
+    },
+    handleCancel() {
+      this.$emit('areaVisibleTaskCutOffTimeflag', false)
+    },
+    handleTableChange(val) {
+    },
+    //新增
+    handleSubmit() {
+      let _this = this
+        let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, }
+      postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => {
+        if (res.success) {
+          this.loadData()
+          this.$emit('areaVisibleTaskCutOffTimeflag', false)
+          this.$message.success(res.message)
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    onChange(val) {
+      this.pickerDate = moment(val).format('YYYY-MM-DD HH:mm:ss')
+    },
+    onOk(val) {
+      this.pickerDate = moment(val).format('YYYY-MM-DD HH:mm:ss')
+    },
+  }
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+.page{
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 20px;
+}
+</style>

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -83,6 +83,11 @@
             <a-icon type="bulb"/>
             {{$t('CompulsoryWithdrawal')}}
           </div>
+          <!--      截止时间-->
+          <div @click="TaskCutOffTime" class="operator-text-title">
+            <a-icon type="bulb"/>
+            {{$t('TaskCutOffTime')}}
+          </div>
         </template>
         <div class="operator-text" style="position: relative">
           <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
@@ -163,6 +168,10 @@
     <a-modal v-model="areaVisibleAssignedby" :title="$t('Assignedby')" width='950px' :footer="null">
       <assigned-by v-if='areaVisibleAssignedby' :selectedRowKeysArray='selectedRowKeysArray' @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag'/>
     </a-modal>
+    <!--  截至时间--->
+    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('TaskCutOffTime')" width='650px' :footer="null">
+      <task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray' @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
+    </a-modal>
   </a-card>
 </template>
 
@@ -170,16 +179,19 @@
 import TableCollection from '@/components/tableCollection/index'
 import { getAction,postAction } from '../../../api/manage'
 import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
+import TaskCutOffTime from '@/components/TaskCutOffTime/index'
 import AssignedBy from '@/components/AssignedBy/index'
 import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import Vue from 'vue'
+import moment from 'moment'
 export default {
   name: 'ParameterItemCollectionList',
   components:{
     TableCollection,
     ParameterLibraryAdd,
-    AssignedBy
+    AssignedBy,
+    TaskCutOffTime
   },
   data(){
     return{
@@ -263,6 +275,7 @@ export default {
       Dateline: {},
       areaVisibleFreeze: false, // 冻结配置
       areaVisibleAssignedby: false, // 分配填写人弹框
+      areaVisibleTaskCutOffTime: false, // 截至时间弹框
       wrapperCol: {
         xs: { span: 24 },
         sm: { span: 14 }
@@ -566,9 +579,18 @@ export default {
     assignedBy() {
       this.areaVisibleAssignedby = true
     },
+    // 分配填写人确定后弹框关闭
     areaVisibleAssignedbyflag(val) {
       this.areaVisibleAssignedby = val
     },
+    // 截止时间
+    TaskCutOffTime() {
+      this.areaVisibleTaskCutOffTime = true
+    },
+    // 截至时间确定弹框关闭
+    areaVisibleTaskCutOffTimeflag(val) {
+      this.areaVisibleTaskCutOffTime = val
+    },
     handleModule() {
 
     },