From bc7ad165511cd7711bd223b0fb93ec2849fc9b7d Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 19 May 2022 11:33:19 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=88=86=E9=85=8D=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 jero-web/src/components/AssignedBy/index.vue  | 247 ++++++++++++++++++
 .../views/parameter/parameterlist/index.vue   |   2 +
 .../ParameterItemCollectionList.vue           |  47 +---
 5 files changed, 258 insertions(+), 42 deletions(-)
 create mode 100644 jero-web/src/components/AssignedBy/index.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index ca207d461..bd556dc5a 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -707,6 +707,8 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'enclosure',
   // 认证
+  accountNumber: 'account Number',
+  fullName: 'full Name',
   configurationInformation: 'configuration Information',
   modifyprojectInterfacePerson: 'modify project Interface Person',
   operatethisbutton: 'You do not have permission to operate this button',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 7d292ac2e..cebfbdcb1 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -717,6 +717,8 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  accountNumber: '账号',
+  fullName: '姓名',
   configurationInformation: '配置信息',
   modifyprojectInterfacePerson: '修改工程接口人',
   operatethisbutton: '没有权限操作此按钮',
diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue
new file mode 100644
index 000000000..63f596fdd
--- /dev/null
+++ b/jero-web/src/components/AssignedBy/index.vue
@@ -0,0 +1,247 @@
+<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='9'>
+            <a-form-model-item ref='paramsTemplateName' :label="$t('fullName')" prop='paramsTemplateName'>
+              <a-input
+                v-model='form.realname' />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='9'>
+            <a-form-model-item ref='paramsTemplateName' :label="$t('accountNumber')" prop='paramsTemplateName'>
+              <a-input
+                v-model='form.workNo' />
+            </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>
+    </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'
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      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 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      rules: {},
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      selectedRowKeys: [],
+      pageNo: 1,
+      pageSize: 10
+    }
+  },
+  props: {
+    paramsManifest: {
+      type: Object,
+      default: {},
+      require: true
+    }
+  },
+  mounted() {
+    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 = {
+        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('areaVisible', false)
+    },
+    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
+      this.selectedRowKeysDate = selectedRowKeysDate
+      this.selectedRowKeys = selectedRowKeys
+    },
+    handleTableChange(val) {
+    },
+    //新增
+    handleSubmit() {
+      let _this = this
+      if (this.selectedRowKeys.length == 0) {
+        this.$message.warning(this.$t('pleaseSelectData'))
+      } else if (this.selectedRowKeys.length > 1) {
+        this.$message.warning(this.$t('OnlyOneSelected'))
+      } else {
+        console.log(this.selectedRowKeysDate,'this.selectedRowKeysDate')
+        let param = {ids: this.paramsManifest.id, projectId: this.$route.query.id, dre:this.selectedRowKeysDate[0].username }
+        axios({
+          url: '/jero-boot/params/collectManifest/updateDreBatch',
+          method: 'post',
+          data: param,
+          transformRequest: [function (data) {
+            let ret = ''
+            for (let it in data) {
+              ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+            }
+            return ret
+          }],
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'X-Access-Token':_this.token
+          }
+        })
+          .then( (res) =>{
+            if (res.data.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.loadData()
+            }else{
+              _this.$message.warning(_this.$t('operationFailed'))
+            }
+          })
+          .catch( (error) =>{
+            console.log(error);
+          });
+      }
+    }
+  }
+}
+</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>
\ No newline at end of file
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index 3a2948d9f..3ffbe4089 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -299,6 +299,8 @@ export default {
         if (res.success) {
           this.certCategoryParamsInfoEOList = res.result.certCategoryParamsInfoEOList
           this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(res.result)))
+        } else {
+          this.$message.warning(res.message)
         }
       })
     },
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 5813000d4..657852d6a 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -160,47 +160,8 @@
       </div>
     </a-modal>
     <!--  分配填写人--->
-    <a-modal v-model="areaVisibleAssignedby" :title="$t('Assignedby')" width='750px' :footer="null">
-      <a-form-model
-        class='tag-module'
-        ref='ruleForm'
-        :model='Dateline'
-        :rules='rules'
-        :label-col='labelCol'
-        :wrapper-col='wrapperCol'
-      >
-        <a-row :gutter='24'>
-          <a-col :span='10'>
-            <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
-              <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig">
-                <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
-                    <span style="display: inline-block;width: 100%" :title=" item.label ">
-                      {{ item.label }}
-                    </span>
-                </a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span='10'>
-            <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
-              <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig">
-                <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
-                    <span style="display: inline-block;width: 100%" :title=" item.label ">
-                      {{ item.label }}
-                    </span>
-                </a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-      <div class="imports-footer">
-        <div class="imports-footer-wrap">
-
-          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitFreeze" v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('preservation')}}</a-button>
-          <a-button class="imports-btn" type="primary" @click="cancleImportsFreeze">{{$t('cancel')}}</a-button>
-        </div>
-      </div>
+    <a-modal v-model="areaVisibleAssignedby" :title="$t('Assignedby')" width='950px' :footer="null">
+      <assigned-by v-if='areaVisibleAssignedby' :paramsManifest='paramsManifest'/>
     </a-modal>
   </a-card>
 </template>
@@ -209,6 +170,7 @@
 import TableCollection from '@/components/tableCollection/index'
 import { getAction,postAction } from '../../../api/manage'
 import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
+import AssignedBy from '@/components/AssignedBy/index'
 import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import Vue from 'vue'
@@ -216,7 +178,8 @@ export default {
   name: 'ParameterItemCollectionList',
   components:{
     TableCollection,
-    ParameterLibraryAdd
+    ParameterLibraryAdd,
+    AssignedBy
   },
   data(){
     return{