Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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

@@ -43,9 +43,10 @@
       :scroll='{x: 600}'
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
-      <span slot='click' slot-scope='text, record'>
+
-          <a class='action-edit' @click='editArea(record)' v-has="'area:edit'">{{ text }}</a>
+      <template slot="file" slot-scope="text, record">
-      </span>
+        <a class="action-edit" href="javascript:;" @click="dowloadfile(record)" v-has="'bqnrzdpzxlbj'">{{record.exportFileName}}</a>
+      </template>
     </a-table>
     <div class="page" style='display: flex;justify-content: flex-end;'>
       <a-pagination
@@ -59,15 +60,15 @@
         @showSizeChange="SizeChange"
       />
     </div>
-    <div class='drawer-bootom-button'>
+<!--    <div class='drawer-bootom-button'>-->
-      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-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>
+<!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
-    </div>
+<!--    </div>-->
   </div>
 </template>
 
 <script>
-import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+import { putAction, postAction, getAction, deleteAction ,downloadFile } from '@/api/manage'
 import axios from 'axios'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -100,19 +101,20 @@ export default {
         {
           title: this.$t('Exporttype'),
           align: 'center',
-          dataIndex: 'paramsTemplateName',
+          dataIndex: 'exportType',
           ellipsis: true
         },
         {
           title: this.$t('Exporttime'),
           align: 'center',
-          dataIndex: 'paramsTemplateName',
+          dataIndex: 'exportTime',
           ellipsis: true
         },
         {
           title: this.$t('file'),
           align: 'center',
-          dataIndex: 'paramsTemplateName',
+          dataIndex: 'exportFileName',
+          scopedSlots: { customRender: 'file' },
           ellipsis: true
         }
       ],
@@ -154,6 +156,11 @@ export default {
       default: '',
       require: true
     },
+    paramsManifestId: {
+      type: String,
+      default: '',
+      require: true
+    },
     url: {
       type: Object,
       default: '',
@@ -194,43 +201,23 @@ export default {
       this.pageSize = pageSize
       this.loadData()
     },
+    dowloadfile(item){
+      downloadFile('/sys/common/downLoadFile', item.exportFileName, {id:item.exportFileId})
+    },
     loadData() {
       let _this = this
       let params = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
+        paramsManifestId:this.paramsManifestId,
         ...this.formData
       }
-      this.loading = true
+      getAction('params/report/exportHistoryPage', params).then((res) => {
-      axios({
+        if (res.success) {
-        url: `/jero-boot/params/manifest/getAllManifest`,
+          this.areaTable = res.result.records
-        method: 'post',
+          this.total = res.result.total
-        data: params,
-        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) {
-            console.log(res.data)
-            this.loading = false
-            this.areaTable = res.data.result.records || []
-            this.total = res.data.result.total
-          }else{
-            this.loading = false
-          }
-        })
-        .catch( (error) =>{
-          console.log(error);
-        });
     },
     searchQuery() {
       this.loadData()

jero-web/src/views/parameter/escalationlibrary/index.vue

@@ -67,7 +67,7 @@
     </div>
     <!--     导出历史模板-->
     <a-modal class="show-drawer" :title="titleTag" width="900px" v-model="drawerVisible" :footer="null">
-      <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false'></export-history>
+      <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false' :paramsManifestId='paramsManifestId'></export-history>
     </a-modal>
   </a-card>
 </template>
@@ -91,6 +91,7 @@
         loading: false,
         toggleSearchStatus: false,
         selectedRowKeys: [],
+        paramsManifestId:'',
         selectedRowKeysArray: '',
         formInline: {},
         rules: {
@@ -173,9 +174,10 @@
         this.selectedRowKeys = value
         this.selectedRowKeysArray = this.selectedRowKeys.join(',')
       },
-      // 复制
+      // 导出历史
-      handlecody() {
+      handlecody(e) {
         this.drawerVisible = true
+        this.paramsManifestId = e.id
       },
       hideModal() {
         this.visible = false

jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue

@@ -19,7 +19,7 @@
                   <div class="title-text" :title="$t('certificationCategory')">
                     <span>{{$t('certificationCategory')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="certificationCategory">
+                  <a-form-model-item class="itemModel" prop="certCategory">
                     <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
                                        :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
                                        :type="'select'"
@@ -37,7 +37,7 @@
                   <div class="title-text" :title="$t('configure')">
                     <span>{{$t('configure')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="configure">
+                  <a-form-model-item class="itemModel" prop="configIds">
                     <j-multi-select-tag class="box-input" v-model="formInline.configIds"
                                         :options="dictOptions"
                                         :placeholder="$t('PleaseSelect')+$t('configure')"
@@ -75,9 +75,10 @@
                 <span class="title-text-text"
                       :title="$t('MergeSeparator')">{{$t('MergeSeparator')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" :prop="'description'">
+                  <a-form-model-item class="itemModel" :prop="this.disabled == true?'separator':''">
+<!--                    :disabled="disabled"-->
                     <a-input class="box-input"
-                             :disabled="disabled"
+
                              v-model="formInline.separator"
                              :placeholder="$t('PleaseEnter')+$t('MergeSeparator')"/>
                   </a-form-model-item>
@@ -117,10 +118,23 @@ export default {
       dictOptions:[],
       visible: false,
       required:false,
+      disabled:false,
       rules: {
-        MergeSeparator:[
+        separator:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' },
-          { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
+          // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
+        ],
+        certCategory:[
+          { required: true, message: this.$t('PleaseEnter')+this.$t('certificationCategory'), trigger: 'change' },
+          // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
+        ],
+        combineFlag:[
+          { required: true, message: this.$t('PleaseSelect')+this.$t('WhetherMergeParameters'), trigger: 'change' },
+          // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
+        ],
+        configIds:[
+          { required: true, message: this.$t('PleaseSelect')+this.$t('configure'), trigger: 'change' },
+          // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
         ],
         description:[
           { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
@@ -132,7 +146,6 @@ export default {
           { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' },
         ],
       },
-      disabled: false,
       projectNameList: [],
       title: ''
     }
@@ -167,10 +180,10 @@ export default {
       console.log(value.target.value)
       if(value.target.value == 2){
         this.required = true
-        this.description = true
+        this.disabled = true
       }else{
         this.required = false
-        this.description = false
+        this.disabled = false
       }
     },
     getNameList() {
@@ -215,6 +228,7 @@ export default {
     },
     handleCancel() {
       this.visible = false
+      this.$refs.ruleForm.resetFields()
     },
     certCategoryName(value){
       getAction('sys/dict/getDictItems/cert_category', { }).then((res) => {

jero-web/src/views/parameter/managementdetails/index.vue

@@ -46,9 +46,13 @@
                 <div class="title-text" :title="$t('completedBy')">
                   <span>{{$t('completedBy')}}</span>
                 </div>
-                <a-input class="box-input" :placeholder="$t('PleaseSelect')+$t('completedBy')"
+                <PersonnelSelection
-                         @input="getcompleteby($event)"
+                  :query="{db_field_name:'completedBy',db_field_txt:$t('completedBy')}"
-                         v-model="formInline.completedBy"></a-input>
+                  :isInput="true"
+                  class="box-input"
+                  :personneQuery="formInline"
+                  @change="PersonnelSelectionChange"
+                  v-model="formInline.dre"/>
               </div>
             </a-col>
             <a-col :md="6" :sm="8">
@@ -56,9 +60,13 @@
                 <div class="title-text" :title="$t('engineeringInterfacePerson')">
                   <span>{{$t('engineeringInterfacePerson')}}</span>
                 </div>
-                <a-input class="box-input" :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                <PersonnelSelection
-                         @input="getcompleteby($event)"
+                  :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
-                         v-model="formInline.completedBy"></a-input>
+                  :isInput="true"
+                  class="box-input"
+                  :personneQuery="formInline"
+                  @change="PersonnelSelectionChange"
+                  v-model="formInline.sdt"/>
               </div>
             </a-col>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -125,12 +133,14 @@ import axios from 'axios'
 import conventionalModel from './commponts/conventionalmodle'
 import customelModel from './commponts/customexportmodle'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
+import PersonnelSelection from '@/components/PersonnelSelection/index'
 import Vue from 'vue'
 export default {
   name: 'managementdetails',
   components: {
     conventionalModel,
-    customelModel
+    customelModel,
+    PersonnelSelection
   },
   data(){
     return{
@@ -259,6 +269,10 @@ export default {
     getcompleteby(e){
       console.log(e)
     },
+    PersonnelSelectionChange(value, id) {
+      this.formInline[value] = id
+      this.formInline = { ...this.formInline }
+    },
     getTableList() {
       // console.log('this.searchParmestable',this.searchParmes)
       let pageNo = JSON.parse(JSON.stringify(this.pageNo))