对接认证清单

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

@@ -183,7 +183,8 @@
         studioList: [],
         disabled: false,
         url: {
-          edit: '/project/projectTaskInventoryEO/edit',
+          // edit: '/project/projectTaskInventoryEO/edit',
+          edit: '/project/projectCertificationInventoryEO/edit',
           addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate',
           list: '/project/projectTaskInventoryConditionAssessmentEO/list'
         }

jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue

@@ -496,6 +496,9 @@
         this.formInline = {}
         this.visible = true
         this.formInline = value
+        if (this.formInline.deliverableType) {
+          this.formInline.deliverableType = this.formInline.deliverableType.split(',')
+        }
         this.getRegulationNo()
         this.title = this.$t('edit')
         this.$nextTick(() => {

jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
-    :title="$t('batSetting')"
+    :title="name"
-    :width="1000"
+    :width="name == $t('changeSetting') ? 600 : 1000"
     :visible="visible"
     :confirm-loading="confirmLoading"
     :maskClosable="false"
@@ -10,7 +10,8 @@
   >
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
       <a-row :gutter="24">
-        <a-col :span="12">
+        <a-col :span="name == $t('changeSetting') ? 24 : 12"
+               v-if="name == $t('BatchSetting') || name == $t('changeSetting')">
           <div class="box-title-text">
             <div class="title-text">
               <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
@@ -32,7 +33,7 @@
             </a-form-model-item>
           </div>
         </a-col>
-        <a-col :span="12">
+        <a-col :span="12" v-if="name == $t('BatchSetting')">
           <div class="box-title-text">
             <div class="title-text">
               <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
@@ -47,7 +48,7 @@
           </div>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-if="name == $t('BatchSetting')">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
@@ -86,7 +87,7 @@
           </div>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-if="name == $t('BatchSetting')">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text">
@@ -122,7 +123,7 @@
   export default {
     name: 'batSetting',
     props: ['url'],
-    components:{
+    components: {
       PersonnelSelection
     },
     data() {
@@ -132,26 +133,28 @@
         formInline: {},
         rules: {},
         ids: [],
-        configurationItemList:[],
+        configurationItemList: [],
-        engineeringInterfacePersonList:[],
+        engineeringInterfacePersonList: [],
-        typeOfDeliverablesList:[],
+        typeOfDeliverablesList: [],
+        name: ''
       }
     },
     mounted() {
     },
     methods: {
-      edit(data) {
+      edit(data, name) {
         this.visible = true
         this.$nextTick(() => {
           this.ids = data || []
           this.formInline = {}
+          this.name = name
         })
       },
       handleOk() {
         // if (this.formInline.dutyTerritory) {
         //   this.handleOkTwo()
         // } else {
-          this.handleOkOne()
+        this.handleOkOne()
         // }
       },
       PersonnelSelectionChange(value, id) {

jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue

@@ -0,0 +1,252 @@
+<template>
+  <a-drawer
+    :title="$t('referenceDeliverables')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('entryName')">
+                  <span>{{$t('entryName')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
+                         v-model="queryParam.projectName"></a-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                  <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>
+      </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: '100%',y:600}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' , type:'radio'}"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'referenceDeliverablesList',
+    components: {},
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('entryName'),
+            dataIndex: 'projectName',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          },
+          {
+            title: 'Studio',
+            dataIndex: 'studioEngineerName',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          },
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      transferModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction('project/projectLibraryBase/page', query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+      },
+      handleCancel() {
+        this.visible = false
+        this.$emit('visible')
+      },
+      handleSubmit(flag) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.confirmLoading = false
+          this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.selectedRowKeys = []
+          // postAction('project/projectLawsInventoryEO/add', {
+          //   dummyInventoryBaseId: selectedRowKeys.join(','),
+          //   projectLibraryId: this.$route.query.id,
+          //   flag: flag
+          // }).then((res) => {
+          //   if (res.success) {
+          //     this.confirmLoading = false
+          //     // this.$message.success(this.$t('OperationSuccessful'))
+          //     // this.visible = false
+          //     this.selectedRowKeys = []
+          //     this.$emit('transferListForm',selectedRowKeys.join(','))
+          //   } else {
+          //     // if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+          //     //   this.confirmLoading = false
+          //     //   this.getAdd()
+          //     //   return
+          //     // }
+          //     this.$message.warning(this.$t('operationFailed'))
+          //     this.confirmLoading = false
+          //   }
+          // })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      getAdd() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('TheDoesNotContainData'),
+          onOk() {
+            _this.handleSubmit('1')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -77,7 +77,7 @@
         </div>
 
         <!--        保存-->
-        <div @click="preservationClick" v-if="roleSwitchingCode == 2" class="operator-text">
+        <div @click="preservationClick(1)" v-if="roleSwitchingCode == 2" class="operator-text">
           <a-icon type="check-circle"/>
           {{ $t('preservation') }}
         </div>
@@ -89,7 +89,8 @@
         </div>
 
         <!--        批量设置-->
-        <div @click="BatchSettingClick" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2" class="operator-text">
+        <div @click="BatchSettingClick($t('BatchSetting'))" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
+             class="operator-text">
           <a-icon type="setting"/>
           {{ $t('BatchSetting') }}
         </div>
@@ -101,9 +102,9 @@
         </div>
 
         <!--        修改配置-->
-        <div @click="changeSettingClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
+        <div @click="BatchSettingClick($t('changeSetting'))" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
              class="operator-text">
-          <a-icon type="setting" />
+          <a-icon type="setting"/>
           {{ $t('changeSetting') }}
         </div>
 
@@ -192,7 +193,7 @@
 
         <!--        退回至Studio-->
         <div @click="returnToStudioClick" v-if="roleSwitchingCode == 2" class="operator-text">
-          <a-icon type="close-circle" />
+          <a-icon type="close-circle"/>
           {{ $t('returnToStudio') }}
         </div>
 
@@ -204,7 +205,7 @@
 
         <!--        审批退回-->
         <div @click="returnedForApprovalClick" v-if="roleSwitchingCode == 2" class="operator-text">
-          <a-icon type="close-circle" />
+          <a-icon type="close-circle"/>
           {{ $t('returnedForApproval') }}
         </div>
 
@@ -218,7 +219,7 @@
         <!--        任务退回-->
         <div @click="missionRejectionClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
              class="operator-text">
-          <a-icon type="close-circle" />
+          <a-icon type="close-circle"/>
           {{ $t('missionRejection') }}
         </div>
 
@@ -230,7 +231,7 @@
 
         <!--       转办 -->
         <div @click="turnToDoClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21" class="operator-text">
-          <a-icon type="undo" />
+          <a-icon type="undo"/>
           {{ $t('turnToDo') }}
         </div>
 
@@ -323,6 +324,18 @@
              </span>
         </div>
       </a-table>
+      <div class="page" v-if="dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
     </div>
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
     <certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
@@ -331,6 +344,7 @@
     <modifyHistory ref="modifyHistoryRef"/>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
     <TaskListModel @TaskListModelList="transferListForm" ref="TaskListModelRef"/>
+    <referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/>
     <a-modal
       :title="listTitle"
       :width="500"
@@ -413,6 +427,7 @@
   import batSetting from './components/batSetting'
   import modifyHistory from './components/modifyHistoryList'
   import TaskListModel from '../TaskListModel'
+  import referenceDeliverablesList from './components/referenceDeliverablesList'
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
   import moment from 'moment'
   import { mapGetters } from 'vuex'
@@ -428,11 +443,15 @@
       addModel,
       modifyHistory,
       uploadFile,
-      TaskListModel
+      TaskListModel,
+      referenceDeliverablesList
     },
     data() {
       return {
         queryParam: {},
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
         CertificationColor: {
           'Test passed': 'accordColor',
           'Test failed': 'nonConformityColor',
@@ -466,7 +485,8 @@
           setBatch: '/project/projectCertificationInventoryEO/setBatch',
           deleteOne: '/project/projectCertificationInventoryEO/delete',
           AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
-          AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit'
+          AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit',
+          saveBatch: '/project/projectCertificationInventoryEO/saveBatch'
         },
         dataSource: [],
         roleSwitchingCode: '',
@@ -638,8 +658,8 @@
             }
           }
         }
-        if (this.roleSwitchingCode == 20 || this.roleSwitchingCode == 21 ||this.roleSwitchingCode == 11 ||
+        if (this.roleSwitchingCode == 20 || this.roleSwitchingCode == 21 || this.roleSwitchingCode == 11 ||
-          this.roleSwitchingCode == 12 || this.roleSwitchingCode == 13 || this.roleSwitchingCode == 14){
+          this.roleSwitchingCode == 12 || this.roleSwitchingCode == 13 || this.roleSwitchingCode == 14) {
           for (let i = 0; i < columns.length; i++) {
             if (columns[i].title == this.$t('reportNo')) {
               columns.splice(i, 1)
@@ -676,17 +696,29 @@
       disabledDate(current) {
         return current && current < moment().subtract(1, 'day')
       },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
       searchQuery() {
+        this.pageNo = 1
         this.selectedRowKeys = []
         this.getList()
       },
       searchReset() {
+        this.pageNo = 1
         this.queryParam = {}
         this.selectedRowKeys = []
         this.$refs.globalAdvancedQueryRef.resetLine()
         this.$refs.globalAdvancedQueryRef.emitCallback()
       },
       getPersonnelList() {
+        this.pageNo = 1
         this.getList()
       },
       handleSuperQuery(params, matchType) {
@@ -700,6 +732,7 @@
           sqp['superQueryMatchType'] = matchType
         }
         this.queryParamQuery = sqp
+        this.pageNo = 1
         this.getList()
       },
       handleToggleSearch() {
@@ -713,6 +746,8 @@
           }
         })
         let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
           ...this.queryParamQuery,
           ...queryParam,
           projectLibraryId: this.$route.query.id,
@@ -722,6 +757,7 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result.records || []
+            this.total = res.result.total
             this.loading = false
             this.JLoading = false
           } else {
@@ -733,9 +769,9 @@
       transferClick() {
         this.$refs.transferListRef.transferModel()
       },
-      BatchSettingClick() {
+      BatchSettingClick(name) {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+          this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name)
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
@@ -861,13 +897,16 @@
 
       },
       transferListForm() {
+        this.pageNo = 1
         this.getList()
       },
       batSettingForm() {
+        this.pageNo = 1
         this.getList()
         this.selectedRowKeys = []
       },
       addModelForm() {
+        this.pageNo = 1
         this.getList()
       },
       edit(item) {
@@ -922,7 +961,7 @@
             }
             this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
             this.getList()
-            this.$emit('getRoleSwitch',this.roleSwitchingCode)
+            this.$emit('getRoleSwitch', this.roleSwitchingCode)
           } else {
             this.JLoading = false
           }
@@ -960,7 +999,7 @@
                 this.visibleRoleSwitching = false
                 this.confirmLoadingRoleSwitching = false
                 this.getList()
-                this.$emit('getRoleSwitch',this.roleSwitchingCode)
+                this.$emit('getRoleSwitch', this.roleSwitchingCode)
               } else {
                 this.confirmLoadingRoleSwitching = false
                 this.$message.warning(this.$t('operationFailed'))
@@ -973,16 +1012,26 @@
         this.visibleRoleSwitching = false
       },
       //保存
-      preservationClick() {
+      preservationClick(num) {
-
+        postAction(this.url.saveBatch, this.dataSource).then((res) => {
+          if (res.success) {
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+            }
+          } else {
+            if (num == 1) {
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
+        })
       },
       //引用交付物
       referenceDeliverablesClick() {
-
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-      },
+          this.$refs.referenceDeliverablesListRef.transferModel()
-      //修改配置
+        } else {
-      changeSettingClick() {
+          this.$message.warning(this.$t('selectLeastOne'))
-
+        }
       },
       //发起流程
       initiatingProcessClick() {
@@ -1045,6 +1094,25 @@
         let item = JSON.parse(JSON.stringify(val))
         item.roleCode = this.roleSwitchingCode
         this.$refs.TaskListModelRef.getData(item, this.$t('CertificationProgress'))
+      },
+      submitTask(value) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let query = {
+            'nodeKey': value,
+            'projectLibraryId': this.$route.query.id,
+            'ids': selectedRowKeys.join(',')
+          }
+          postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => {
+            if (res.success) {
+
+            } else {
+
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       }
     }
   }