From 315cdcc37e12915da4eaf6a3a8a99ec851b80978 Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Wed, 8 Dec 2021 17:47:20 +0800
Subject: [PATCH] feat: There is no way the, BUSS PROCESS

---
 .../pages/creatProcess/qbrk/step2.vue         |  1 +
 .../pages/creatProcess/qbrk/step3.vue         |  2 +
 .../pages/creatProcess/qbrk/step5.vue         | 11 ++--
 .../pages/creatProcess/qbrk/step6.vue         | 50 +++++++++++++++++--
 .../pages/creatProcess/qbrk/step7.vue         | 10 ++--
 .../pages/creatProcess/qbrk/step8.vue         |  7 ++-
 .../pages/creatProcess/qbrk/step9.vue         |  7 ++-
 7 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index 9f470e997..f3b22ab92 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -2476,6 +2476,7 @@
                                 this.$message.success(res.message)
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                 // if(this.formTongGuo.approvalOpinion === '1'){
                                 //     this.$message.warning("驳回成功")
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index e23b524f7..489c78878 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -2460,6 +2460,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         const json = JSON.stringify(this.form);
@@ -2473,6 +2474,7 @@
                             if (res.success) {
                                 this.$message.success(res.message)
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
 
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index d6b383a84..f747321da 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -101,10 +101,10 @@
                                         align="center"
                                         label="简述扣分理由（不合格＜6分，必填）"
                                 >
-                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 6)">
+                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
-                                                :rules="rules.reason" >
+                                                :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
                                             <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
@@ -1322,6 +1322,7 @@
                         { type: 'number',min: 0, max: 10, message: '分值 0 ~ 10 分 ', trigger: 'blur' },
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
+                    reasonNot:[],
                     commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
@@ -1478,8 +1479,10 @@
 
             },
             getSummaries(param) {
+                console.log(param)
                 const { columns, data } = param;
                 const sums = [];
+                console.log(columns)
                 columns.forEach((column, index) => {
                     if (index === 3) {
                         sums[index] = '合计：';
@@ -2667,6 +2670,7 @@
                             this.$refs['formTongGuo'].validate((valid) => {
                                 if (valid) {
                                     this.isSubmit = true
+                                    this.saveLoading = true
                                     this.form.commentText = this.formTongGuo.commentText
                                     this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     // 会签意见存储
@@ -2676,8 +2680,8 @@
                                     info.userName = this.userName
                                     info.commentText = this.formTongGuo.commentText
                                     infoList.push(info)
+                                    this.form.infoList = infoList
                                     const json = JSON.stringify(this.form);
-                                    json.infoList = infoList
                                     this.$http.post('lawss/activiti/completeTask', {
                                         taskIds: this.taskIds,
                                         userId : this.userId,
@@ -2689,6 +2693,7 @@
                                             this.$message.success(res.message)
                                             // 流程提交之后，应该流转至待办任务页面
                                             this.isSubmit = false
+                                            this.saveLoading = false
                                             this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                             // if(this.formTongGuo.approvalOpinion === '1'){
                                             //     this.$message.warning("驳回成功")
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 4f1d66fb1..74dcd62f6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -5,8 +5,9 @@
         <template slot="proNode">主起草人修订并组织评审</template>
     </ProcessHeader>
     <div class="headerTabs">
-        <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-<!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
+        <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">意见列表</div>
+        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
+        <!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
         <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content">
@@ -17,7 +18,48 @@
                 class="label-input-form"
                 label-width="210px"
         >
-            <div style="flex: auto;" v-show="active === '1'">
+            <div class="block" id="active2" v-show="active === '1'">
+                <ProcessTitle>
+                    <template slot="title">意见信息</template>
+                </ProcessTitle>
+                <template>
+                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                        <el-table
+                                ref="selection"
+                                tooltip-effect="dark"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                                        fontWeight: 'bold', height: '48px'}"
+                                @selection-change="handleSelectionChange"
+                                row-key="id"
+                                :data="form.infoList"
+                                border
+                                default-expand-all>
+                            <el-table-column
+                                    label="序号"
+                                    min-width="15%"
+                                    align="center">
+                                    <template slot-scope="scope">
+                                        {{scope.$index + 1}}
+                                    </template>
+                            </el-table-column>
+                            <el-table-column
+                                    prop="userName"
+                                    label="会签人"
+                                    align="center"
+                                    min-width="30%">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="commentText"
+                                    label="会签意见"
+                                    min-width="15%"
+                                    align="center">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </template>
+            </div>
+            <div style="flex: auto;" v-show="active === '2'">
                 <ProcessTitle>
                     <template slot="title">基础信息</template>
                 </ProcessTitle>
@@ -2461,6 +2503,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         const json = JSON.stringify(this.form);
@@ -2475,6 +2518,7 @@
                                 this.$message.success(res.message)
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                 // if(this.formTongGuo.approvalOpinion === '1'){
                                 //     this.$message.warning("驳回成功")
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
index 28686566e..194b3d8aa 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
@@ -101,10 +101,10 @@
                                         align="center"
                                         label="简述扣分理由（不合格＜6分，必填）"
                                 >
-                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 6)">
+                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
-                                                :rules="rules.reason" >
+                                                :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
                                             <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
@@ -1321,6 +1321,7 @@
                         { type: 'number',min: 0, max: 10, message: '分值 0 ~ 10 分 ', trigger: 'blur' },
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
+                    reasonNot:[],
                     commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
@@ -2530,7 +2531,8 @@
                 this.active = name
             },
             //保存
-            handleSave() {this.form.country=this.countryArr;
+            handleSave() {
+            this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
@@ -2665,6 +2667,7 @@
                             this.$refs['formTongGuo'].validate((valid) => {
                                 if (valid) {
                                     this.isSubmit = true
+                                    this.saveLoading = true
                                     this.form.commentText = this.formTongGuo.commentText
                                     this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     const json = JSON.stringify(this.form);
@@ -2679,6 +2682,7 @@
                                             this.$message.success(res.message)
                                             // 流程提交之后，应该流转至待办任务页面
                                             this.isSubmit = false
+                                            this.saveLoading = false
                                             this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                             // if(this.formTongGuo.approvalOpinion === '1'){
                                             //     this.$message.warning("驳回成功")
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
index b39c17041..cc7e1e163 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
@@ -101,10 +101,10 @@
                                         align="center"
                                         label="简述扣分理由（不合格＜6分，必填）"
                                 >
-                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 6)">
+                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
-                                                :rules="rules.reason" >
+                                                :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
                                             <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
@@ -1335,6 +1335,7 @@
                         { type: 'number',min: 0, max: 10, message: '分值 0 ~ 10 分 ', trigger: 'blur' },
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
+                    reasonNot:[],
                     commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
@@ -2713,6 +2714,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         const json = JSON.stringify(this.form);
@@ -2731,6 +2733,7 @@
                                     // this.processCreateLaws(json)
                                 }
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                             }else {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index fc686919a..477b6a069 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -101,10 +101,10 @@
                                         align="center"
                                         label="简述扣分理由（不合格＜6分，必填）"
                                 >
-                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 6)">
+                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
-                                                :rules="rules.reason" >
+                                                :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
                                             <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
@@ -1334,6 +1334,7 @@
                         { type: 'number',min: 0, max: 10, message: '分值 0 ~ 10 分 ', trigger: 'blur' },
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
+                    reasonNot:[],
                     commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
@@ -2714,6 +2715,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         const json = JSON.stringify(this.form);
@@ -2732,6 +2734,7 @@
                                     // this.processCreateLaws(json)
                                 }
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                             }else {