Merge remote-tracking branch 'origin/develop' into develop

src/components/CustomFormComponents/InputForAllStandards.vue

@@ -5,6 +5,7 @@
       :prop="config.attrField"
       :label-width="labelWidth"
       class="add-form-item"
+      style="width: 100%;"
       :class="{'form-item-disabled': disabled}"
     >
       <el-input
@@ -42,7 +43,7 @@
                   v-model="replaceLawsNumForm.standType"
                   placeholder="请选择"
               >
-                <el-option value="ALL" label="全部"></el-option>
+                <el-option value="" label="全部"></el-option>
                 <el-option value="INLAND" label="国内"></el-option>
                 <el-option value="FOREIGN" label="海外"></el-option>
               </el-select>
@@ -125,8 +126,8 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" round size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+        <el-button type="primary" round size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
 
@@ -176,7 +177,7 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0,
-        standType: 'ALL',
+        standType: '',
         quoteIdList: '',
         validFlag: '0',
         menuId: 'nomenu'

src/components/CustomFormComponents/InputForAllStandards2.vue

@@ -0,0 +1,349 @@
+<template>
+    <div>
+        <el-form-item
+                :label="config.attrName"
+                :prop="config.attrField"
+                :label-width="labelWidth"
+                class="add-form-item"
+                style="width: 100%;"
+                :class="{'form-item-disabled': disabled}"
+        >
+            <el-input
+                    :value="value"
+                    :placeholder="placeholder"
+                    :disabled="disabled"
+                    clearable
+                    @input="handleChange"
+            ></el-input>
+            <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="mini"
+                    style="position:absolute;top: 10px;right: 0;"
+                    @click="selectLaws"
+                    v-if="(processModel && !disabled) || !processModel"
+            >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button>
+        </el-form-item>
+        <el-dialog
+                :title="config.attrName"
+                :visible.sync="replaceLawsNumModel"
+                width="875px"
+                :close-on-click-modal="false"
+                @close="replaceLawsNumModelCancel"
+                :append-to-body="true"
+        >
+            <div class="search-area">
+                <div class="left">
+                    <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
+                        <el-form-item label="编号/名称" class="search-item">
+                            <el-input v-model="replaceLawsNumForm.standNumber" placeholder="根据编号/名称查找" clearable :maxlength="100"></el-input>
+                        </el-form-item>
+                        <el-form-item label="国内/海外" class="search-item">
+                            <el-select
+                                    v-model="replaceLawsNumForm.standType"
+                                    placeholder="请选择"
+                            >
+                                <el-option value="1" label="企标"></el-option>
+                                <el-option value="INLAND" label="国内"></el-option>
+                                <el-option value="FOREIGN" label="海外"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item class="search-item btn-box">
+                            <el-button
+                                    icon="el-icon-search"
+                                    type="primary"
+                                    class="common-button-primary"
+                                    round
+                                    @click="getReplaceLawsNumRowInfo">
+                            </el-button>
+                        </el-form-item>
+                        <el-form-item class="search-item btn-box">
+                            <el-button
+                                    class="common-button-default"
+                                    icon="el-icon-refresh-left"
+                                    round
+                                    type="default"
+                                    @click="getResetLawsNumRow"></el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
+            <el-table
+                    ref="selections"
+                    :data="replaceLawsNumRow"
+                    tooltip-effect="dark"
+                    style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+                    border
+                    :height="300"
+                    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+                    @selection-change="selectReplaceStandNumRowChange">
+                <el-table-column
+                        type="selection"
+                        width="55"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="标准编号"
+                        width="130">
+                    <template slot-scope="scope">
+                        <a v-if="scope.row.standYear" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                        <a v-else @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="standName"
+                        label="标准名称"
+                        width="130">
+                </el-table-column>
+                <el-table-column
+                        prop="issueTime"
+                        label="发布日期"
+                        width="130">
+                </el-table-column>
+                <el-table-column
+                        prop="putTime"
+                        label="实施日期"
+                        width="130">
+                </el-table-column>
+                <el-table-column
+                        prop="standNatureShow"
+                        label="标准性质"
+                        width="130">
+                </el-table-column>
+                <el-table-column
+                        prop="standStateShow"
+                        label="标准状态"
+                        width="130">
+                </el-table-column>
+            </el-table>
+            <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
+            <!--分页-->
+            <pagination
+                    style="position: relative;"
+                    :page="replacePage"
+                    :total="replaceTotal"
+                    @pageChange="pageChangeReplace"
+                    @pageSizeChange="pageSizeChangeReplace"></pagination>
+            <div slot="footer" class="demo-drawer-footer">
+                <el-button class="common-button-default" round size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+                <el-button type="primary" round size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'CustomInput',
+        props: {
+            config: {
+                type: Object,
+                required: true
+            },
+            value: {
+                required: true
+            },
+            disabled: {
+                type: Boolean,
+                default: false
+            },
+            // 栅格比例
+            span: {
+                type: Number,
+                default: 24
+            },
+            // 是否为流程中使用
+            processModel: {
+                type: Boolean,
+                default: false
+            },
+            // label宽度
+            labelWidth: {
+                type: String,
+                default: '150px'
+            }
+        },
+        data () {
+            return {
+                replaceLawsNumModel: false,
+                sarBussionessLawsEO: {
+                    replaceLawsNum: ''
+                },
+                // 代替标准号
+                replaceLawsNumForm: {
+                    standNumber: '', // 政策编号
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    total: 0,
+                    standType: 'INLAND',
+                    quoteIdList: '',
+                    validFlag: '0',
+                    menuId: 'nomenu'
+                },
+                replaceLawsNumRow: [], // 代替政策号 数组内容
+                replaceTotal: 0,
+                selectedListRep: [],
+                replaceLoading: true,
+                replacePage: 1
+
+            }
+        },
+        computed: {
+            placeholder () {
+                return `请输入${this.config.attrName}`
+            },
+            showMessage () {
+                return `${this.config.attrName}不能为空`
+            },
+            isRequired () {
+                return !!this.config.isMust
+            }
+        },
+        methods: {
+            handleChange (event) {
+                const value = event
+                this.$emit('input', value)
+            },
+            selectLaws () {
+                this.replaceLawsNumModel = true
+                this.getReplaceLawsNumRow()
+            },
+            getReplaceLawsNumRowInfo() {
+                this.replaceLawsNumForm.page = 1
+                this.getReplaceLawsNumRow()
+            },
+            // 代替政策号 请求数据
+            getReplaceLawsNumRow () {
+                if (this.replaceLawsNumForm.standType === '1') {
+                    let json = {}
+                    json = this.replaceLawsNumForm
+                    json.userId = this.$store.getters.userInfo.userId
+                    json.standCode = this.replaceLawsNumForm.standNumber
+                    this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', json, {
+                        _this: this, loading: 'replaceLoading'
+                    }, res => {
+                        this.replaceLawsNumRow = res.data.list
+                        this.replaceTotal = res.data.count
+                        // if (this.selectedListRep.length !== 0) {
+                        //     this.selectedListRep.map((list) => {
+                        //         this.replaceLawsNumRow.map((item) => {
+                        //             if (list.id === item.id) {
+                        //                 item._checked = true
+                        //             }
+                        //         })
+                        //     })
+                        // }
+                    }, e => {
+                    })
+                } else {
+                    if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
+                        this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
+                    } else {
+                        this.quoteIdList1 = []
+                        this.replaceLawsNumForm.quoteIdList = ''
+                    }
+                    this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+                        _this: this,
+                        loading: 'replaceLoading'
+                    }, res => {
+                        this.replaceLawsNumRow = res.data.list
+                        this.replaceTotal = res.data.count
+                        // if (this.selectedListRep.length !== 0) {
+                        //     this.selectedListRep.map((list) => {
+                        //         this.replaceLawsNumRow.map((item) => {
+                        //             if (list.id === item.id) {
+                        //                 item._checked = true
+                        //             }
+                        //         })
+                        //     })
+                        // }
+                    }, e => {
+                    })
+                }
+            },
+            // 代替政策编号-取消
+            replaceLawsNumModelCancel () {
+                this.$refs.selections.clearSelection()
+            },
+            // 代替政策号 table选择事件
+            selectReplaceStandNumRowChange (row) {
+                this.selectedListRep = row
+            },
+            // 代替政策分页
+            pageChangeReplace (page) {
+                this.replacePage = page
+                this.replaceLawsNumForm.page = page
+                this.getReplaceLawsNumRow()
+            },
+            pageSizeChangeReplace (pageSize) {
+                // this.replaceRows = pageSize
+                this.replaceLawsNumForm.pageSize = pageSize
+                this.getReplaceLawsNumRow()
+            },
+            // 代替政策编号确定
+            replaceLawsNumModelBt () {
+                let textArr = []
+
+                if (typeof this.value === 'string') {
+                    if (this.value) {
+                        textArr = this.value.split(',')
+                    }
+                }
+                if (this.selectedListRep.length === 0) {
+                    return this.$message({
+                        message: '请先选择数据',
+                        type: 'warning'
+                    })
+                }
+                if (this.selectedListRep.length + textArr.length > 20) {
+                    return this.$message({
+                        message: '代替标准号最多选择20项',
+                        type: 'warning'
+                    })
+                }
+                this.selectedListRep.map((item) => {
+                    let texts = ''
+                    if (item.standYear != null && item.standYear !== '') {
+                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                    } else {
+                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                    }
+                    textArr.push(texts)
+                    textArr = [...new Set(textArr)]
+                    this.replaceLawsNumModel = false
+                })
+                this.$emit('input', textArr.join(','))
+                this.$refs.selections.clearSelection()
+            },
+            // 点击查看
+            handlePreview (item) {
+                let routeUrl = this.$router.resolve({
+                    name: 'OtherBussStandardDetails',
+                    params: {
+                        id: item.id,
+                        pageType: 'BUSINESS_STAND'
+                    }
+                })
+                window.open(routeUrl.href, '_blank')
+            },
+            getResetLawsNumRow () {
+                this.replaceLawsNumForm = {
+                    standNumber: '', // 政策编号
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    total: 0,
+                    standType: 'ALL',
+                    quoteIdList: '',
+                    validFlag: '0'
+                }
+                this.getReplaceLawsNumRow()
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -244,7 +244,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentInfo">
             </el-input>
           </div>
         </el-collapse-item>
@@ -538,7 +538,7 @@ export default {
       isSubmit: false,
       saveLoading: false,
 
-      commentText: '',
+      commentInfo: '',
       bpnId: ''
     }
   },
@@ -585,6 +585,7 @@ export default {
       }).then(res => {
         let mes = JSON.parse(res.mes)
         this.rh_pageData = mes.rh_pageData
+        this.commentInfo = mes.commentInfo
         this.roleForm = mes.roleForm
       });
     },
@@ -804,7 +805,7 @@ export default {
       _formData.append('json', JSON.stringify({
         roleForm: this.roleForm,
         rh_pageData: this.rh_pageData,
-        commentText: this.commentText
+        commentInfo: this.commentInfo
       }))
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
@@ -821,7 +822,8 @@ export default {
         prcCreateUserName: this.$store.getters.userInfo.userName,
         roleList: this.roleForm,
         rh_pageData: this.rh_pageData,
-        commentText: this.commentText,
+        commentText: this.commentInfo,
+        roleForm: this.roleForm,
         directorList: this.roleForm.dockUser,
       }
       this.$refs['rh_pageData'].validate((valid) => {
@@ -830,15 +832,11 @@ export default {
             if (valid) {
               this.isSubmit = true
               let paramsInfo = new FormData()
-              paramsInfo.append('id', this.bpnId || '')
+              // paramsInfo.append('id', this.bpnId || '')
               paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
               paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
               paramsInfo.append('type', '20')
-              paramsInfo.append('json', JSON.stringify({
+              paramsInfo.append('json', JSON.stringify({json}))
-                roleForm: this.roleForm,
-                rh_pageData: this.rh_pageData,
-                commentText: this.commentText
-              }))
               processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -219,7 +219,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep3">
             </el-input>
           </div>
         </el-collapse-item>
@@ -379,7 +379,7 @@ export default {
 
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      commentText: '',
+      commentStep3: '',
       infoSourcesLength: '',
 
       /** 上传相关   */
@@ -435,6 +435,7 @@ export default {
         if (this.rh_pageData.fillFile !== undefined) {
           this.fillFileList = this.rh_pageData.fillFile
         }
+        this.commentStep3 =  JSON.parse(JSON.stringify(item)).commentStep3
         this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.rh_pageData.infoSources.length
@@ -471,6 +472,7 @@ export default {
         selfUser: this.$store.getters.userInfo.userId,
         charge: this.rh_pageData.fillLeaderId,
         rh_pageData: this.rh_pageData,
+        commentStep3: this.commentStep3
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -486,7 +488,7 @@ export default {
         roleList: this.roleForm,
         selfUser: this.$store.getters.userInfo.userId,
         charge: this.rh_pageData.fillLeaderId,
-        commentText: this.commentText,
+        commentText: this.commentStep3,
         rh_pageData: this.rh_pageData,
       }
       this.$refs['rh_pageData'].validate((valid) => {

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -221,7 +221,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep5">
             </el-input>
           </div>
         </el-collapse-item>
@@ -458,7 +458,7 @@ export default {
       deleteDataList: [],
 
       infoSourcesLength: '',
-      commentText: '',
+      commentStep5: '',
 
       editFlag: false,
       editForm: {
@@ -522,6 +522,7 @@ export default {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
         this.infoSourcesLength = this.rh_pageData.infoSources.length
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
@@ -702,7 +703,7 @@ export default {
       _formData.append('json', JSON.stringify({
         rh_pageData: this.rh_pageData,
         roleList: this.roleForm,
-        commentText: this.commentText
+        commentStep5: this.commentStep5
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -718,7 +719,7 @@ export default {
         leader: this.roleForm.leaderUserId,
         rh_pageData: this.rh_pageData,
         roleList: this.roleForm,
-        commentText: this.commentText
+        commentText: this.commentStep5
       }
       this.$refs['rh_pageData'].validate((valid) => {
         if (valid) {

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue

@@ -242,7 +242,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { saveTaskFirst, completeTask, inboundLiaisonDetail,upFile} from '@/api/process.js'
+import { saveTaskForPub, completeTask, inboundLiaisonDetail,upFile,taskDel} from '@/api/process.js'
 
 export default {
   components: {
@@ -652,15 +652,16 @@ export default {
     handleSave() {
       this.saveLoading = true
       let _formData = new FormData()
-      _formData.append('id', this.bpnId || '')
+      // _formData.append('id', this.bpnId || '')
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      // _formData.append('createUser', this.$store.getters.userInfo.userId)
-      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      // _formData.append('createUserName', this.$store.getters.userInfo.userName)
-      _formData.append('prcType', '22')
+      // _formData.append('prcType', '22')
+      _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         roleForm: this.roleForm,
-        hh_pageData: this.hh_pageData
+        hh_pageData: this.hh_pageData,
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -175,7 +175,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep1">
             </el-input>
           </div>
         </el-collapse-item>
@@ -452,7 +452,7 @@ export default {
       roleShowflagOne: false,
       isSubmit: false,
       saveLoading: false,
-      commentText: '',
+      commentInfo: '',
       bpnId: ''
     }
   },
@@ -513,7 +513,7 @@ export default {
       }).then(res => {
         let mes = JSON.parse(res.mes)
         this.ch_pageData = mes.ch_pageData
-        this.commentText = mes.commentText
+        this.commentInfo = mes.commentInfo
         this.roleForm = mes.roleForm
       });
     },
@@ -709,7 +709,7 @@ export default {
       _formData.append('json', JSON.stringify({
         roleForm: this.roleForm,
         ch_pageData: this.ch_pageData,
-        commentText: this.commentText
+        commentInfo: this.commentInfo
 
       }))
       saveTaskFirst(_formData).then(res => {
@@ -727,8 +727,9 @@ export default {
         prcCreateUserName: this.$store.getters.userInfo.userName,
         roleList: this.roleForm,
         ch_pageData: this.ch_pageData,
-        commentText: this.commentText,
+        commentText: this.commentInfo,
         directorList: this.roleForm.dockUser,
+        roleForm: this.roleForm,
       }
       this.$refs['ch_pageData'].validate((valid) => {
         if (valid) {
@@ -736,16 +737,11 @@ export default {
             if (valid) {
               this.isSubmit = true
               let paramsInfo = new FormData()
-              paramsInfo.append('id', this.bpnId || '')
+              // paramsInfo.append('id', this.bpnId || '')
               paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
               paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
               paramsInfo.append('type', '21')
-              paramsInfo.append('json', JSON.stringify({
+              paramsInfo.append('json', JSON.stringify({json}))
-                roleForm: this.roleForm,
-                ch_pageData: this.ch_pageData,
-                commentText: this.commentText
-
-              }))
               processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue

@@ -181,7 +181,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep3">
             </el-input>
           </div>
         </el-collapse-item>
@@ -323,7 +323,7 @@ export default {
       pId: this.$route.query.prcId,
 
       uploadFileLength: '',
-      commentText: ''
+      commentStep3: ''
     }
   },
   computed: {
@@ -374,6 +374,7 @@ export default {
         this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName  + '(' + this.$store.getters.userInfo.userId + ')'
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
     },
@@ -400,7 +401,7 @@ export default {
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         roleList: this.roleForm,
-        commentText: this.commentText,
+        commentStep3: this.commentStep3,
         selfUser: this.$store.getters.userInfo.userId,
         charge: this.ch_pageData.fillLeaderId,
         ch_pageData: this.ch_pageData,
@@ -418,7 +419,7 @@ export default {
       let json = {
         roleList: this.roleForm,
         selfUser: this.$store.getters.userInfo.userId,
-        commentText: this.commentText,
+        commentText: this.commentStep3,
         charge: this.ch_pageData.fillLeaderId,
         ch_pageData: this.ch_pageData,
       }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue

@@ -183,7 +183,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentStep5">
             </el-input>
           </div>
         </el-collapse-item>
@@ -345,7 +345,7 @@ export default {
       pId: this.$route.query.prcId,
 
       uploadFileLength: '',
-      commentText: '',
+      commentStep5: '',
       roleShowflag: false,
       nodeList: [],
       // 人员编辑
@@ -402,6 +402,7 @@ export default {
         this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
         this.uploadFileLength = this.ch_pageData.fileTextList.length
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
+        this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5
         // this.ch_pageData.comityFileNum = this.fileTextList
       })
     },
@@ -491,7 +492,7 @@ export default {
       _formData.append('json', JSON.stringify({
         ch_pageData: this.ch_pageData,
         roleList: this.roleForm,
-        commentText: this.commentText
+        commentStep5: this.commentStep5
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -506,7 +507,7 @@ export default {
       let json = {
         leader: this.roleForm.leaderUserId,
         ch_pageData: this.ch_pageData,
-        commentText: this.commentText,
+        commentText: this.commentStep5,
         roleList: this.roleForm,
       }
       this.$refs['ch_pageData'].validate((valid) => {

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue

@@ -1134,7 +1134,6 @@ export default {
               if (valid) {
                 this.isSubmit = true
                 this.$http.post("lawss/activiti/startProcessRollBack", {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '4',
@@ -1157,6 +1156,14 @@ export default {
                     }, res => {
                       if (res.success) {
                         this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -690,7 +690,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {saveTaskFirst} from "api/process";
+import { saveTaskFirst, taskDel } from "api/process";
 import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
 
 export default {
@@ -1064,7 +1064,6 @@ export default {
               if (valid) {
                 this.isSubmit = true
                 this.$http.post("lawss/activiti/startProcessRollBack", {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '4',
@@ -1087,6 +1086,14 @@ export default {
                     }, res => {
                       if (res.success) {
                         this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -2929,7 +2929,7 @@ export default {
 
       this.saveLoading = true
       let _formData = new FormData()
-      // _formData.append('id', this.bpnId)
+      _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.uName)
       _formData.append('prcType', '1')

src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue

@@ -749,7 +749,7 @@ export default {
       })
       if (this.type2 === '1') {
         this.roleForm.dockUserList = idList
-        this.roleForm.dockUserName = nameList
+        this.roleForm.dockUserListName = nameList
       } else {
         this.roleForm.directorUser = idList
         this.roleForm.directorUserName = nameList

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue

@@ -187,7 +187,6 @@ export default {
         if (valid) {
           this.isSubmit = true
           this.$http.post("lawss/activiti/startProcessRollBack", {
-            id: this.bpnId || '',
             createUser: this.$store.getters.userInfo.userId,
             createUserName: this.$store.getters.userInfo.userName,
             type: '14',

src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue

@@ -186,7 +186,6 @@ export default {
         if (valid) {
           this.isSubmit = true
           this.$http.post("lawss/activiti/startProcessRollBack", {
-            id: this.bpnId || '',
             createUser: this.$store.getters.userInfo.userId,
             createUserName: this.$store.getters.userInfo.userName,
             type: '15',

src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue

@@ -49,7 +49,7 @@
                         :value="item.id">
                       </el-option>
                     </el-select>
-                    <el-select v-if="wbbzform.associationName !== '' && wbbzform.committee !== ''"  v-model="wbbzform.workingGroup" placeholder="请选择工作组">
+                    <el-select v-if="wbbzform.associationName !== '' && wbbzform.committee !== ''" @change="comityChangeTwo" v-model="wbbzform.workingGroup" placeholder="请选择工作组">
                       <el-option
                         v-for="item in comityOptionsOneThree"
                         :key="item.id"
@@ -127,7 +127,7 @@
             <template slot-scope="scope">
               <el-input  v-model="scope.row.workPeopleId" style="display: none;" readonly/>
               <el-input  v-model="scope.row.workPeople" placeholder="请选择分发责任人"
-                        @click.native="choiceZRRS(scope.row, scope.$index)" readonly/>
+                         @click.native="choiceZRRS(scope.row, scope.$index)" readonly/>
             </template>
           </el-table-column>
           <el-table-column
@@ -172,7 +172,7 @@
             width="300"
             align="center">
             <template slot-scope="scope">
-                 <el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input>
+              <el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -205,7 +205,6 @@
                   row-key="id">
           <el-table-column type="selection" width="55" align="center"/>
           <el-table-column
-            prop="contactPerson"
             label="协会联络人"
             align="center">
             <template slot-scope="scope">
@@ -217,7 +216,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="telephone"
             label="电话"
             align="center">
             <template slot-scope="scope">
@@ -229,7 +227,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="mailbox"
             label="邮箱"
             align="center">
             <template slot-scope="scope">
@@ -369,6 +366,7 @@ export default {
       recordLoading: false,
       loading: false,
       modalshowflag: false,
+      fileIds: "",
       comityOptionsOne: [],  //工作组数据
       comityOptionsTwo: [],  //分标委数据
       comityOptionsOneThree: [], //工作组数据
@@ -441,6 +439,7 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes);
+        console.log(mes);
         this.wbbzform = mes.form
         this.associationData = mes.form.associationData
         this.getFileInfo();
@@ -471,7 +470,7 @@ export default {
         this.$nextTick(() => {
           res.data.map(item => {
             // 赋值要回显的上传文件内容
-            this.fileList.push({
+            this.fileInfoList.push({
               name: item.oldFileName,
               uid: item.uid,
               status: item.status,
@@ -486,32 +485,62 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         if(!item.directorUser){
-          this.wbbzform = JSON.parse(JSON.stringify(item));
+          this.wbbzform = JSON.parse(JSON.stringify(item.form));
-          this.associationData = item.associationData
+          this.wbbzform.comityOptionsOne.forEach(item =>{
-          this.participantsData = item.participantsData
+            if(this.wbbzform.associationName === item.id){
+              this.wbbzform.associationName = item.name
+            }
+          })
+          this.wbbzform.comityOptionsTwo.forEach(item =>{
+            if(this.wbbzform.committee === item.id){
+              this.wbbzform.committee = item.name
+            }
+          })
+          this.wbbzform.comityOptionsOneThree.forEach(item =>{
+            if(this.wbbzform.workingGroup === item.id){
+              this.wbbzform.workingGroup = item.name
+            }
+          })
+          if (item.form.associationData) {
+            this.associationData = item.form.associationData
+          }
+          if (item.form.participantsData) {
+            this.participantsData = item.form.participantsData
+          }
+          item.form.fileName.forEach(fileId => {
+            this.fileIds = fileId.id
+            this.getFileInfo();
+          })
         }else{
-
+          this.wbbzform = JSON.parse(JSON.stringify(item));
+          if (item.associationData) {
+            this.associationData = item.associationData
+          }
+          if (item.participantsData) {
+            this.participantsData = item.participantsData
+          }
         }
       });
     },
     choiceZRRS(row, index) {
-        this.selectedId = index;
+      this.selectedId = index;
-        this.drawerTitle = "选择责任人";
+      this.drawerTitle = "选择责任人";
-        this.nodeList = [];
+      this.nodeList = [];
-        this.zrIndex = index;
+      this.zrIndex = index;
-        this.nodeList.push(row);
+      this.nodeList.push(row);
-        this.modalshowflag = true;
+      this.modalshowflag = true;
-      },
+    },
     checkedRole(data){
       if(this.participantsData.length > 1){
         let parList = data
         this.participantsData.forEach(item =>{
           parList.forEach(items => {
             if(items.name === item.workPeople){
-                this.$message.warning('请勿重复添加参与人')
+              this.$message.warning('请勿重复添加参与人')
-                return
+              return
             }else{
             }
           })
@@ -534,7 +563,7 @@ export default {
     //不备案
     handleRecord(){
       this.recordLoading = true
-      this.dlFlag = '0',
+      this.dlFlag = '0'
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
@@ -559,11 +588,17 @@ export default {
     handleSave() {
       this.saveLoading = true
       this.wbbzform.fileName = this.fileInfoList
+      this.wbbzform.commentText = this.commentText;
+      this.wbbzform.participantsData = this.participantsData
+      this.wbbzform.associationData = this.associationData
+      this.wbbzform.comityOptionsOne = this.comityOptionsOne
+      this.wbbzform.comityOptionsTwo = this.comityOptionsTwo
+      this.wbbzform.comityOptionsOneThree = this.comityOptionsOneThree
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         roleList: this.roleForm,
-        wbbzform: this.wbbzform,
+        form: this.wbbzform,
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -646,11 +681,12 @@ export default {
     },
     //添加协会信息
     addSociety(){
-      var list = {
+      let list = {
         contactPerson: this.contactPerson,
         telephone: this.telephone,
         mailbox: this.mailbox,
       }
+      console.log(this.associationData);
       this.associationData.push(list)
     },
     //批量删除协会信息
@@ -708,6 +744,7 @@ export default {
       this.comityOptionsOne.forEach(item => {
         if (item.children !== null && item.id === this.wbbzform.associationName) {
           this.comityOptionsTwo = item.children
+          this.$forceUpdate()
         }
       })
     },
@@ -717,9 +754,13 @@ export default {
       this.comityOptionsTwo.forEach(item => {
         if (item.children !== null && item.id === this.wbbzform.committee) {
           this.comityOptionsOneThree = item.children
+          this.$forceUpdate()
         }
       })
     },
+    comityChangeTwo(){
+      this.$forceUpdate()
+    },
   },
   mounted() {
     /*  获取标准法规工作组数据  */

src/pages/processCenter/pages/creatProcess/qbfs/step1.vue

@@ -584,7 +584,6 @@ export default {
                 this.qbfsForm.commentText = this.commentText
                 var json = Object.assign(this.qbfsForm, this.roleForm)
                 this.$http.post('lawss/activiti/startProcessRollBack', {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '23',

src/pages/processCenter/pages/creatProcess/qbfz/step1.vue

@@ -625,7 +625,6 @@ export default {
                 this.standardSearch.commentText = this.commentText
                 var json = Object.assign(this.standardSearch, this.roleForm)
                 this.$http.post('lawss/activiti/startProcessRollBack', {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '24',

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue

@@ -472,10 +472,9 @@ export default {
             if (flag) {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
-                  // this.isSubmit = true;
+                  this.isSubmit = true;
-                  var json = Object.assign(qbzxdFrom, this.roleForm);
+                  let json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
-                    id: this.bpnId || '',
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
                     type: '25',

src/pages/processCenter/pages/creatProcess/wbsm/step1.vue

@@ -681,7 +681,6 @@ export default {
             if (valid) {
               this.isSubmit = true
               this.$http.post("lawss/activiti/startProcessRollBack", {
-                id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '16',

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -73,7 +73,7 @@
                 :rows="3"
                 resize="none"
                 placeholder="请输入意见"
-                v-model="commentText">
+                v-model="commentInfo">
               </el-input>
             </div>
           </el-collapse-item>
@@ -182,7 +182,7 @@ export default {
       passInfo: 0,
       detailData: [],
       loading: false,
-      commentText: '', // 意见
+      commentInfo: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       taskIds: this.$route.query.taskIds,
@@ -282,6 +282,7 @@ export default {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
         }
         this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
+        this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo
       })
     },
     // 批量选择分发责任人
@@ -325,7 +326,7 @@ export default {
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
         standardInfoList: this.dataList,
-        commentText: this.commentText
+        commentInfo: this.commentInfo
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -358,7 +359,7 @@ export default {
       let json = {
         dockUserList: list,
         passInfo: this.passInfo,
-        commentText: this.commentText
+        commentText: this.commentInfo
       }
       let flag=false
       this.dataList.forEach(item => {

src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue

@@ -275,7 +275,7 @@ export default {
             if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
               this.dataList = fileData[i].standardInfoList
               this.standardInfoList = this.dataList
-              this.textarea = JSON.parse(JSON.stringify(item)).commentText
+              // this.textarea = JSON.parse(JSON.stringify(item)).commentText
             }
           }
         }
@@ -314,7 +314,6 @@ export default {
     // 退回按钮
     handleSubmitNo() {
       if (this.textarea) {
-
         var json = {
           passInfo: 1,
           actionFlag: 1,

src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue

@@ -77,7 +77,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentInput">
             </el-input>
           </div>
         </el-collapse-item>
@@ -189,7 +189,7 @@ export default {
       modalshowflag: false, // drawer开关
       detailData: [],
       loading: false,
-      commentText: '', // 意见
+      commentInput: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       nonSearch: {
@@ -273,7 +273,8 @@ export default {
       this.$nextTick(() => {
         if (item.responUserList !== undefined) {
           let listJSON = JSON.parse(JSON.stringify(item.responUserList))
-          this.dataList = [listJSON][0]
+          this.dataList = listJSON
+          this.commentInput = JSON.parse(JSON.stringify(item)).commentInput
         } else {
           if (item.dockUserList !== undefined) {
             let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
@@ -433,10 +434,8 @@ export default {
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
-        responUserList: {
+        responUserList: this.dataList,
-          standardInfoList: this.dataList
+        commentInput: this.commentInput
-        },
-        commentText: this.commentText
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -474,7 +473,7 @@ export default {
       let json = {
         info: { fileDataList },
         username: this.$store.getters.userInfo.userName,
-        commentText: this.commentText,
+        commentText: this.commentInput,
       }
       const params = new FormData();
       params.set('json', JSON.stringify(json))

src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue

@@ -877,7 +877,6 @@ export default {
             this.$refs["roleForm"].validate((valid) => {
               if (valid) {
                 this.$http.post("lawss/activiti/startProcessRollBack", {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '5',
@@ -900,6 +899,14 @@ export default {
                     }, res => {
                       if (res.success) {
                         this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false;

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -511,7 +511,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst } from "api/process";
+import { saveTaskFirst, taskDel } from "api/process";
 import file from "@/pages/knowledgeGraph/components/file";
 
 export default {
@@ -870,7 +870,6 @@ export default {
             this.$refs["roleForm"].validate((valid) => {
               if (valid) {
                 this.$http.post("lawss/activiti/startProcessRollBack", {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '5',
@@ -893,6 +892,14 @@ export default {
                     }, res => {
                       if (res.success) {
                         this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false;

src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue

@@ -613,7 +613,6 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   this.$http.post("lawss/activiti/startProcessRollBack", {
-                    id: this.bpnId || '',
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
                     type: '6',
@@ -635,6 +634,14 @@ export default {
                       }, res => {
                         if (res.success) {
                           this.$message.success(res.message);
+                          if (this.bpnId !== '') {
+                            let taskId = {
+                              id: this.bpnId
+                            }
+                            taskDel(taskId).then(res=>{
+                              return res
+                            })
+                          }
                           this.$router.push("/processCenter");
                         }
                         this.isSubmit = false;

src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue

@@ -346,7 +346,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst } from "api/process";
+import { saveTaskFirst, taskDel } from "api/process";
 import file from "@/pages/knowledgeGraph/components/file";
 
 export default {
@@ -630,7 +630,6 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   this.$http.post("lawss/activiti/startProcessRollBack", {
-                    id: this.bpnId || '',
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
                     type: '6',
@@ -652,6 +651,14 @@ export default {
                       }, res => {
                         if (res.success) {
                           this.$message.success(res.message);
+                          if (this.bpnId !== '') {
+                            let taskId = {
+                              id: this.bpnId
+                            }
+                            taskDel(taskId).then(res=>{
+                              return res
+                            })
+                          }
                           this.$router.push("/processCenter");
                         }
                         this.isSubmit = false;

src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue

@@ -415,6 +415,7 @@ export default {
           this.listForm.breakdownList = item.breakdownList;
         } else {
           this.listForm = item.form
+          this.commentText = item.commentText
           this.dataList = item.form.dataList
         }
 

src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue

@@ -418,6 +418,7 @@ export default {
           this.listForm.breakdownList = item.breakdownList;
         } else {
           this.listForm = item.form;
+          this.commentText = item.commentText
           this.dataList = item.form.dataList;
         }
 

src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue

@@ -362,11 +362,7 @@ export default {
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
-          this.dataList.forEach(item => {
+          this.commentText = item.commentText
-            this.$set(item, "workPeople", "请选择责任人");
-            this.$set(item, "workPeopleId", "");
-          });
-          console.log(this.dataList);
         }
       });
     },

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -717,6 +717,7 @@ export default {
           this.total = this.dataList.length;
         } else {
           this.listForm = item.form;
+          this.commentText = item.commentText
           let dataChildren = []
           let dataListChildren = []
           this.listForm.dataList.forEach(item => {

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue

@@ -655,7 +655,6 @@ export default {
             if (valid) {
               this.isSubmit = true;
               this.$http.post("lawss/activiti/startProcessRollBack", {
-                id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '10',
@@ -678,6 +677,14 @@ export default {
                   }, res => {
                     if (res.success) {
                       this.$message.success(res.message);
+                      if (this.bpnId !== '') {
+                        let taskId = {
+                          id: this.bpnId
+                        }
+                        taskDel(taskId).then(res=>{
+                          return res
+                        })
+                      }
                       this.$router.push("/processCenter");
                     }
                     this.isSubmit = false;

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -388,7 +388,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst } from "api/process";
+import { saveTaskFirst, taskDel } from "api/process";
 
 export default {
   name: "xmqdqrStep1",
@@ -665,7 +665,6 @@ export default {
             if (valid) {
               this.isSubmit = true;
               this.$http.post("lawss/activiti/startProcessRollBack", {
-                id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '10',
@@ -688,6 +687,14 @@ export default {
                   }, res => {
                     if (res.success) {
                       this.$message.success(res.message);
+                      if (this.bpnId !== '') {
+                        let taskId = {
+                          id: this.bpnId
+                        }
+                        taskDel(taskId).then(res=>{
+                          return res
+                        })
+                      }
                       this.$router.push("/processCenter");
                     }
                     this.isSubmit = false;

src/pages/processCenter/pages/phone/wfhxzg/step2.vue

@@ -77,7 +77,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="commentInfo">
             </el-input>
           </div>
         </el-collapse-item>
@@ -120,7 +120,7 @@ export default {
     return {
       passInfo: 0,
       loading: false,
-      commentText: '', // 意见
+      commentInfo: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       taskIds: this.$route.query.taskIds,
@@ -208,7 +208,7 @@ export default {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
         }
         this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
-        this.commentText = JSON.parse(JSON.stringify(item)).commentText
+        this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo
       })
     },
     // 批量选择分发责任人
@@ -225,7 +225,6 @@ export default {
     },
     // 每行选择负责人点击操作
     clickOpen(val, id) {
-      console.log()
       this.$refs.multipleTable.clearSelection()
       this.rowDutyPeople = val
       if (this.rowDutyPeople.dutyPeopleId.length > 0) {
@@ -256,7 +255,7 @@ export default {
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
         standardInfoList: this.dataList,
-        commentText: this.commentText
+        commentInfo: this.commentInfo
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -288,7 +287,8 @@ export default {
       }
       let json = {
         dockUserList: list,
-        passInfo: this.passInfo
+        passInfo: this.passInfo,
+        commentText: this.commentInfo
       }
       let flag=false
       this.dataList.forEach(item => {

src/pages/processCenter/pages/phone/wfhxzg/step3.vue

@@ -74,14 +74,14 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="textarea">
             </el-input>
           </div>
         </el-collapse-item>
@@ -127,7 +127,7 @@ export default {
     return {
       passInfo: 0,
       loading: false,
-      commentText: '', // 意见
+      textarea: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       nonSearch: {
@@ -195,6 +195,7 @@ export default {
             if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
               this.dataList = fileData[0].standardInfoList
               this.standardInfoList = this.dataList
+              this.textarea = JSON.parse(JSON.stringify(item)).textarea
             }
           }
         } else {
@@ -246,12 +247,12 @@ export default {
     },
     // 退回按钮
     handleSubmitNo() {
-      if (this.commentText) {
+      if (this.textarea) {
 
         var json = {
           passInfo: 1,
           actionFlag: 1,
-          commentText: this.commentText,
+          commentText: this.textarea,
           standardInfoList: this.standardInfoList,
         }
         const params = new FormData();
@@ -305,7 +306,7 @@ export default {
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
         dockUserList: list,
-        commentText: this.commentText
+        textarea: this.textarea
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -346,6 +347,7 @@ export default {
       let json = {
         passInfo: this.passInfo,
         responUserList: list,
+        commentText: this.textarea,
         actionFlag: 0
       }
       if(flag)return;

src/pages/processCenter/pages/phone/wfhxzg/step5.vue

@@ -261,9 +261,7 @@ export default {
       this.backLoading = true
       if (this.commentText) {
         var json = {
-          responUserList: {
+          responUserList: this.dataList,
-            standardInfoList: this.dataList
-          },
           actionFlag: 1,
           commentText: this.commentText
         }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -163,12 +163,12 @@
                    v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
         </el-button>
         <el-button class="common-button-default"
-                   v-btn-permission="'249aaa052affd5ad579ecffb8fd6b084'"
+                   v-btn-permission="''"
                    size="mini"
                    @click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
         </el-button>
         <el-button class="common-button-default"
-                   v-btn-permission="'7b0ee71c73a89a28e8e754b371e50dde'"
+                   v-btn-permission="''"
                    size="mini"
                    @click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
         </el-button>
@@ -1745,6 +1745,13 @@
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
 
+                  <!--    模块结构单元名称     -->
+                  <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYMC" clearable
+                              placeholder="模块结构单元名称"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+
                 </el-col>
                 <el-col :span="12">
                   <!--            起草单位-->
@@ -1839,6 +1846,12 @@
                               placeholder="关联模块--卡车VPPS中文名称"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
+
+                  <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYBXH" clearable
+                              placeholder="模块结构单元变型号"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
                 </el-col>
               </el-row>
             </div>
@@ -2314,7 +2327,9 @@ export default {
         , CBCD: ''//采标程度
         , YYBJ: ''//引用标准
         , BYYBJ: ''//被引用标准
-        , TXLB: ''//体系类别
+        , TXLB: '',//体系类别
+        DYBXH: '',// 模块结构单元变形号
+        DYMC: '',//模块结构单元名称
       },
       // 树形结构
       // tree function

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -301,6 +301,59 @@
                                                 </el-input>
                                             </div>
                                         </el-form-item>
+                                        <el-form-item label="标准范围" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-select v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+                                                    <el-option
+                                                            v-for="item in BZList"
+                                                            :key="item.value"
+                                                            :label="item.label"
+                                                            :value="item.value">
+                                                    </el-option>
+                                                </el-select>
+                                            </div>
+                                        </el-form-item>
+                                        <el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
+                                                <el-radio-group v-model="addForm.isRelate">
+                                                    <el-radio label="是" value="是"></el-radio>
+                                                    <el-radio label="否" value="否"></el-radio>
+                                                </el-radio-group>
+                                            </div>
+                                        </el-form-item>
+                                        <template v-if="addForm.isRelate === '是'">
+                                            <custom-input-for-all-standards
+                                                    class="classDisplay"
+                                                    :config="{attrName: '采用标准'}"
+                                                    :labelWidth="'180px'"
+                                                    v-model="addForm.esStandRelations"
+                                            ></custom-input-for-all-standards>
+                                        </template>
+                                        <el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
+                                                <el-radio-group v-model="addForm.useLevel">
+                                                    <el-radio label="等同" value="等同"></el-radio>
+                                                    <el-radio label="修改" value="修改"></el-radio>
+                                                    <el-radio label="非等效" value="非等效"></el-radio>
+                                                </el-radio-group>
+                                            </div>
+                                        </el-form-item>
+                                        <el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-input
+                                                        v-model="addForm.technologic"
+                                                        placeholder="请简述技术指标依据">
+                                                </el-input>
+                                            </div>
+                                        </el-form-item>
+                                        <template>
+                                            <custom-input-for-all-standards2
+                                                    class="classDisplay"
+                                                    :config="{attrName: '配套标准'}"
+                                                    :labelWidth="'180px'"
+                                                    v-model="addForm.esMatingRelations"
+                                            ></custom-input-for-all-standards2>
+                                        </template>
                                     </el-form>
                                 </el-col>
                             </el-row>
@@ -385,7 +438,6 @@
                                             type="primary"
                                             size="mini"
                                             class="common-button-primary"
-
                                             @click="QYBZget">查询
                                     </el-button>
                                     <el-button
@@ -490,11 +542,17 @@
 </template>
 
 <script>
+    import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
+    import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
     export default {
         name: "enterpriseStandardPlan",
-        components: {},
+        components: {
+            CustomInputForAllStandards,
+            CustomInputForAllStandards2
+        },
         data() {
             return {
+                BZList: [],
                 TXJGList: [],
                 TXJGmodal: false,
                 standSystemOptions: [],
@@ -533,6 +591,12 @@
                 DrawerType: '',
                 ids: [],
                 addForm: {
+                    esMatingRelations: '',
+                    technologic: '',
+                    useLevel: '',
+                    isRelate: '',
+                    esStandRelations: '',
+                    area: '',
                     tsJson: '',
                     tsJsonName: '',
                     rqbJson: '',
@@ -943,6 +1007,8 @@
             }, res => {
                 this.QCDWList = res.data.QCDW // 起草单位
                 this.standSystemOptions = res.data.TXLBBUSS // 体系结构
+                this.BZList = res.data.ENERGYTYPES
+                console.log(this.BZList);
             }, e => {
             })
         },
@@ -955,6 +1021,14 @@
     #enterpriseStandardPlan {
         height: 100%;
         background: #fff;
+        .classDisplay {
+            /deep/.el-form-item__content {
+                width: calc(~'100% - 180px');
+                .el-input__inner {
+                    width: calc(~'100% - 80px');
+                }
+            }
+        }
         .standardForComments {
             height: calc(~'100% - 56px');
             background: #fff;
@@ -993,6 +1067,7 @@
         .add-form-item {
             /deep/.el-form-item__content {
                 width: calc(~'100% - 180px');
+                height: 50px;
             }
         }
         display: flex;

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -132,11 +132,6 @@
             label="责任部门"
             width="180px"
           >
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">
-                {{ zrbmMap[scope.row.zrbm] }}
-              </span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -507,7 +502,6 @@ export default {
       standList1: [],//调取添加的数据
       id: '',//批量删除.
       saveExportType: '',// 导出文件模态框控制，和文件名称
-      zrbmMap: {},
       textStatusMap: {} // 文本状态id与name对应
     }
   },
@@ -975,7 +969,6 @@ export default {
       }, res => {
         this.energyKindOptions = res.data.ENERGYTYPES //适用车型
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-        this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap, res.data.WBZTCLASS)
         this.showLocalProductData(this.getLocalPro)
       }, e => {