Merge remote-tracking branch 'origin/master'

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

@@ -708,6 +708,8 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'enclosure',
   // 认证
+  from: 'from',
+  ReferenceTo: 'Reference To',
   checkTheDeadline: 'Select the collection deadline of the parameter item',
   accountNumber: 'account Number',
   fullName: 'full Name',

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

@@ -718,6 +718,8 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  from: '从',
+  ReferenceTo: '引用到',
   checkTheDeadline: '选中参数项收集截止时间',
   accountNumber: '账号',
   fullName: '姓名',

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

@@ -10,49 +10,27 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-          <a-col :span='9'>
+          <a-col :span='20'>
-            <a-form-model-item ref='paramsTemplateName' :label="$t('fullName')" prop='paramsTemplateName'>
+            <a-form-model-item ref='paramsTemplateName' :label="$t('from')" prop='paramsTemplateName'>
-              <a-input
+              <div style='display: flex'>
-                v-model='form.realname' />
+                <a-input
+                  v-model='form.realname' />
+                <div style='width: 60px'>&nbsp;&nbsp;&nbsp;&nbsp;配置</div>
+              </div>
             </a-form-model-item>
           </a-col>
-          <a-col :span='9'>
+          <a-col :span='20'>
-            <a-form-model-item ref='paramsTemplateName' :label="$t('accountNumber')" prop='paramsTemplateName'>
+            <a-form-model-item ref='paramsTemplateName' :label="$t('ReferenceTo')" prop='paramsTemplateName'>
-              <a-input
+              <div style='display: flex'>
-                v-model='form.workNo' />
+                <a-input
+                  v-model='form.realname' />
+                <div style='width: 60px'>&nbsp;&nbsp;&nbsp;&nbsp;配置</div>
+              </div>
             </a-form-model-item>
           </a-col>
-          <a-col :span='6'>
-            <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
-            <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
-          </a-col>
         </a-row>
       </a-form-model>
     </a-spin>
-    <a-table
-      class='table-area'
-      ref='table'
-      size='middle'
-      rowKey='id'
-      :columns='columns'
-      :dataSource='areaTable'
-      :pagination='false'
-      :loading='loading'
-      :scroll='{x: 600}'
-      :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
-      @change='handleTableChange'>
-    </a-table>
-    <div class="page">
-      <a-pagination
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-        show-quick-jumper
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
-    </div>
     <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>
@@ -76,21 +54,6 @@ export default {
       selectedRowKeysDate: {},
       loading: false,
       editId: '',
-      columns: [
-        {
-          title: this.$t('fullName'),
-          dataIndex: 'realname',
-          key: 'showArea',
-          align: 'center',
-          ellipsis: true
-        },
-        {
-          title: this.$t('accountNumber'),
-          align: 'center',
-          dataIndex: 'username',
-          ellipsis: true
-        }
-      ],
       newVisible: false,
       labelCol: {
         xs: { span: 24 },
@@ -108,7 +71,7 @@ export default {
       confirmLoading: false,
       selectedRowKeys: [],
       pageNo: 1,
-      pageSize: 10
+      pageSize: 10,
     }
   },
   props: {
@@ -122,15 +85,6 @@ export default {
     this.loadData()
   },
   methods: {
-    pageOnChange(page, pageSize) {
-      this.pageNo = page
-      this.loadData()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      this.loadData()
-    },
     loadData() {
       this.loading = true
       let params = {

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -274,7 +274,17 @@
           deliveryRequirements: val.deliveryRequirements
         }
         putAction(this.url.dreSubmit, query).then((res) => {
-
+          if (res.success) {
+            this.loading = false
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.$router.push({
+              path: '/ProjectDetails',
+              query: this.$route.query
+            })
+          }else{
+            this.loading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
         })
       },
       completeTask(value) {

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

@@ -114,7 +114,7 @@
         {{$t('sendBack')}}
       </div>
 <!--      引用参数-->
-      <div @click="handleAdd" class="operator-text">
+      <div @click="referenceparameter" class="operator-text">
         <a-icon type="plus"/>
         {{$t('referenceparameter')}}
       </div>
@@ -172,6 +172,10 @@
     <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-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
+      <reference-parameter v-if='areaVisiblereferenceparameter' :selectedRowKeysArray='selectedRowKeysArray'/>
+    </a-modal>
   </a-card>
 </template>
 
@@ -180,6 +184,7 @@ 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 ReferenceParameter from '@/components/ReferenceParameter/index'
 import AssignedBy from '@/components/AssignedBy/index'
 import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -191,7 +196,8 @@ export default {
     TableCollection,
     ParameterLibraryAdd,
     AssignedBy,
-    TaskCutOffTime
+    TaskCutOffTime,
+    ReferenceParameter
   },
   data(){
     return{
@@ -276,6 +282,7 @@ export default {
       areaVisibleFreeze: false, // 冻结配置
       areaVisibleAssignedby: false, // 分配填写人弹框
       areaVisibleTaskCutOffTime: false, // 截至时间弹框
+      areaVisiblereferenceparameter: false, // 引用参数弹框
       wrapperCol: {
         xs: { span: 24 },
         sm: { span: 14 }
@@ -592,6 +599,10 @@ export default {
       this.areaVisibleTaskCutOffTime = val
       this.$refs.CollectionTabel.getTableList()
     },
+    //引用参数
+    referenceparameter() {
+      this.areaVisiblereferenceparameter = true
+    },
     handleModule() {
 
     },

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

@@ -0,0 +1,72 @@
+<template>
+  <a-modal
+    :title="$t('batSetting')"
+    :width="1200"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @cancel="visible = false"
+  >
+    <template slot="footer">
+      <a-button key="back" @click="visible = false">
+        {{$t('cancel')}}
+      </a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+  export default {
+    name: 'responsibilityList',
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        formInline: {},
+        rules: {},
+        ids: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      edit(data) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.ids = data || []
+          this.formInline = {}
+        })
+      },
+      handleOk() {
+        let ids = JSON.parse(JSON.stringify(this.ids))
+        let query = {
+          ids: ids.join(','),
+          ...this.formInline
+        }
+        this.confirmLoading = true
+        postAction(this.url.setBatch, query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.confirmLoading = false
+            this.$emit('batSettingList')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>