task4565-风险评估以及风险库调整

src/views/platform/risk/riskDetail.vue

@@ -105,7 +105,7 @@
                         <el-button type="success" size="mini" icon="ibps-icon-add" @click="onAdd">新增风险项</el-button>
                         <el-button type="danger" size="mini" icon="ibps-icon-remove" @click="onRemove">删除</el-button>
                     </div>
-                    <el-table :data="tableList" border @selection-change="handleSelectionChange">
+                    <el-table height="300px" :data="tableList" border @selection-change="handleSelectionChange">
                         <el-table-column
                             width="50"
                             type="selection"
@@ -138,10 +138,26 @@
                         <el-table-column
                             prop="gong_zuo_huan_jie"
                             label="工作流程和质量管理活动"
-                            width="150"
+                            width="250"
                         >
                             <template slot-scope="{row}">
-                                <el-input v-model="row.gong_zuo_huan_jie" type="textarea" :rows="2" size="mini" :disabled="readonly" />
+
+                                <el-row type="flex" align="middle" :gutter="3">
+                                    <el-col :span="10">
+                                        <el-select v-model="row.gong_zuo_liu_chen" placeholder="请选择" :disabled="readonly" size="mini" clearable>
+                                            <el-option
+                                                v-for="item in gong_zuo_liu_chen_List"
+                                                :key="item"
+                                                :label="item"
+                                                :value="item"
+                                            />
+                                        </el-select>
+                                    </el-col>
+                                    <el-col :span="14">
+                                        <el-input v-model="row.gong_zuo_huan_jie" type="textarea" :rows="2" size="mini" :disabled="readonly" />
+                                    </el-col>
+                                </el-row>
+
                             </template>
                         </el-table-column>
                         <!-- <el-table-column
@@ -215,12 +231,12 @@
                         <el-table-column
                             prop="feng_xian_zhi_shu"
                             label="风险得分（FMEA法）"
-                            width="70"
+                            width="100"
                         />
                         <el-table-column
                             prop="feng_xian_deng_ji"
                             label="风险等级"
-                            width="100"
+                            width="80"
                         />
                         <el-table-column
                             prop="xian_xing_kong_zh"
@@ -365,6 +381,7 @@ export default {
             yan_zhong_cheng_d_List: ['1', '2', '3', '4', '5'],
             fa_sheng_pin_du_List: ['1', '2', '3', '4', '5'],
             ke_jian_ce_du_List: ['1', '2', '3', '4', '5'],
+            gong_zuo_liu_chen_List: ['检验前', '检验中', '检验后'],
             userId: userId,
             position: position,
             level: level.second || level.first,
@@ -460,6 +477,7 @@ export default {
                                     shi_bie_xiang_: item.id_,
                                     yao_su_tiao_kuan_: item.tiao_kuan_ || '',
                                     gong_zuo_huan_jie: item.huan_jie_ || '',
+                                    gong_zuo_liu_chen: item.gong_zuo_liu_chen || '',
                                     // gong_zuo_miao_shu: item.gong_zuo_miao_shu,
                                     feng_xian_miao_sh: item.feng_xian_miao_sh || '',
 
@@ -497,6 +515,7 @@ export default {
                 shi_bie_xiang_: '',
                 yao_su_tiao_kuan_: '',
                 gong_zuo_huan_jie: '',
+                gong_zuo_liu_chen: '',
                 feng_xian_miao_sh: '',
                 xian_xing_kong_zh: '',
                 ni_cai_qu_cuo_shi: '',
@@ -798,7 +817,7 @@ export default {
                 this.$message.warning('风险系数计算错误，请检查风险模板配置数据是否正确！')
             }
         },
-        check () {
+        checkSubmit () {
             if (this.tableList.length === 0) {
                 throw new Error('请选择风险项！')
             }
@@ -810,6 +829,18 @@ export default {
                 if (item.feng_xian_ying_du !== '风险接受' && !item.zhi_ding_ren_) {
                     throw new Error(`第${i + 1}行缺少措施制定人！`)
                 }
+                // // 格式化成需要的数据
+                // item.xuan_ze_feng_xian = this.form.xuan_ze_feng_xian
+                // delete item.create_by_
+                // delete item.create_time_
+            }
+        },
+        checkSave () {
+            if (this.tableList.length === 0) {
+                throw new Error('请选择风险项！')
+            }
+            for (let i = 0; i < this.tableList.length; i++) {
+                const item = this.tableList[i]
                 // 格式化成需要的数据
                 item.xuan_ze_feng_xian = this.form.xuan_ze_feng_xian
                 delete item.create_by_
@@ -817,7 +848,12 @@ export default {
             }
         },
         submit () {
-            // console.log(this.Ids)
+            try {
+                this.checkSubmit()
+            } catch (error) {
+                this.$message.warning(error.message)
+                throw new Error(error.message)
+            }
             this.$confirm('提交后不可再修改，是否确认保存并提交?', '提示', {
                 confirmButtonText: '继续',
                 cancelButtonText: '取消',
@@ -894,10 +930,13 @@ export default {
         },
         async save () {
             try {
-                this.check()
+                this.checkSave()
                 await this.getIsFinish()
                 // 将风险来源为新增的风险项添加至风险库
                 const handleArr = this.tableList.filter(item => item.shi_bie_xiang_ === '')
+                console.log(this.tableList)
+
+                const updataArr = this.tableList.filter(item => item.feng_xian_lai_yua === '2')
                 for (let i = 0; i < handleArr.length; i++) {
                     const item = handleArr[i]
                     const addParams = {
@@ -906,6 +945,7 @@ export default {
                             bian_zhi_bu_men_: this.position,
                             tiao_kuan_: item.yao_su_tiao_kuan_,
                             huan_jie_: item.gong_zuo_huan_jie,
+                            gong_zuo_liu_chen: item.gong_zuo_liu_chen,
                             gong_zuo_miao_shu: item.xian_xing_kong_zh,
                             feng_xian_miao_sh: item.feng_xian_miao_sh,
                             di_dian_: this.level,
@@ -918,6 +958,32 @@ export default {
                     const { variables: { cont }} = await this.$common.request('add', addParams)
                     item.shi_bie_xiang_ = cont[0].id_
                 }
+
+                if (updataArr.length > 0) {
+                    const params = {
+                        tableName: 't_fxkzb',
+                        updList: updataArr.map(item => ({
+                            where: {
+                                id_: item.id_
+                            },
+                            param: {
+                                bian_zhi_bu_men_: this.position,
+                                tiao_kuan_: item.yao_su_tiao_kuan_,
+                                huan_jie_: item.gong_zuo_huan_jie,
+                                gong_zuo_liu_chen: item.gong_zuo_liu_chen,
+                                gong_zuo_miao_shu: item.xian_xing_kong_zh,
+                                feng_xian_miao_sh: item.feng_xian_miao_sh,
+                                di_dian_: this.level,
+                                bian_zhi_ren_: this.userId,
+                                bian_zhi_shi_jian: this.time,
+                                feng_xian_lei_xin: this.leixing,
+                                bei_zhu_: `风险评估编号${this.params.ji_hua_bian_hao_}新增风险项`
+                            }
+                        }))
+                    }
+                    await this.$common.request('update', params)
+                }
+
                 this.form.xuan_ze_feng_xian = this.tableList.map(i => i.shi_bie_xiang_).join(',') || ''
                 this.tableList.forEach(item => {
                     item.xuan_ze_feng_xian = this.form.xuan_ze_feng_xian
@@ -1037,7 +1103,7 @@ export default {
             justify-self: end;
         }
         height:300px;
-        overflow: auto;
+        //overflow: auto;
         margin-top: 20px;
     }
 }

src/views/platform/risk/riskV2.vue

@@ -495,6 +495,7 @@ export default {
                                         gai_jin_bian_hao_: '',
                                         yao_su_tiao_kuan_: item.yao_su_tiao_kuan_,
                                         gong_zuo_huan_jie: item.gong_zuo_huan_jie,
+                                        gong_zuo_liu_chen: item.gong_zuo_liu_chen || '',
                                         // gong_zuo_miao_shu: item.gong_zuo_miao_shu,
                                         feng_xian_miao_sh: item.feng_xian_miao_sh,
                                         zu_chang_: this.infoFxssbData.zu_chang_,