update 项目合规流程

src/api/workCenter.js

@@ -358,6 +358,9 @@ const savePostMeetingManage = (params) => postAction('/process/meetingManageFlow
 // 权限申请流程业务数据
 const getPostMeetingManageDataById = (params) => getAction('/meetingmanage/processMeetingManage/queryByProjectId', params)
 
+/* 项目合规评估流程 */
+const queryProjectRegulationList = (params) => getAction('/projectLibrary/lawsAssess/page', params)
+
 export {
   getProcessNodeList,
 
@@ -537,5 +540,7 @@ export {
   approvalPostMeetingManage,
   transferPostMeetingManage,
   savePostMeetingManage,
-  getPostMeetingManageDataById
+  getPostMeetingManageDataById,
+
+  queryProjectRegulationList
 }

src/enums/commonEnums.js

@@ -189,7 +189,7 @@ export const ProcessKey = {
   // 征求意见流程
   CONSULTATION: { text: 'fb-standard-consultation', value: 'fb-standard-consultation' },
   // 项目合规评估流程
-  PROJECT_COMPLIANCE_EVALUATION: { text: '', value: '' },
+  PROJECT_COMPLIANCE_EVALUATION: { text: 'project-assessment', value: 'project-assessment' },
   // 未符合项跟踪流程
   NO_MATCH_TRACKING: { text: '', value: '' },
   // 法规合规评估流程

src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue

@@ -92,7 +92,7 @@
 
       <!--发起第二步选择项目、第三步添加标准，采用引入组件的方式-->
       <keep-alive>
-        <component :is="comp" v-if="comp" ref="projectStandardTable" />
+        <component :is="comp" v-if="comp" ref="projectStandardTable" :project-id="projectId"/>
       </keep-alive>
 
       <!--业务分派信息-->
@@ -387,6 +387,7 @@ export default {
         }
       ],
       projectDataSource: [], // 选中的项目
+      projectId: null, // 选中项目的id
       standardDataSource: [], // 选中的标准
       basicColumns: [
         // 序号
@@ -748,6 +749,8 @@ export default {
         this.processInfoForm.validateFields(this.processInfoShowField, (errors, values) => {
           if (errors) {
             flag = false
+          } else {
+            this.processInfo = Object.assign(this.processInfo, values)
           }
         })
       }
@@ -757,6 +760,8 @@ export default {
         if (!this.projectDataSource || this.projectDataSource.length === 0) {
           this.$message.warning(this.$t('addAtLeastOneRowOfData'))
           flag = false
+        } else {
+          this.projectId = this.projectDataSource[0].id
         }
       }
       // 第三步选择标准
@@ -891,7 +896,19 @@ export default {
       record.evaluationFeedback = value
       this.$set(this.dataSource, index, record)
     },
+    dealFormData (isSave) {
+      let formData = {}, processProjectAssess = {}
+      // 流程信息
+      formData.basicProcessInfoDTO = { ...this.processInfo }
+      // 业务基本信息（项目信息）
+      if (this.projectDataSource && this.projectDataSource.length > 0) {
+        processProjectAssess.projectId = this.projectDataSource[0].id
+      }
+      return formData
+    },
     handleSave () {
+      const formData = this.dealFormData(true)
+      console.log('保存表单数据===', formData)
     },
     handleSubmit () {
     },

src/views/workCenter/projectComplianceEvaluationProcess/components/StandardList.vue

@@ -15,9 +15,10 @@
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
-        :pagination="false"
+        :pagination="ipagination"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        v-bind="$attrs">
+        v-bind="$attrs"
+        @change="handleTableChange">
 
         <!--分解单来源-->
         <template v-slot:salvageListSource="{text, record, index}">
@@ -42,8 +43,28 @@ import { ajaxGetDictItems } from '../../../../api/api'
 export default {
   name: 'StandardList',
   components: { JTable, SelectStandardListDrawer },
+  props: {
+    // 第三步选中的项目id
+    projectId: {
+      type: String,
+      required: false,
+      default: null
+    }
+  },
   data () {
     return {
+      /* 分页参数 */
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '30', '50', '100', '150', '200'],
+        showTotal: (total, range) => {
+          return range[0] + '-' + range[1] + ' ' + this.$t('total') + total + this.$t('strip')
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
       columns: [
         // 标准编号
         {
@@ -100,14 +121,14 @@ export default {
   },
   methods: {
     initDict () {
-      ajaxGetDictItems('process_manuscript').then(res => {
+      ajaxGetDictItems('decomposition_order_source').then(res => {
         if (res.success) {
           this.standardFileType = res.result
         }
       })
     },
     handleAdd () {
-      this.$refs.selectStandardDrawer.open()
+      this.$refs.selectStandardDrawer.open(this.projectId)
     },
     batchDel () {
       if (!this.selectedRowKeys || this.selectedRowKeys.length === 0) {
@@ -128,7 +149,12 @@ export default {
       this.selectedRowKeys = selectedRowKeys
     },
     handleOk (rows) {
-      this.dataSource = rows
+      this.dataSource = rows.map(item => {
+        if (!item.salvageSource) {
+          item.salvageSource = '0'
+        }
+        return item
+      })
     },
     getData () {
       return this.dataSource
@@ -136,6 +162,9 @@ export default {
     handleSourceChange (value, record, index) {
       record.salvageSource = value
       this.$set(this.dataSource, index, record)
+    },
+    handleTableChange (pagination) {
+      this.ipagination = pagination
     }
   }
 }

src/views/workCenter/projectComplianceEvaluationProcess/modules/SelectStandardListDrawer.vue

@@ -62,8 +62,9 @@
 </template>
 
 <script>
-import { ajaxGetDictItems, getStandardList } from '../../../../api/api'
+import { ajaxGetDictItems } from '../../../../api/api'
 import { StandardSource } from '../../../../enums/commonEnums'
+import { queryProjectRegulationList } from '../../../../api/workCenter'
 
 export default {
   name: 'SelectStandardListDrawer',
@@ -130,9 +131,11 @@ export default {
     }
   },
   methods: {
-    open () {
+    open (projectId) {
       this.visible = true
-      this.queryParam = {}
+      this.queryParam = {
+        projectId
+      }
       this.initDict()
       this.$nextTick(() => {
         this.source ? this.queryParam.source = this.source : this.queryParam = {}
@@ -153,7 +156,6 @@ export default {
         ...this.filters,
         pageNo: this.ipagination.current,
         pageSize: this.ipagination.pageSize,
-        excludeStandardNumbers: this.excludeStandardNumbers
       }
       // 清空在可选范围内进行查询
       if (!query.source && this.canSelectedSource.length < 3) {
@@ -161,7 +163,7 @@ export default {
       }
       // this.selectedRowKeys = []
       this.loading = true
-      getStandardList(query).then((res) => {
+      queryProjectRegulationList(query).then((res) => {
         if (res.success) {
           this.dataList = res.result.records
           this.ipagination.total = res.result.total