feat: There is no way the,ddd

src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue

@@ -32,10 +32,7 @@
         <!--                                    ></el-option>-->
         <!--                                </el-select>-->
         <!--                            </el-form-item>-->
-        <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+
-          <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                         :editable="false"></el-datePicker>
-        </el-form-item>
         <!--                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
         <!--                                <el-datePicker v-model="form.FSRQBUSS"-->
         <!--                                               :editable="false"-->
@@ -62,6 +59,10 @@
         <!--                                        clearable-->
         <!--                                ></el-input>-->
         <!--                            </el-form-item>-->
+        <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+          <el-datePicker v-model="form.putTime" :disabled="disabledState"
+                         :editable="false"></el-datePicker>
+        </el-form-item>
         <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
           <el-input
                   v-model="form.standEnName" :disabled="disabledState"
@@ -93,42 +94,54 @@
     <el-row :gutter="24">
       <el-col :span="12">
         <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+          <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <!-- {{ value.name }} -->
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-            {{value.name}}
+            <span style="width: 20%;margin-left: 15px;">
-          </div>
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-          <div v-else>
+                  </span>
-            - -
           </div>
+<!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+<!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+<!--            {{value.name}}-->
+<!--          </div>-->
         </el-form-item>
         <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+          <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <!-- {{ value.name }} -->
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-            {{value.name}}
+            <span style="width: 20%;margin-left: 15px;">
-          </div>
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-          <div v-else>
+                  </span>
-            - -
           </div>
+<!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+<!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+<!--            {{value.name}}-->
+<!--          </div>-->
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+          <div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <!-- {{ value.name }} -->
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-            {{value.name}}
+            <span style="width: 20%;margin-left: 15px;">
-          </div>
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-          <div v-else>
+                  </span>
-            - -
           </div>
+<!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+<!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+<!--            {{value.name}}-->
+<!--          </div>-->
         </el-form-item>
         <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+          <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <!-- {{ value.name }} -->
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-            {{value.name}}
+            <span style="width: 20%;margin-left: 15px;">
-          </div>
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-          <div v-else>
+                  </span>
-            - -
           </div>
+<!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+<!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+<!--            {{value.name}}-->
+<!--          </div>-->
         </el-form-item>
       </el-col>
     </el-row>
@@ -258,13 +271,16 @@
           </el-select>
         </el-form-item>
         <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+          <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <!-- {{ value.name }} -->
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-            {{value.name}}
+            <span style="width: 20%;margin-left: 15px;">
-          </div>
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-          <div v-else>
+                  </span>
-            - -
           </div>
+<!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+<!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+<!--            {{value.name}}-->
+<!--          </div>-->
         </el-form-item>
       </el-col>
     </el-row>
@@ -410,6 +426,10 @@ export default {
       type: Boolean,
       default: false
     },
+    fileShow: {
+      type: Boolean,
+      default: false
+    },
   },
   filters: {
     ellipsis (value) {
@@ -464,6 +484,24 @@ export default {
     ...mapGetters(['userInfo'])
   },
   methods: {
+    // 文件预览及下载
+    handleFilePreview(file,type) {
+      let attId = ""
+      if(file && file.id){
+        attId = file.id
+      }else {
+        attId = file.response.data.id
+      }
+      if (type === 'down') {
+        if (attId) {
+          window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+        } else {
+          this.$message.warning('文件不存在,下载失败')
+        }
+      } else {
+        this.$preview(attId)
+      }
+    },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
       window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)

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

@@ -1492,7 +1492,7 @@
                         { required: false, message: '请选择企标发布日期', trigger: 'change' }
                     ],
                     putTime: [
-                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
                     ],
                     FBGBUSSName: [
                         { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

src/pages/processCenter/pages/creatProcess/qbrk/step10.vue

@@ -962,6 +962,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],

src/pages/processCenter/pages/creatProcess/qbrk/step11.vue

@@ -961,6 +961,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],

src/pages/processCenter/pages/creatProcess/qbrk/step12.vue

@@ -18,18 +18,27 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
-                <formListIn
+                <formEditList
-                        :form = "form"
+                        :key = "formKey"
-                        :FBGBUSSFileList = "FBGBUSSFileList"
+                        :formSub = "form"
-                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                        :FBGBUSSFileListSub = "FBGBUSSFileList"
-                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :LSBBBUSSFileListSub = "LSBBBUSSFileList"
-                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :BZSMBUSSFileListSub = "BZSMBUSSFileList"
-                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :QTWJBUSSFileListSub = "QTWJBUSSFileList"
-                        :summaryFileList = "summaryFileList"
+                        :GLWJBUSSFileListSub = "GLWJBUSSFileList"
                         :disabledState = "disabledState"
                         :verifySarStandard = "verifySarStandard"
-                        :opinionsShow = "true"
+                        :fileMadelSub = "fileMadel"
-                ></formListIn>
+                        :fbgDown = "false"
+                        @formCancel="formCancel"
+                        @formSelectLawsCancel = "formSelectLawsCancel"
+                        @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+                        @formChoiceQCDW = "formChoiceQCDW"
+                        @formChoiceZRR1 = "formChoiceZRR1"
+                        @formChoiceZRR2 = "formChoiceZRR2"
+                        @formChoiceZRR3 = "formChoiceZRR3"
+                        @formChoiceZRR4 = "formChoiceZRR4"
+                />
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -357,6 +366,12 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <Mechanism-tree
+            is-title="选择部门信息"
+            :is-visible.sync="modalShowFlagZRBM"
+            :nodeList="nodeListZRBM"
+            @checkedRole="drawerCheckZRBM"
+    />
     <!--        <el-drawer-->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -561,7 +576,7 @@
 </template>
 
 <script>
-    import formListIn from './common/formListIn.vue'
+    import formEditList from './common/formEditList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -573,7 +588,7 @@
     export default {
         name: "bussLibrary12",
         components: {
-            formListIn,
+            formEditList,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
@@ -742,6 +757,8 @@
                     children: 'children',
                     label: 'model'
                 },
+                modalShowFlagZRBM: false,
+                nodeListZRBM: [],
                 nodeList: [],
                 nodeList2: [],
                 zrType: '',
@@ -752,6 +769,7 @@
                     children: 'children',
                     label: 'name'
                 },
+                formKey:1,
                 key:1,
                 key1:2,
                 key2:3,
@@ -1047,6 +1065,76 @@
             },
         },
         methods: {
+            drawerCheckZRBM(data) {
+                let idList = ''
+                let nameList = ''
+                data.forEach(item => {
+                    // if (item.hasChild === '0') {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                    // }
+                })
+                this.form.QCDW = nameList
+                this.form.QCDWID = idList
+                // if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
+                //     this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
+                //         _this: this,
+                //     }, res=> {
+                //         if(res){
+                //             this.form.QCRBUSSID = res.map(item => item.id).join(",")
+                //             this.form.QCRBUSS = res.map(item => item.name).join(",")
+                //         }
+                //     })
+                // }
+                this.formKey++
+            },
+            choiceQCDW(type, title, id) {
+                this.nodeListZRBM = []
+                if(this.form.QCDWID.length > 0){
+                    this.nodeListZRBM = this.form.QCDWID.split(',')
+                }
+                this.drawerTitle = title
+                this.modalShowFlagZRBM = true
+            },
+            formChoiceZRR1(type, title, id){
+                this.choiceZRR1(type, title, id)
+            },
+            formChoiceZRR2(type,title,id,flag){
+                this.choiceZRR2(type,title,id,flag)
+            },
+            formChoiceZRR3(type, title, id){
+                this.choiceZRR3(type, title, id)
+            },
+            formChoiceZRR4(type, title, id){
+                this.choiceZRR4(type, title, id)
+            },
+            formChoiceQCDW(type, title, id){
+                this.choiceQCDW(type, title, id)
+            },
+            formChoiceZRRListCancel(type, title, id){
+                this.choiceZRRList(type, title, id)
+            },
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+                this.replaceLawsNumModel = replaceLawsNumModel
+                this.replaceLawType = replaceLawType
+                this.getReplaceLawsNumRow()
+            },
+            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) {
+                this.form = form
+                this.FBGBUSSFileList = list1
+                this.LSBBBUSSFileList = list2
+                this.BZSMBUSSFileList = list3
+                this.QTWJBUSSFileList = list4
+                this.GLWJBUSSFileList = list5
+                if(fileMadel){
+                    this.fileType = fileType
+                    this.fileUpload(fileType)
+                }
+            },
             modelProp(row,index){
                 console.log(row)
                 console.log(index)
@@ -1249,8 +1337,15 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
+                        this.formKey++
                     })
                 }else {
                     this.form.XCSJBUSS = this.dateFormatter()
@@ -1548,7 +1643,19 @@
             },
             choiceZRRList (type, title, id) {
                 this.nodeList = []
-                this.nodeList.push(id)
+                if(type === 'qcUserId'){
+                    if ( this.roleForm.qcUserId.length > 0) {
+                        this.nodeList2 = this.roleForm.qcUserId.split(',')
+                    }
+                }else if(type === 'hqUserId'){
+                    if ( this.roleForm.hqUserId.length > 0) {
+                        this.nodeList2 = this.roleForm.hqUserId.split(',')
+                    }
+                }else if(type === 'QCRBUSS'){
+                    if ( this.form.QCRBUSSID.length > 0) {
+                        this.nodeList2 = this.form.QCRBUSSID.split(',')
+                    }
+                }
                 this.userType = type
                 this.drawerTitle = title
                 this.modalShowRoleFlag = true
@@ -1598,14 +1705,15 @@
                 this.modalShowFlag1 = true
                 this.key++
             },
-            choiceZRR2 (type, title, id) {
+            choiceZRR2 (type, title, id,flag) {
                 this.drawerTitle = title
                 this.modalShowFlag2 = true
+                this.multipleFlag2 = flag
                 this.url = ''
                 this.urlChild = ''
+                this.type = type
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key1++
             },
             choiceZRR3 (type, title, id) {
                 this.drawerTitle = title
@@ -1614,7 +1722,6 @@
                 this.urlChild = ''
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key2++
             },
             choiceZRR4 (type, title, id) {
                 this.drawerTitle = title
@@ -1623,7 +1730,6 @@
                 this.urlChild = ''
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
-                this.key3++
             },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2310,6 +2416,7 @@
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
                                 this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
+                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2391,6 +2498,7 @@
             },
         },
         mounted () {
+            this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -952,6 +952,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change' }
                     ],
+                    putTime: [
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],

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

@@ -1019,7 +1019,7 @@
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     putTime: [
-                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1975,11 +1975,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+                // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
-                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
-                    this.$message.error('文件限制只可上传一个')
+                //     this.$message.error('文件限制只可上传一个')
-                    return false
+                //     return false
-                }
+                // }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
@@ -2533,7 +2533,6 @@
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                console.log(this.LSBBBUSSFileList)
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
                                 this.formKey++

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

@@ -957,6 +957,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],

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

@@ -7,8 +7,8 @@
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">会签评分</div>
         <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
-<!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
+        <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">会签意见</div>
-        <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+        <div class="headerTabsItem" :class="active === '4' ? 'active' : ''" @click="handleTabs('4')">审批历史</div>
     </div>
     <div class="content">
         <el-form
@@ -115,7 +115,7 @@
                 </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="会签意见" name = "1">
+                        <el-collapse-item title="审批意见" name = "1">
                             <div style="margin: 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -129,34 +129,34 @@
                                     <!--                        <el-option label="通过" value="0"></el-option>-->
                                     <!--                      </el-select>-->
                                     <!--                    </el-form-item>-->
-                                    <el-form-item label="会签意见文件" prop="summaryName" class="add-form-item form-item-disabled">
+<!--                                    <el-form-item label="会签意见文件" prop="summaryName" class="add-form-item form-item-disabled">-->
-                                        <el-input
+<!--                                        <el-input-->
-                                                disabled
+<!--                                                disabled-->
-                                                style="display: none;"
+<!--                                                style="display: none;"-->
-                                                v-model="form.summaryName"
+<!--                                                v-model="form.summaryName"-->
-                                                clearable
+<!--                                                clearable-->
-                                        ></el-input>
+<!--                                        ></el-input>-->
-                                        <div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">
+<!--                                        <div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">-->
-                                            <div style="width: 30%;">
+<!--                                            <div style="width: 30%;">-->
-                                                <div v-for="(item,index) in summaryList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+<!--                                                <div v-for="(item,index) in summaryList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">-->
-                                                    <span style="width: 80%;" @click="handleFilePreview2(item,'preview')">{{ item.name }}</span>
+<!--                                                    <span style="width: 80%;" @click="handleFilePreview2(item,'preview')">{{ item.name }}</span>-->
-                                                    <span style="width: 20%;margin-left: 15px;">
+<!--                                                    <span style="width: 20%;margin-left: 15px;">-->
-                                                    <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview2(item,'down')"></el-button>
+<!--                                                    <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview2(item,'down')"></el-button>-->
-                                                </span>
+<!--                                                </span>-->
-                                                </div>
+<!--                                                </div>-->
-                                            </div>
+<!--                                            </div>-->
-                                            <div style="width: 20%;">
+<!--                                            <div style="width: 20%;">-->
-                                                <el-button
+<!--                                                <el-button-->
-                                                        type="primary"
+<!--                                                        type="primary"-->
-                                                        class="common-button-primary"
+<!--                                                        class="common-button-primary"-->
-                                                        size="mini"
+<!--                                                        size="mini"-->
-                                                        style="margin-top: 6px; float: left;"
+<!--                                                        style="margin-top: 6px; float: left;"-->
-                                                        @click="fileUpload('summary')">
+<!--                                                        @click="fileUpload('summary')">-->
-                                                    <i class="el-icon-upload"></i>
+<!--                                                    <i class="el-icon-upload"></i>-->
-                                                </el-button>
+<!--                                                </el-button>-->
-                                            </div>
+<!--                                            </div>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </el-form-item>
+<!--                                    </el-form-item>-->
                                     <el-form-item
                                             prop="commentText"
                                     >
@@ -185,7 +185,128 @@
                         :disabledState = "disabledState"
                         :verifySarStandard = "verifySarStandard"></formList>
             </div>
-<!--            <div class="block" id="active2" v-show="active === '2'">-->
+            <div class="block" id="active3" v-show="active === '3'">
+                <ProcessTitle>
+                    <template slot="title">模块信息</template>
+                </ProcessTitle>
+                <template>
+                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                        <div class="action-bar">
+<!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+<!--                                批量编辑-->
+<!--                            </el-button>-->
+                            <el-button
+                                    type="primary"
+                                    size="mini"
+                                    class="common-button-primary add-button"
+                                    @click="createRow"
+                            >创建条款</el-button>
+                        </div>
+                        <el-table
+                                ref="selection"
+                                tooltip-effect="dark"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                                        fontWeight: 'bold', height: '48px'}"
+                                @selection-change="handleSelectionChange"
+                                row-key="id"
+                                :data="form.modelData"
+                                border
+                                default-expand-all
+                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+<!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+                            <el-table-column
+                                    prop="id"
+                                    label="序号"
+                                    min-width="5%"
+                                    align="center">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="modelNum"
+                                    label="条款号"
+                                    min-width="5%"
+                                    align="center"
+                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+                            </el-table-column>
+                            <el-table-column
+                                    label="修改前"
+                                    align="center"
+                                    min-width="20%">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <el-input v-model="scope.row.modelUpdateBefore" :title="scope.row.modelUpdateBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    label="修改后"
+                                    align="center"
+                                    min-width="20%">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <el-input v-model="scope.row.modelUpdateAfter" :title="scope.row.modelUpdateAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    label="修改理由"
+                                    align="center"
+                                    min-width="20%">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <el-input v-model="scope.row.modelUpdateAfter" :disabled="scope.row.disabled"  placeholder="请填写修改理由"/>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    label="提出部门"
+                                    align="center"
+                                    min-width="20%">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <el-input v-model="scope.row.modelUpdateAfter" :disabled="scope.row.disabled"  placeholder="请选择提出人自动带入部门"/>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+<!--                            <el-table-column-->
+<!--                                    label="责任人"-->
+<!--                                    min-width="15%"-->
+<!--                                    align="center">-->
+<!--                                <template slot-scope="scope">-->
+<!--                                    <el-form-item-->
+<!--                                            style="margin-left: 0;margin-bottom:0;"-->
+<!--                                    >-->
+<!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
+<!--                                    </el-form-item>-->
+<!--                                </template>-->
+<!--                            </el-table-column>-->
+                            <el-table-column label="操作" align="center"  min-width="5%">
+                                <template slot-scope="scope">
+                                    <div @click.stop style="display: inline-block">
+                                        <el-dropdown trigger="click" @command="handleCommand">
+                                            <i class="iconfont">&#xe61e;</i>
+                                            <el-dropdown-menu slot="dropdown">
+                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>
+                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>
+                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
+                                            </el-dropdown-menu>
+                                        </el-dropdown>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </template>
+            </div>
+<!--            <div class="block" id="active2" v-show="active === '3'">-->
 <!--                <ProcessTitle>-->
 <!--                    <template slot="title">模块信息</template>-->
 <!--                </ProcessTitle>-->
@@ -264,7 +385,7 @@
 <!--                    </div>-->
 <!--                </template>-->
 <!--            </div>-->
-            <div class="block" style="padding-top: 20px;" v-show="active === '3'">
+            <div class="block" style="padding-top: 20px;" v-show="active === '4'">
                 <div class="flow-list">
                     <el-table
                             height="100%"
@@ -1103,6 +1224,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1302,6 +1426,16 @@
                 if(row.modelName && row.modelName !== ''){
                     row.disabled = true
                 }
+            },
+             modelNameFunc1(row){
+                if(row.modelUpdateBefore && row.modelUpdateBefore !== ''){
+                    row.disabled1 = true
+                }
+            },
+            modelNameFunc2(row){
+                if(row.modelUpdateAfter && row.modelUpdateAfter !== ''){
+                    row.disabled2 = true
+                }
             },
             //判断是否可选
             checkSelect (row,index) {
@@ -1357,8 +1491,11 @@
                     orderNum: this.form.modelData.length + 1, // orderNum为新创建行的索引
                     pid: '0',
                     modelIndex: this.form.modelData.length,
-                    disabled: false,
+                    disabled1: false,
+                    disabled2: false,
                     modelName: "",
+                    modelUpdateBefore: "",
+                    modelUpdateAfter: "",
                     modelContent: "",
                     zrUserId:"",
                     zrUserIdName:"",
@@ -1382,8 +1519,11 @@
                     orderNum: row.children.length + 1, // orderNum为新创建行的索引
                     pid: row.modelNum,
                     modelIndex: row.children.length,
-                    disabled: false,
+                    disabled1: false,
+                    disabled2: false,
                     modelName: "",
+                    modelUpdateBefore: "",
+                    modelUpdateAfter: "",
                     modelContent: "",
                     zrUserId:"",
                     zrUserIdName:"",
@@ -2690,6 +2830,10 @@
     /deep/ #active2 .el-form-item__content{
         margin-left: 0px !important;
     }
+
+    /deep/ #active3 .el-form-item__content{
+        margin-left: 0px !important;
+    }
     .bzrkStep1 {
         /deep/.el-drawer__container {
             .prc-content-border {

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

@@ -1223,7 +1223,7 @@
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     putTime: [
-                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -2262,11 +2262,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+                // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
-                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
-                    this.$message.error('文件限制只可上传一个')
+                //     this.$message.error('文件限制只可上传一个')
-                    return false
+                //     return false
-                }
+                // }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {

src/pages/processCenter/pages/creatProcess/qbrk/step7.vue

@@ -1089,6 +1089,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],

src/pages/processCenter/pages/creatProcess/qbrk/step8.vue

@@ -883,6 +883,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],

src/pages/processCenter/pages/creatProcess/qbrk/step9.vue

@@ -1091,6 +1091,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],

src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue

@@ -921,6 +921,8 @@
                     xdUserName: this.$store.getters.userInfo.userName,
                     pxUserId: this.$store.getters.userInfo.userId,
                     pxUserName: this.$store.getters.userInfo.userName,
+                    fbUserId: '',
+                    fbUserName: '',
                     qcUserId: '', // 多实例
                     qcUserName:'', // 多实例
                     bzhUserId:'',
@@ -1017,7 +1019,7 @@
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     putTime: [
-                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1973,11 +1975,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+                // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
-                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
-                    this.$message.error('文件限制只可上传一个')
+                //     this.$message.error('文件限制只可上传一个')
-                    return false
+                //     return false
-                }
+                // }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
@@ -2531,7 +2533,6 @@
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                console.log(this.LSBBBUSSFileList)
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
                                 this.formKey++

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -352,7 +352,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '重新企标汇总修订'){
+          }else if (row.taskInfo === '重新企标编写汇总修订'){
             this.$router.push({
               name: 'bussLibraryC3',
               query: {

src/router/index.js

@@ -1067,7 +1067,15 @@ const routes = [
                 requireAuth: true,
                 title: '企标制修订流程及企业标准库流程'
             }
-        },
+        },{
+        path: '/bussLibrary13',
+        name: 'bussLibrary13',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step13.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订流程及企业标准库流程'
+        }
+      },
         {
             path: '/bussLibraryDetail',
             name: 'bussLibraryDetail',