From ea6b9a83eb6c2b5e100098e13b5443ef870be1e0 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 18 Aug 2021 16:48:42 +0800
Subject: [PATCH] commit

---
 .../pages/creatProcess/bzzqyj/step3.vue       | 50 ++++++++++----
 .../pages/creatProcess/bzzqyj/step4.vue       | 16 +++++
 .../pages/creatProcess/bzzqyj/step5.vue       | 65 +++++++++++++-----
 .../pages/creatProcess/bzzqyj/step6.vue       | 66 +++++++++----------
 .../pages/creatProcess/bzzqyj/step7.vue       | 66 +++++++++----------
 .../pages/creatProcess/bzzqyj/step8.vue       | 66 +++++++++----------
 .../pages/creatProcess/bzzqyj/step9.vue       | 66 +++++++++----------
 7 files changed, 225 insertions(+), 170 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index e30b056fb..1d19fe428 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -96,17 +96,40 @@
                     </el-table-column>
                     <el-table-column
                             prop="chapterName"
-                            label="章节名称">
+                            label="章节名称"
+                            width="170px">
                         <template slot-scope="scope">
                             <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column
                             prop="commentText"
+                            align="center"
                             label="修改意见内容（包括理由或依据）">
-                        <template slot-scope="scope">
-                            <el-input style="margin: 10px 0;" v-model="scope.row.commentText"></el-input>
-                        </template>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改前">
+                            <template slot-scope="scope">
+                                <el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改后">
+                            <template slot-scope="scope">
+                                <el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改理由">
+                            <template slot-scope="scope">
+                                <el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
+                            </template>
+                        </el-table-column>
                     </el-table-column>
                 </el-table>
             </div>
@@ -288,6 +311,9 @@
                     chapterNumber: '',
                     chapterName: '',
                     commentText: '',
+                    oldText: '',
+                    newText: '',
+                    reason: '',
                     id: id,
                     responUserName: this.$store.getters.userInfo.userName,
                     responUser: this.$store.getters.userInfo.userId,
@@ -305,7 +331,7 @@
                 } else {
                     var a = 0
                     var b = 0
-                    var c = 0
+                    // var c = 0
                     for (let s1 = 0; s1 < this.data.length; s1++) {
                         if (!this.data[s1].chapterNumber) {
                             a++
@@ -313,17 +339,19 @@
                         if (!this.data[s1].chapterName) {
                             b++
                         }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
+                        // if (!this.data[s1].commentText) {
+                        //     c++
+                        // }
                     }
                     if (a > 0) {
                         this.$message.warning('请输入章节编号')
                     } else if (b > 0) {
                         this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
+                    }
+                    // else if (c > 0) {
+                    //     this.$message.warning('请输入意见内容')
+                    // }
+                    else {
                         this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 02bd944af..4e3e3e5b3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -80,8 +80,24 @@
                             label="章节名称">
                     </el-table-column>
                     <el-table-column
+                            align="center"
                             prop="commentText"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index ba084d8ba..0d44e7924 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -81,15 +81,47 @@
                     </el-table-column>
                     <el-table-column
                             prop="commentText"
+                            align="center"
                             label="修改意见内容（包括理由或依据）">
-                        <template slot-scope="scope">
-                            <div v-if="scope.row.state == '2'">
-                                <el-input style="margin: 10px 0;" v-model="scope.row.commentText"></el-input>
-                            </div>
-                            <div v-else>
-                                {{ scope.row.commentText }}
-                            </div>
-                        </template>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改前">
+                            <template slot-scope="scope">
+                                <div v-if="scope.row.state == '2'">
+                                    <el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
+                                </div>
+                                <div v-else>
+                                    {{ scope.row.oldText }}
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改后">
+                            <template slot-scope="scope">
+                                <div v-if="scope.row.state == '2'">
+                                    <el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
+                                </div>
+                                <div v-else>
+                                    {{ scope.row.newText }}
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                                prop="name"
+                                align="center"
+                                label="修改理由">
+                            <template slot-scope="scope">
+                                <div v-if="scope.row.state == '2'">
+                                    <el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
+                                </div>
+                                <div v-else>
+                                    {{ scope.row.reason }}
+                                </div>
+                            </template>
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -273,7 +305,7 @@
                 } else {
                     var a = 0
                     var b = 0
-                    var c = 0
+                    // var c = 0
                     for (let s1 = 0; s1 < this.data.length; s1++) {
                         if (!this.data[s1].chapterNumber) {
                             a++
@@ -281,17 +313,19 @@
                         if (!this.data[s1].chapterName) {
                             b++
                         }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
+                        // if (!this.data[s1].commentText) {
+                        //     c++
+                        // }
                     }
                     if (a > 0) {
                         this.$message.warning('请输入章节编号')
                     } else if (b > 0) {
                         this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
+                    }
+                    // else if (c > 0) {
+                    //     this.$message.warning('请输入意见内容')
+                    // }
+                    else {
                         this.isSubmit = true
                         var json = this.json
                         json.oldinfo = this.oldData
@@ -320,6 +354,7 @@
                         this.form.cid = data.cid
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
+                        console.log(data);
                         this.oldData = JSON.parse(JSON.stringify(data.summaryList))
                         data.summaryList.forEach( item => {
                             if (item.state) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 4b9137935..e59a2bec0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -91,7 +91,23 @@
                     </el-table-column>
                     <el-table-column
                             prop="commentText"
+                            align="center"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -294,43 +310,21 @@
                 if (this.data.length < 1) {
                     this.$message.warning('请输入征求意见搞')
                 } else {
-                    var a = 0
-                    var b = 0
-                    var c = 0
-                    for (let s1 = 0; s1 < this.data.length; s1++) {
-                        if (!this.data[s1].chapterNumber) {
-                            a++
+                    this.isSubmit = true
+                    var json = this.json
+                    json.actionFlag = 0
+                    json.commentText = this.commentText
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
                         }
-                        if (!this.data[s1].chapterName) {
-                            b++
-                        }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
-                    }
-                    if (a > 0) {
-                        this.$message.warning('请输入章节编号')
-                    } else if (b > 0) {
-                        this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
-                        this.isSubmit = true
-                        var json = this.json
-                        json.actionFlag = 0
-                        json.commentText = this.commentText
-                        this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
-                        }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                        })
-                    }
+                        this.isSubmit = false
+                    })
                 }
             },
             handleSubmitNo() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index d24b55f8d..813827b12 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -90,8 +90,24 @@
                             label="章节名称">
                     </el-table-column>
                     <el-table-column
+                            align="center"
                             prop="commentText"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -294,43 +310,21 @@
                 if (this.data.length < 1) {
                     this.$message.warning('请输入征求意见搞')
                 } else {
-                    var a = 0
-                    var b = 0
-                    var c = 0
-                    for (let s1 = 0; s1 < this.data.length; s1++) {
-                        if (!this.data[s1].chapterNumber) {
-                            a++
+                    this.isSubmit = true
+                    var json = this.json
+                    json.actionFlag = 0
+                    json.commentText = this.commentText
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
                         }
-                        if (!this.data[s1].chapterName) {
-                            b++
-                        }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
-                    }
-                    if (a > 0) {
-                        this.$message.warning('请输入章节编号')
-                    } else if (b > 0) {
-                        this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
-                        this.isSubmit = true
-                        var json = this.json
-                        json.actionFlag = 0
-                        json.commentText = this.commentText
-                        this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
-                        }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                        })
-                    }
+                        this.isSubmit = false
+                    })
                 }
             },
             handleSubmitNo() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index f97564089..1144cfc97 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -91,7 +91,23 @@
                     </el-table-column>
                     <el-table-column
                             prop="commentText"
+                            align="center"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -294,43 +310,21 @@
                 if (this.data.length < 1) {
                     this.$message.warning('请输入征求意见搞')
                 } else {
-                    var a = 0
-                    var b = 0
-                    var c = 0
-                    for (let s1 = 0; s1 < this.data.length; s1++) {
-                        if (!this.data[s1].chapterNumber) {
-                            a++
+                    this.isSubmit = true
+                    var json = this.json
+                    json.actionFlag = 0
+                    json.commentText = this.commentText
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
                         }
-                        if (!this.data[s1].chapterName) {
-                            b++
-                        }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
-                    }
-                    if (a > 0) {
-                        this.$message.warning('请输入章节编号')
-                    } else if (b > 0) {
-                        this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
-                        this.isSubmit = true
-                        var json = this.json
-                        json.actionFlag = 0
-                        json.commentText = this.commentText
-                        this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
-                        }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                        })
-                    }
+                        this.isSubmit = false
+                    })
                 }
             },
             handleSubmitNo() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 92fcf5d36..72dfadb99 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -90,8 +90,24 @@
                             label="章节名称">
                     </el-table-column>
                     <el-table-column
+                            align="center"
                             prop="commentText"
                             label="修改意见内容（包括理由或依据）">
+                        <el-table-column
+                                prop="oldText"
+                                align="center"
+                                label="修改前">
+                        </el-table-column>
+                        <el-table-column
+                                prop="newText"
+                                align="center"
+                                label="修改后">
+                        </el-table-column>
+                        <el-table-column
+                                prop="reason"
+                                align="center"
+                                label="修改理由">
+                        </el-table-column>
                     </el-table-column>
                     <el-table-column
                             prop="department"
@@ -294,43 +310,21 @@
                 if (this.data.length < 1) {
                     this.$message.warning('请输入征求意见搞')
                 } else {
-                    var a = 0
-                    var b = 0
-                    var c = 0
-                    for (let s1 = 0; s1 < this.data.length; s1++) {
-                        if (!this.data[s1].chapterNumber) {
-                            a++
+                    this.isSubmit = true
+                    var json = this.json
+                    json.actionFlag = 0
+                    json.commentText = this.commentText
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
                         }
-                        if (!this.data[s1].chapterName) {
-                            b++
-                        }
-                        if (!this.data[s1].commentText) {
-                            c++
-                        }
-                    }
-                    if (a > 0) {
-                        this.$message.warning('请输入章节编号')
-                    } else if (b > 0) {
-                        this.$message.warning('请输入章节名称')
-                    } else if (c > 0) {
-                        this.$message.warning('请输入意见内容')
-                    } else {
-                        this.isSubmit = true
-                        var json = this.json
-                        json.actionFlag = 0
-                        json.commentText = this.commentText
-                        this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
-                        }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                        })
-                    }
+                        this.isSubmit = false
+                    })
                 }
             },
             handleSubmitNo() {