Merge branch 'develop' into FOTON

src/components/CustomFormComponents/InputForAllStandards2.vue

@@ -164,6 +164,9 @@
             labelWidth: {
                 type: String,
                 default: '150px'
+            },
+            placeholderText: {
+                type: String
             }
         },
         data () {
@@ -193,7 +196,7 @@
         },
         computed: {
             placeholder () {
-                return `请输入${this.config.attrName}`
+                return `${this.placeholderText}`
             },
             showMessage () {
                 return `${this.config.attrName}不能为空`

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

@@ -24,28 +24,20 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
-                    disabled
+                          disabled
-                    v-model="form.cid"
+                          v-model="form.cid"
-                    placeholder="请输入标准编号"
+                          placeholder="请输入标准编号"
-                    clearable
+                          clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
-                    disabled
+                          disabled
-                    v-model="form.endTime"
+                          v-model="form.endTime"
-                    type="date"
+                          type="date"
-                    placeholder="请选择结束日期">
+                          placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
                 <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
@@ -54,7 +46,34 @@
                           style="display: none;"
                   ></el-input>
                   <div>
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="fileClass"
+                         style="margin-right: 15px;padding-left: 10px"
+                         v-for="(item, index) in form.fjList"
+                         :key="index">
+                      <span @click="fileLook(item)">{{ item.fileName }}</span>
+                      <el-button
+                              size="small"
+                              @click="filesUpload(item)"
+                              icon="el-icon-download"
+                              style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                </el-form-item>
+                <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
+                  <div v-if="form.modelList.length > 0">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                      <span @click="fileLook(item)">{{ item.name }}</span>
+                      <el-button
+                              size="small"
+                              @click="filesUpload(item)"
+                              icon="el-icon-download"
+                              style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                  <div v-else>
+                    - -
                   </div>
                 </el-form-item>
               </el-col>
@@ -67,12 +86,14 @@
         <div class="button-list">
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(data, '汇总单.xls')"
+                     @click="upload(oldData, '汇总单.xls')"
-                     size="mini">导出汇总单</el-button>
+                     size="mini">生成汇总单
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '征求意见搞.xls')"
+                     @click="upload(data, '上报意见.xls')"
-                     size="mini">导出征求意见搞</el-button>
+                     size="mini">生成上报意见
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -109,6 +130,9 @@
               prop="oldText"
               align="center"
               label="修改前">
+              <template slot-scope="scope">
+                <el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
+              </template>
             </el-table-column>
             <el-table-column
               prop="newText"
@@ -211,6 +235,15 @@
         </el-table-column>
       </el-table>
     </div>
+    <el-dialog
+            title="查看修改前内容"
+            :visible.sync="itermsConditionsFlag"
+            size="800px">
+      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -224,6 +257,8 @@ export default {
   name: "bzzqyjStep1-9",
   data() {
     return {
+      itermsConditionsFlag: false,
+      itermsConditionsTitle: '',
       histortData: [],
       oldData: [],
       data: [],
@@ -246,9 +281,14 @@ export default {
       isSubmit: false,
       saveLoading: false,
       form: {
-        cid: '', // 编号
+        cid: "", // 编号
-        endTime: '', // 结束日期
+        endTime: "", // 结束日期
-        cname: '', // 名称
+        cname: "", // 名称
+        fjList: [],
+        fjListId: '',
+        textType: '',
+        modelList: [],
+        modelNameList: '',
       },
       formRules: {
         responUserList: [
@@ -264,6 +304,25 @@ export default {
     ProcessTitle
   },
   methods: {
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.itermsConditionsFlag = true
+      this.itermsConditionsTitle = row
+    },
+    fileLook(file) { // 预览
+      const attId = file.attId
+      this.$preview(attId)
+    },
+    filesUpload (file) { // 下载
+      const attId = file.attId
+      if (attId) {
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+      } else {
+        this.$message.warning('文件不存在,下载失败')
+      }
+    },
     updataFj (item) {
       let id
       let type = item.fileName.split('.')
@@ -281,29 +340,39 @@ export default {
         this.histortData = res
       }, e => {})
     },
-    upload (row, title) {
+    upload(row, title) {
-      var params = {
+      if (row.length > 0) {
-        columnName: {
+        var params = {
-          chapterNumber : '章条编号',
+          columnName: {
-          chapterName : '章节名称',
+            chapterNumber: "章条编号",
-          commentText: '修改意见内容（包括理由或依据）',
+            chapterName: "章节名称",
-          department: '提出部门',
+            commentText: "修改意见内容（包括理由或依据）",
-          responUserName: '提出人',
+            oldText: "修改前",
-          stateText: '处理意见'
+            newText: "修改后",
-        },
+            reason: "修改理由",
-        dataList: []
+            department: "提出部门",
-      }
+            responUserName: "提出人",
-      params.dataList = JSON.parse(JSON.stringify(row))
+          },
-      params.dataList.forEach(item => {
+          dataList: []
-        if (item.state === '1') {
+        };
-          item.stateText = '上报'
+        if (title === '上报意见.xls') {
-        } else if (item.state === '2') {
+          params.columnName.stateText = "处理意见"
-          item.stateText = '处理后上报'
-        } else {
-          item.stateText = '不上报'
         }
-      })
+        params.dataList = JSON.parse(JSON.stringify(row));
-      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
+        params.dataList.forEach(item => {
+          if (item.state === "1") {
+            item.stateText = "上报";
+          } else if (item.state === "2") {
+            item.stateText = "处理后上报";
+          } else {
+            item.stateText = "不上报";
+          }
+        });
+        this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        });
+      } else {
+        this.$message.warning('无上报数据')
+      }
     },
     stateText (row) {
       if (row === '1') {
@@ -343,23 +412,55 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-          this.form.cid = data.cid
+          this.form.fjList = data.fjList || data.form.fjList
-          this.form.endTime = data.endTime
+          if (data.fjListId === '') {
-          this.form.cname = data.cname
+            this.form.fjListId = ''
-          this.form.fjList = data.fjList
+          } else {
-          this.form.fjListId = data.fjListId
+            this.form.fjListId =  data.form.fjListId || data.fjListId
+          }
+          this.commentText9 = data.commentText9 || ''
+          this.form.cid = data.cid || data.form.cid;
+          this.form.endTime = data.endTime || data.form.endTime;
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-          data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }
           })
           this.json = data
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
+          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.data = arr
-          this.oldData = data.oldinfo
         }).catch(e => {
-        })
+        });
-      })
+      });
+      // return new Promise((resolve, reject) => {
+      //   inboundLiaisonDetail({
+      //     taskIds: this.taskIds,
+      //     pId: this.pId
+      //   }).then(res => {
+      //     let data = JSON.parse(res.mesg)
+      //     console.log(data);
+      //     this.form.cid = data.cid
+      //     this.form.endTime = data.endTime
+      //     this.form.cname = data.cname
+      //     this.form.fjList = data.fjList
+      //     this.form.fjListId = data.fjListId
+      //     var arr = []
+      //     data.summaryList.forEach( item => {
+      //       if (item.state != '3') {
+      //         arr.push(item)
+      //       }
+      //     })
+      //     this.json = data
+      //     this.data = arr
+      //     this.oldData = data.oldinfo
+      //   }).catch(e => {
+      //   })
+      // })
     },
   },
   mounted () {

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue

@@ -40,13 +40,6 @@
           <!--                                              placeholder="请输入标准年份"-->
           <!--                                              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"
-                           :editable="false"
-                           placeholder="请选择企标实施日期"
-                           value-format="yyyy-MM-dd"
-            ></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"-->
@@ -82,6 +75,13 @@
                     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"
+                           :editable="false"
+                           placeholder="请选择企标实施日期"
+                           value-format="yyyy-MM-dd"
+            ></el-datePicker>
+          </el-form-item>
           <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
           <!--          <el-datePicker v-model="form.issueTime"-->
           <!--                         :editable="false"-->

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

@@ -1022,7 +1022,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -2651,9 +2651,17 @@
                                 json.applyUpdUserId = this.form.applyUpdUserId
                                 json.prcCreateUser = this.form.prcCreateUser
                                 json.prcCreateUserName = this.form.prcCreateUserName
-                                this.$http.get('lawss/activiti/startProcess', {type: 'buss2'}, {
+                                this.$http.post('lawss/activiti/startProcessRollBack', {
-                                    _this: this
+                                    id: this.$route.query.bpnId || '',
-                                }, res => {
+                                    createUser: this.$store.getters.userInfo.userId,
+                                    createUserName: this.$store.getters.userInfo.userName,
+                                    type: 'buss2',
+                                    json: JSON.stringify({
+                                        form: this.form,
+                                        roleForm: this.roleForm,
+                                        commentText: this.commentText
+                                    })
+                                }, {}, res => {
                                     if (res.ok) {
                                         this.$http.post('lawss/activiti/completeTask', {
                                             taskIds: res.data,
@@ -2665,12 +2673,24 @@
                                             if (res.success) {
                                                 this.$message.success(res.message)
                                                 this.isSubmit = false
+                                                if (this.$route.query.bpnId !== '') {
+                                                    let taskId = {
+                                                        id: this.$route.query.bpnId
+                                                    }
+                                                    taskDel(taskId).then(res=>{
+                                                        return res
+                                                    })
+                                                }
                                                 // 流程提交之后，应该流转至待办任务页面
                                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                             }
                                         })
                                     }
                                 })
+                                // this.$http.get('lawss/activiti/startProcess', {type: 'buss2'}, {
+                                //     _this: this
+                                // }, res => {
+                                // })
                             }else {
                                 this.$message.warning('请检查人员信息表单是否填写完整')
                             }

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

@@ -68,24 +68,48 @@
                             <el-table-column
                                     prop="commentText"
                                     label="会签意见"
-                                    min-width="70%"
+                                    min-width="35%"
                                     align="center">
                             </el-table-column>
+                            <el-table-column
+                                    prop="commentText"
+                                    label="会签意见文件"
+                                    min-width="35%"
+                                    align="left">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <div  v-if="scope.row.summaryList.length>0" v-for="(value,index)  in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+                                            <!-- {{ value.name }} -->
+                                            {{value.name | ellipsis}}
+                                        </div>
+                                        <div v-else>
+                                            - -
+                                        </div>
+                                    </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-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
+                                            <el-option
+                                                    v-for="item in opinionsAdoptedOptions"
+                                                    :key="item.value"
+                                                    :value="item.value"
+                                                    :label="item.label"
+                                            ></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
                         </el-table>
-                        <el-row :gutter="24">
-                            <el-col :span="12">
-                                <el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.opinionsAdopted" filterable clearable>
-                                        <el-option
-                                                v-for="item in opinionsAdoptedOptions"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
                     </div>
                 </template>
                 <div>

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

@@ -6,7 +6,7 @@
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-<!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
+        <!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
         <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content">
@@ -19,44 +19,44 @@
         >
             <div style="flex: auto;" v-show="active === '1'">
                 <formEditList
-                    :key = "formKey"
+                        :key = "formKey"
-                    :formSub = "form"
+                        :formSub = "form"
-                    :FBGBUSSFileListSub = "FBGBUSSFileList"
+                        :FBGBUSSFileListSub = "FBGBUSSFileList"
-                    :LSBBBUSSFileListSub = "LSBBBUSSFileList"
+                        :LSBBBUSSFileListSub = "LSBBBUSSFileList"
-                    :BZSMBUSSFileListSub = "BZSMBUSSFileList"
+                        :BZSMBUSSFileListSub = "BZSMBUSSFileList"
-                    :QTWJBUSSFileListSub = "QTWJBUSSFileList"
+                        :QTWJBUSSFileListSub = "QTWJBUSSFileList"
-                    :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                        :GLWJBUSSFileListSub = "GLWJBUSSFileList"
-                    :disabledState = "disabledState"
+                        :disabledState = "disabledState"
-                    :verifySarStandard = "verifySarStandard"
+                        :verifySarStandard = "verifySarStandard"
-                    :fileMadelSub = "fileMadel"
+                        :fileMadelSub = "fileMadel"
-                    :fbgDown = "false"
+                        :fbgDown = "false"
-                    @formCancel="formCancel"
+                        @formCancel="formCancel"
-                    @formSelectLawsCancel = "formSelectLawsCancel"
+                        @formSelectLawsCancel = "formSelectLawsCancel"
-                    @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+                        @formChoiceZRRListCancel = "formChoiceZRRListCancel"
-                    @formChoiceQCDW = "formChoiceQCDW"
+                        @formChoiceQCDW = "formChoiceQCDW"
-            />
+                />
                 <ProcessTitle>
                     <template slot="title">文件汇总</template>
                 </ProcessTitle>
                 <template>
-                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                    <div class="prc-content-border" style="height: auto;position: relative;">
                         <el-table
                                 ref="selection"
                                 tooltip-effect="dark"
-                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
                                         fontWeight: 'bold', height: '48px'}"
                                 :data="form.fileModelList"
                                 border
                                 default-expand-all>
-<!--                            <el-table-column-->
+                            <!--                            <el-table-column-->
-<!--                                    label="序号"-->
+                            <!--                                    label="序号"-->
-<!--                                    min-width="15%"-->
+                            <!--                                    min-width="15%"-->
-<!--                                    align="center">-->
+                            <!--                                    align="center">-->
-<!--                                <template slot-scope="scope">-->
+                            <!--                                <template slot-scope="scope">-->
-<!--                                    {{scope.$index + 1}}-->
+                            <!--                                    {{scope.$index + 1}}-->
-<!--                                </template>-->
+                            <!--                                </template>-->
-<!--                            </el-table-column>-->
+                            <!--                            </el-table-column>-->
                             <el-table-column
                                     prop="footFileName"
                                     label="编写文件名称"
@@ -91,6 +91,14 @@
                                         ref="formTongGuo"
                                         :model="formTongGuo"
                                         :rules="rules">
+                                    <!--                    <el-form-item-->
+                                    <!--                        prop="approvalOpinion"-->
+                                    <!--                    >-->
+                                    <!--                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
+                                    <!--                        <el-option label="驳回" value="1"></el-option>-->
+                                    <!--                        <el-option label="通过" value="0"></el-option>-->
+                                    <!--                      </el-select>-->
+                                    <!--                    </el-form-item>-->
                                     <el-form-item
                                             prop="commentText"
                                     >
@@ -108,85 +116,85 @@
                     </el-collapse>
                 </div>
             </div>
-<!--            <div class="block" id="active2" v-show="active === '2'">-->
+            <!--            <div class="block" id="active2" v-show="active === '2'">-->
-<!--                <ProcessTitle>-->
+            <!--                <ProcessTitle>-->
-<!--                    <template slot="title">模块信息</template>-->
+            <!--                    <template slot="title">模块信息</template>-->
-<!--                </ProcessTitle>-->
+            <!--                </ProcessTitle>-->
-<!--                <template>-->
+            <!--                <template>-->
-<!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
+            <!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
-<!--                        <div class="action-bar">-->
+            <!--                        <div class="action-bar">-->
-<!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+            <!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
-<!--                                批量编辑-->
+            <!--                                批量编辑-->
-<!--                            </el-button>-->
+            <!--                            </el-button>-->
-<!--                            <el-button-->
+            <!--                            <el-button-->
-<!--                                    type="primary"-->
+            <!--                                    type="primary"-->
-<!--                                    size="mini"-->
+            <!--                                    size="mini"-->
-<!--                                    class="common-button-primary add-button"-->
+            <!--                                    class="common-button-primary add-button"-->
-<!--                                    @click="createRow"-->
+            <!--                                    @click="createRow"-->
-<!--                            >创建模块</el-button>-->
+            <!--                            >创建模块</el-button>-->
-<!--                        </div>-->
+            <!--                        </div>-->
-<!--                        <el-table-->
+            <!--                        <el-table-->
-<!--                                ref="selection"-->
+            <!--                                ref="selection"-->
-<!--                                tooltip-effect="dark"-->
+            <!--                                tooltip-effect="dark"-->
-<!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
+            <!--                                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',-->
+            <!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
-<!--                                        fontWeight: 'bold', height: '48px'}"-->
+            <!--                                        fontWeight: 'bold', height: '48px'}"-->
-<!--                                @selection-change="handleSelectionChange"-->
+            <!--                                @selection-change="handleSelectionChange"-->
-<!--                                row-key="id"-->
+            <!--                                row-key="id"-->
-<!--                                :data="form.modelData"-->
+            <!--                                :data="form.modelData"-->
-<!--                                border-->
+            <!--                                border-->
-<!--                                default-expand-all-->
+            <!--                                default-expand-all-->
-<!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+            <!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
-<!--                            <el-table-column-->
+            <!--                            <el-table-column-->
-<!--                                    prop="modelNum"-->
+            <!--                                    prop="modelNum"-->
-<!--                                    label="序号"-->
+            <!--                                    label="序号"-->
-<!--                                    min-width="15%"-->
+            <!--                                    min-width="15%"-->
-<!--                                    align="center"-->
+            <!--                                    align="center"-->
-<!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            </el-table-column>-->
+            <!--                            </el-table-column>-->
-<!--                            <el-table-column-->
+            <!--                            <el-table-column-->
-<!--                                    label="名称"-->
+            <!--                                    label="名称"-->
-<!--                                    align="center"-->
+            <!--                                    align="center"-->
-<!--                                    min-width="30%">-->
+            <!--                                    min-width="30%">-->
-<!--                                <template slot-scope="scope">-->
+            <!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
+            <!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                            style="margin-left: 0;margin-bottom:0;"-->
-<!--                                    >-->
+            <!--                                    >-->
-<!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
+            <!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
-<!--                                    </el-form-item>-->
+            <!--                                    </el-form-item>-->
-<!--                                </template>-->
+            <!--                                </template>-->
-<!--                            </el-table-column>-->
+            <!--                            </el-table-column>-->
-<!--                            <el-table-column-->
+            <!--                            <el-table-column-->
-<!--                                    label="责任人"-->
+            <!--                                    label="责任人"-->
-<!--                                    min-width="15%"-->
+            <!--                                    min-width="15%"-->
-<!--                                    align="center">-->
+            <!--                                    align="center">-->
-<!--                                <template slot-scope="scope">-->
+            <!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
+            <!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                            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-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>-->
+            <!--                                    </el-form-item>-->
-<!--                                </template>-->
+            <!--                                </template>-->
-<!--                            </el-table-column>-->
+            <!--                            </el-table-column>-->
-<!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
+            <!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
-<!--                                <template slot-scope="scope">-->
+            <!--                                <template slot-scope="scope">-->
-<!--                                    <div @click.stop style="display: inline-block">-->
+            <!--                                    <div @click.stop style="display: inline-block">-->
-<!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
+            <!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
-<!--                                            <i class="iconfont">&#xe61e;</i>-->
+            <!--                                            <i class="iconfont">&#xe61e;</i>-->
-<!--                                            <el-dropdown-menu slot="dropdown">-->
+            <!--                                            <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-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-menu>-->
-<!--                                        </el-dropdown>-->
+            <!--                                        </el-dropdown>-->
-<!--                                    </div>-->
+            <!--                                    </div>-->
-<!--                                </template>-->
+            <!--                                </template>-->
-<!--                            </el-table-column>-->
+            <!--                            </el-table-column>-->
-<!--                        </el-table>-->
+            <!--                        </el-table>-->
-<!--                    </div>-->
+            <!--                    </div>-->
-<!--                </template>-->
+            <!--                </template>-->
-<!--            </div>-->
+            <!--            </div>-->
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
@@ -1642,8 +1650,20 @@
                 }
             },
             choiceZRRList (type, title, id) {
-                this.nodeList = []
+                this.nodeList2 = []
-                this.nodeList.push(id)
+                if(type === 'bussUser2'){
+                    if ( this.roleForm.bussUser2.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser2.split(',')
+                    }
+                }else if(type === 'bussUser5'){
+                    if ( this.roleForm.bussUser5.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser5.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
@@ -1979,7 +1999,7 @@
                     const fileObj = {}
                     fileObj.id = file.response.data.id
                     fileObj.name = file.response.data.name
-                switch (this.fileType){
+                    switch (this.fileType){
                         case 'FBGBUSS':
                             this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
                             this.FBGBUSSFileList.push(fileObj)
@@ -2339,55 +2359,55 @@
                 // }
                 this.fileInfoHandle()
                 this.$refs['form'].validate((valid) => {
-                        if (valid) {
+                    if (valid) {
-                            this.$refs['formTongGuo'].validate((valid) => {
+                        this.$refs['formTongGuo'].validate((valid) => {
-                                if (valid) {
+                            if (valid) {
-                                    this.isSubmit = true
+                                this.isSubmit = true
-                                    this.saveLoading = true
+                                this.saveLoading = true
-                                    this.form.commentText = this.formTongGuo.commentText
+                                this.form.commentText = this.formTongGuo.commentText
-                                    this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                    const json = JSON.stringify(this.form);
+                                const json = JSON.stringify(this.form);
-                                    this.$http.post('lawss/activiti/completeTask', {
+                                this.$http.post('lawss/activiti/completeTask', {
-                                        taskIds: this.taskIds,
+                                    taskIds: this.taskIds,
-                                        userId : this.userId,
+                                    userId : this.userId,
-                                        json: json
+                                    json: json
-                                    }, {
+                                }, {
-                                        _this: this
+                                    _this: this
-                                    }, res => {
+                                }, res => {
-                                        if (res.success) {
+                                    if (res.success) {
-                                            this.$message.success(res.message)
+                                        this.$message.success(res.message)
-                                            // 流程提交之后，应该流转至待办任务页面
+                                        // 流程提交之后，应该流转至待办任务页面
-                                            this.isSubmit = false
+                                        this.isSubmit = false
-                                            this.saveLoading = false
+                                        this.saveLoading = false
-                                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                            // if(this.formTongGuo.approvalOpinion === '1'){
+                                        // if(this.formTongGuo.approvalOpinion === '1'){
-                                            //     this.$message.warning("驳回成功")
+                                        //     this.$message.warning("驳回成功")
-                                            //     this.isSubmit = false
+                                        //     this.isSubmit = false
-                                            //     // 流程提交之后，应该流转至待办任务页面
+                                        //     // 流程提交之后，应该流转至待办任务页面
-                                            //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                            // }else{
+                                        // }else{
-                                            //     this.processCreateLaws(json)
+                                        //     this.processCreateLaws(json)
-                                            // }
+                                        // }
-                                        }else {
+                                    }else {
-                                            this.$message.success(res.message)
+                                        this.$message.success(res.message)
-                                        }
+                                    }
-                                    })
+                                })
-                                    // this.processModelHisOneCount(this.pId)
+                                // this.processModelHisOneCount(this.pId)
-                                    //     .then(res => {
+                                //     .then(res => {
-                                    //         if(res){
+                                //         if(res){
-                                    //             const editFileInfo = res
+                                //             const editFileInfo = res
-                                    //             if(editFileInfo && editFileInfo.editStatus === '1'){
+                                //             if(editFileInfo && editFileInfo.editStatus === '1'){
-                                    //             }else {
+                                //             }else {
-                                    //                 this.$message.warning('请先在线编辑,再提交流程')
+                                //                 this.$message.warning('请先在线编辑,再提交流程')
-                                    //             }
+                                //             }
-                                    //
+                                //
-                                    //         }
+                                //         }
-                                    //     }).catch(e => {
+                                //     }).catch(e => {
-                                    //     console.log(e)
+                                //     console.log(e)
-                                    //     // this.$message.warning('文件不存在,预览失败')
+                                //     // this.$message.warning('文件不存在,预览失败')
-                                    // })
+                                // })
-                                }})
+                            }})
-                        }
+                    }
                 })
             },
             busVsFunc(){

src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue

@@ -39,11 +39,11 @@
                     <template slot="title">意见信息</template>
                 </ProcessTitle>
                 <template>
-                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                    <div class="prc-content-border" style="height: auto;position: relative;">
                         <el-table
                                 ref="selection"
                                 tooltip-effect="dark"
-                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
                                         fontWeight: 'bold', height: '48px'}"
                                 @selection-change="handleSelectionChange"
@@ -68,24 +68,48 @@
                             <el-table-column
                                     prop="commentText"
                                     label="会签意见"
-                                    min-width="70%"
+                                    min-width="35%"
                                     align="center">
                             </el-table-column>
+                            <el-table-column
+                                    prop="commentText"
+                                    label="会签意见文件"
+                                    min-width="35%"
+                                    align="left">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <div  v-if="scope.row.summaryList.length>0" v-for="(value,index)  in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+                                            <!-- {{ value.name }} -->
+                                            {{value.name | ellipsis}}
+                                        </div>
+                                        <div v-else>
+                                            - -
+                                        </div>
+                                    </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-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
+                                            <el-option
+                                                    v-for="item in opinionsAdoptedOptions"
+                                                    :key="item.value"
+                                                    :value="item.value"
+                                                    :label="item.label"
+                                            ></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
                         </el-table>
-                        <el-row :gutter="24">
-                            <el-col :span="12">
-                                <el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.opinionsAdopted" filterable clearable>
-                                        <el-option
-                                                v-for="item in opinionsAdoptedOptions"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
                     </div>
                 </template>
                 <div>
@@ -1655,8 +1679,20 @@
                 }
             },
             choiceZRRList (type, title, id) {
-                this.nodeList = []
+                this.nodeList2 = []
-                this.nodeList.push(id)
+                if(type === 'bussUser2'){
+                    if ( this.roleForm.bussUser2.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser2.split(',')
+                    }
+                }else if(type === 'bussUser5'){
+                    if ( this.roleForm.bussUser5.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser5.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

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

@@ -330,33 +330,33 @@
                   @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
           >{{'手动查找'}}</el-button>
         </el-form-item>
-        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+        <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
           <el-input
-                  disabled
+                  v-model="form.CYBZ"
-                  style="display: none;"
+                  placeholder="请输入采用标准"
-                  v-model="form.GLWJBUSSName"
                   clearable
           ></el-input>
-          <div style="display: flex;justify-content: space-between">
+          <el-button
-            <div style="width: 80%;">
+                  type="primary"
-              <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                  class="common-button-primary"
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  size="mini"
-                  <span style="width: 20%;margin-left: 15px;">
+                  style="position:absolute;top: 10px;right: 0;"
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
-                  </span>
+          >{{'手动查找'}}</el-button>
-              </div>
+        </el-form-item>
-            </div>
+        <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
-            <div style="width: 20%;">
+          <el-input
-              <el-button
+                  v-model="form.YYBZ"
-                      type="primary"
+                  placeholder="请输入引用标准"
-                      class="common-button-primary"
+                  clearable
-                      size="mini"
+          ></el-input>
-                      style="margin-left: 10px; margin-top: 11px; float: right;"
+          <el-button
-                      @click="fileUpload('GLWJBUSS')">
+                  type="primary"
-                <i class="el-icon-upload"></i>
+                  class="common-button-primary"
-              </el-button>
+                  size="mini"
-            </div>
+                  style="position:absolute;top: 10px;right: 0;"
-          </div>
+                  @click="selectLaws('YYBZ'),config.attrName = '引用标准'"
+          >{{'手动查找'}}</el-button>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -382,6 +382,46 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
+        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+          <el-select v-model="form.CBCD" filterable clearable
+                     placeholder="请先选择采标程度"
+          >
+            <el-option
+                    v-for="item in cbcdOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+          <el-input
+                  disabled
+                  style="display: none;"
+                  v-model="form.GLWJBUSSName"
+                  clearable
+          ></el-input>
+          <div style="display: flex;justify-content: space-between">
+            <div style="width: 80%;">
+              <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 20%;margin-left: 15px;">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              </div>
+            </div>
+            <div style="width: 20%;">
+              <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      style="margin-left: 10px; margin-top: 11px; float: right;"
+                      @click="fileUpload('GLWJBUSS')">
+                <i class="el-icon-upload"></i>
+              </el-button>
+            </div>
+          </div>
+        </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -680,6 +720,7 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+      this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
       this.setMap(this.standStateOptions)
     })
     this.busVsFunc()

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

@@ -174,7 +174,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.QCRBUSS"  :disabled="disabledState" clearable></el-input>
+          <el-input v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
         </el-form-item>
         <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
           <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
@@ -220,14 +220,17 @@
                   clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+        <el-form-item label="采用标准" prop="CYBZ" 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)">
+          <el-input
-            <!-- {{ value.name }} -->
+                  v-model="form.CYBZ" :disabled="disabledState"
-            {{value.name}}
+                  clearable
-          </div>
+          ></el-input>
-          <div v-else>
+        </el-form-item>
-            - -
+        <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
-          </div>
+          <el-input
+                  v-model="form.YYBZ" :disabled="disabledState"
+                  clearable
+          ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -244,6 +247,25 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
+        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState"  multiple>
+            <el-option
+                    v-for="item in cbcdOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </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)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -498,6 +520,7 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+      this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
       this.setMap(this.standStateOptions)
     })
     this.busVsFunc()

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

@@ -226,14 +226,17 @@
                   clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+        <el-form-item label="采用标准" prop="CYBZ" 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)">
+          <el-input
-            <!-- {{ value.name }} -->
+                  v-model="form.CYBZ" :disabled="disabledState"
-            {{value.name}}
+                  clearable
-          </div>
+          ></el-input>
-          <div v-else>
+        </el-form-item>
-            - -
+        <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
-          </div>
+          <el-input
+                  v-model="form.YYBZ" :disabled="disabledState"
+                  clearable
+          ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -250,6 +253,25 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
+        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState"  multiple>
+            <el-option
+                    v-for="item in cbcdOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </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)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -504,6 +526,7 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+      this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
       this.setMap(this.standStateOptions)
     })
     this.busVsFunc()

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

@@ -281,6 +281,7 @@
                                     <el-input
                                         v-model="form.QCRBUSS"
                                         placeholder="选择起草人"
+                                        :title="form.QCRBUSS"
                                         readonly="readonly"
                                         @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
                                     </el-input>
@@ -339,28 +340,33 @@
                                             @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
                                     >{{'手动查找'}}</el-button>
                                 </el-form-item>
-                                <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+                                <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
                                     <el-input
-                                            disabled
+                                            v-model="form.CYBZ"
-                                            style="display: none;"
+                                            placeholder="请输入采用标准"
-                                            v-model="form.GLWJBUSSName"
                                             clearable
                                     ></el-input>
-                                    <div style="display: flex;justify-content: space-between">
+                                    <el-button
-                                        <div style="width: 80%;">
+                                            type="primary"
-                                            <div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                            class="common-button-primary"
-                                        </div>
+                                            size="mini"
-                                        <div style="width: 20%;">
+                                            style="position:absolute;top: 10px;right: 0;"
-                                            <el-button
+                                            @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
-                                                    type="primary"
+                                    >{{'手动查找'}}</el-button>
-                                                    class="common-button-primary"
+                                </el-form-item>
-                                                    size="mini"
+                                <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
-                                                    style="margin-left: 10px; margin-top: 11px; float: right;"
+                                    <el-input
-                                                    @click="fileUpload('GLWJBUSS')">
+                                            v-model="form.YYBZ"
-                                                <i class="el-icon-upload"></i>
+                                            placeholder="请输入引用标准"
-                                            </el-button>
+                                            clearable
-                                        </div>
+                                    ></el-input>
-                                    </div>
+                                    <el-button
+                                            type="primary"
+                                            class="common-button-primary"
+                                            size="mini"
+                                            style="position:absolute;top: 10px;right: 0;"
+                                            @click="selectLaws('YYBZ'),config.attrName = '引用标准'"
+                                    >{{'手动查找'}}</el-button>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -386,6 +392,41 @@
                                             :disabled="true"
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.CBCD" filterable clearable
+                                               placeholder="请先选择采标程度"
+                                    >
+                                        <el-option
+                                                v-for="item in cbcdOptions"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.GLWJBUSSName"
+                                            clearable
+                                    ></el-input>
+                                    <div style="display: flex;justify-content: space-between">
+                                        <div style="width: 80%;">
+                                            <div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                        </div>
+                                        <div style="width: 20%;">
+                                            <el-button
+                                                    type="primary"
+                                                    class="common-button-primary"
+                                                    size="mini"
+                                                    style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                    @click="fileUpload('GLWJBUSS')">
+                                                <i class="el-icon-upload"></i>
+                                            </el-button>
+                                        </div>
+                                    </div>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -1038,7 +1079,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1055,6 +1096,15 @@
             TreeSelectNew,
             treeSelectModule
         },
+        filters: {
+            ellipsis (value) {
+                if (!value) return ''
+                if (value.length > 35) {
+                    return value.slice(0,35) + '...'
+                }
+                return value
+            }
+        },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
                 if(this.FBGBUSSFileList.length === 0){
@@ -1321,6 +1371,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -1425,6 +1479,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change' }
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1806,6 +1863,16 @@
                     XCSJBUSS: '',
                 } // 标准信息
             },
+            filterDate(data){
+                if(data === undefined || data === null || data === '' || data === 'null'){
+                    return ""
+                }else if (data.toString().indexOf(",") !== -1){
+                    data = data.toString().split(",")
+                }else {
+                    data = data.toString()
+                }
+                return data
+            },
             handleProcessStandardNext(status) {
                 switch (status) {
                     // 新增
@@ -1824,6 +1891,18 @@
                             this.form.planId = this.standardCheckedList[0].id
                             this.form.planStatus = this.standardCheckedList[0].planStatus
                             this.form.reviseStatus = this.standardCheckedList[0].reviseStatus
+                            // 代替企标编号
+                            this.form.DTQBBHBUSS = this.filterDate(this.standardCheckedList[0].rqbName)
+                            // 标准编号
+                            this.form.standNum = this.filterDate(this.standardCheckedList[0].standNum)
+                            // 适用车型
+                            this.form.SYCXCLASS = this.filterDate(this.standardCheckedList[0].area)
+                            // 采标程度
+                            this.form.CBCD = this.filterDate(this.standardCheckedList[0].useLevel)
+                            // 采用标准
+                            this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations)
+                            // 引用标准
+                            this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations)
                             this.standardDrawer = false
                             this.verifySarStandard = true
                             this.planDisabled = false
@@ -2220,10 +2299,10 @@
               // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
                     this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'yybj'){
+                }else if(this.replaceLawType === 'CYBZ'){
-                    this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'cbbh'){
+                }else if(this.replaceLawType === 'YYBZ'){
-                    this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'bfbdtbzh'){
                     this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
@@ -2440,6 +2519,17 @@
                 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(",")
+                        }
+                    })
+                }
+
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
@@ -2698,9 +2788,17 @@
                                 json.applyUpdUserId = this.form.applyUpdUserId
                                 json.prcCreateUser = this.form.prcCreateUser
                                 json.prcCreateUserName = this.form.prcCreateUserName
-                                this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, {
+                                this.$http.post('lawss/activiti/startProcessRollBack', {
-                                    _this: this
+                                    id: this.$route.query.bpnId || '',
-                                }, res => {
+                                    createUser: this.$store.getters.userInfo.userId,
+                                    createUserName: this.$store.getters.userInfo.userName,
+                                    type: 'buss1',
+                                    json: JSON.stringify({
+                                        form: this.form,
+                                        roleForm: this.roleForm,
+                                        commentText: this.commentText
+                                    })
+                                }, {}, res => {
                                     if (res.ok) {
                                         this.$http.post('lawss/activiti/completeTask', {
                                             taskIds: res.data,
@@ -2721,6 +2819,14 @@
                                                         if (res.data === '操作成功') {
                                                             this.submitLoading = false
                                                             this.isSubmit = false
+                                                            if (this.$route.query.bpnId !== '') {
+                                                                let taskId = {
+                                                                    id: this.$route.query.bpnId
+                                                                }
+                                                                taskDel(taskId).then(res=>{
+                                                                    return res
+                                                                })
+                                                            }
                                                             // 流程提交之后，应该流转至待办任务页面
                                                             this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})                                                        } else {
                                                         }
@@ -2732,6 +2838,10 @@
                                         })
                                     }
                                 })
+                                // this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, {
+                                //     _this: this
+                                // }, res => {
+                                // })
                             }else {
                                 this.$message.warning('请检查人员信息表单是否填写完整')
                             }
@@ -2797,6 +2907,7 @@
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+                this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
                 this.setMap(this.standStateOptions)
             })
             this.busVsFunc()

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

@@ -853,6 +853,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,

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

@@ -852,6 +852,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,

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

@@ -843,6 +843,10 @@
                     commentText:'',
                     prcName:'',
                     standType: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -2324,21 +2328,34 @@
                     })
                 }
             },
-
+            regDate(data){
+                if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+                    data = data + ' X'
+                }
+                return data
+            },
             getStandInfoByReviseStatus() {
-                this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:this.form.reviseStatus}, {
+                let date = new Date();
-                    _this: this
+                let year = date.getFullYear();
-                }, res => {
+                if(this.form.reviseStatus === '2'){
-                    const obj = res.data
+                    this.form.standSn = this.form.standNum
-                    let standSn = (obj === null ||  obj.newStandSn === null) ? '001' : obj.newStandSn
+                    this.form.standNumber = this.form.standNum
-                    let date = new Date();
+                    this.form.standYear = this.regDate(year)
-                    let year = date.getFullYear();
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    this.form.standSn = standSn
+                }else {
-                    this.form.standNumber = standSn
+                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
-                    this.form.standYear = this.form.reviseStatus === '1' ? year : (year + ' X') // 待带入立项标准
+                        _this: this
-                    this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                    }, res => {
-                }, e => {
+                        const obj = res.data
-                })
+                        let standSn = (obj === null ||  obj.newStandSn === null) ? '2280' : obj.newStandSn
+                        this.form.standSn = standSn
+                        this.form.standNumber = standSn
+                        this.form.standYear = year // 待带入立项标准
+                        this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                    }, e => {
+                    })
+                }
+
             },
             processTable () {
                 this.$nextTick(() => {

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

@@ -843,6 +843,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,

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

@@ -909,6 +909,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -1012,6 +1016,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1122,6 +1129,16 @@
                 })
                 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) {

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

@@ -848,6 +848,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,

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

@@ -985,6 +985,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,

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

@@ -983,6 +983,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -1089,6 +1093,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1203,6 +1210,16 @@
                 })
                 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) {

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

@@ -971,6 +971,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,

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

@@ -973,6 +973,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,

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

@@ -973,6 +973,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,

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

@@ -1012,6 +1012,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1122,6 +1125,16 @@
                 })
                 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) {

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

@@ -1089,6 +1089,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: false, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1203,6 +1206,16 @@
                 })
                 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) {

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

@@ -834,6 +834,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -632,6 +632,7 @@ export default {
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
+        standType: 'INLAND',
         standNumber: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
@@ -645,6 +646,7 @@ export default {
         id: '',
         standNumber: '',
         standName: '',
+        standType: 'INLAND',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         pageNo: 1,
@@ -1009,6 +1011,8 @@ export default {
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.selectLawsStands()
         this.twoOptions = [
           {
             label: '适用车辆类型',
@@ -1050,6 +1054,8 @@ export default {
         ]
         // 海外标准法规可查字段
       } else if (val === 'FOREIGN_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'FOREIGN_STAND'
+        this.selectLawsStands()
         this.twoOptions = [
           {
             label: '适用车辆类型',
@@ -1096,6 +1102,8 @@ export default {
         ]
         // 国内外政策可查字段
       }else if (val === 'FOREIGN_LAWS'){
+        this.sarAccessInfoSearch.dataSource = 'FOREIGN_LAWS'
+        this.selectLawsStands()
         this.twoOptions=[
           {
             label: '适用车辆类型',
@@ -1142,6 +1150,8 @@ export default {
         ]
         // 标准法规清单可查字段
       }else {
+        this.sarAccessInfoSearch.dataSource = 'BUSINESS'
+        this.selectLawsStands()
         this.twoOptions=[
           {
             label: '清单名称',
@@ -1350,7 +1360,7 @@ export default {
     sarAccessInfoSelect(selectData) {
       this.sarAccessInfoListArry = []
       for (let i = 0; i < selectData.length; i++) {
-        this.sarAccessInfoListArry.push(selectData[i].id);
+        this.sarAccessInfoListArry.push(selectData[i]);
       }
     },
     // 点击取消按钮 返回事件
@@ -1473,7 +1483,6 @@ export default {
       this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
-          console.log('1476',res.data.list)
           this.sarAccessInfoSearchList = res.data.list
           this.sarAccessInfoSearchList.forEach(item => {
             if (item.standYear === null) {
@@ -1501,7 +1510,6 @@ export default {
         this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
           _this: this,
         }, res => {
-          console.log('1648',res)
           this.sarAccessInfoSearchList = res.data.list
           this.drawerTotal = res.data.count
         }, e => {
@@ -1543,17 +1551,17 @@ export default {
     },
     selectBtn() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.sarAccessInfo.standType = 'INLAND'
         this.selectPage()
       } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.sarAccessInfo.standType = 'FOREIGN'
-        this.pageInfo()
+        this.selectPage()
       }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
-        this.sarAccessInfoSearch.standType = 'LAWS'
+        this.sarAccessInfo.standType = 'LAWS'
-        this.pageInfo()
+        this.selectPage()
       }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
-        this.sarAccessInfoSearch.standType = 'BUSINESS'
+        this.sarAccessInfo.standType = 'BUSINESS'
-        this.pageInfo()
+        this.selectPage()
       }
     },
     // 数据搜索table判断checked状态
@@ -1652,7 +1660,7 @@ export default {
         let accIdAndrestype = []
         let accessInfo = 1
         for (accessInfo in exportList) {
-          accIdAndrestype.push(exportList[accessInfo])
+          accIdAndrestype.push(exportList[accessInfo].id)
         }
         const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' + '&exportType=apart' + '&ids=' + accIdAndrestype.join(',') + '&exportName=' + this.exportName
         window.open(exportURL)

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -61,19 +61,11 @@
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item" prop="responseUnit">
-            <el-select
+            <el-input
-              v-model="standardForm.zrbm"
+              v-model="standardForm.responseUnit"
-              placeholder="请选择"
+              placeholder="请输入责任部门"
-              filterable
-              size="small"
             >
-              <el-option
+            </el-input>
-                v-for="item in zrbmOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
             <el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary"
@@ -483,6 +475,15 @@ export default {
             if(item.zrbm === "[]"){
               item.zrbm = null
             }
+            if (item.zccssrqgj === "undefined") {
+              item.zccssrqgj = '-'
+            }
+            if (item.xcxssrqgj === "undefined") {
+              item.xcxssrqgj = '-'
+            }
+            if (item.ssrq === "undefined") {
+              item.ssrq = '-'
+            }
           });
           this.standinfoList = res.data.records;
           this.standardFormTotal = res.data.total;
@@ -541,21 +542,25 @@ export default {
       }, {
         _this: this
       }, res => {
-        res.data.records.forEach(item => {
+        if (res.data !== null) {
-          if (item.nylx === "[]") {
+          res.data.records.forEach(item => {
-            item.nylx = null;
+            if (item.nylx === "[]") {
-          }
+              item.nylx = null;
-          if (item.typeApplicable === "[]") {
+            }
-            item.typeApplicable = null;
+            if (item.typeApplicable === "[]") {
-          }
+              item.typeApplicable = null;
-          if (item.sycpx === "[]") {
+            }
-            item.sycpx = null;
+            if (item.sycpx === "[]") {
-          }
+              item.sycpx = null;
-          if(item.zrbm === "[]"){
+            }
-            item.zrbm = null
+            if(item.zrbm === "[]"){
-          }
+              item.zrbm = null
-        });
+            }
-        this.standinfoList = res.data.records;
+          });
+          this.standinfoList = res.data.records;
+        } else {
+          this.standinfoList = []
+        }
         this.standardFormTotal = res.data.total;
         this.standinfoList.forEach(item => {
           if (item.standYear === null) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -1122,7 +1122,7 @@ export default {
     sarAccessInfoSelect (selectData) {
       this.sarAccessInfoListArry = []
       for (let i = 0; i < selectData.length; i++) {
-        this.sarAccessInfoListArry.push(selectData[i].id);
+        this.sarAccessInfoListArry.push(selectData[i]);
       }
     },
     // 点击取消按钮 返回事件

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -1117,7 +1117,7 @@ export default {
     sarAccessInfoSelect(selectData) {
       this.sarAccessInfoListArry = []
       for (let i = 0; i < selectData.length; i++) {
-        this.sarAccessInfoListArry.push(selectData[i].id);
+        this.sarAccessInfoListArry.push(selectData[i]);
       }
     },
     // 点击取消按钮 返回事件
@@ -1306,7 +1306,6 @@ export default {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
-          console.log('1476',res.data.list)
           //为空转换
           for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
             //适用车型为空
@@ -1441,7 +1440,6 @@ export default {
     },
     // 导出确定功能
     exportTestItem() {
-      let exportNames = this.exportName
       let exportList = []
       if (this.sarAccessInfoListArry.length > 0) {
         exportList = this.sarAccessInfoListArry

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -4278,7 +4278,8 @@ export default {
         this.sarStandardsSearch.page = page
       }
       this.standCommonlySearch.page = page
-      if (this.sarStandardsSearch) {
+      this.standCommonlySearch.pageNo = 1
+      if (this.sarStandardsSearch.standNumber !== '' || this.sarStandardsSearch.standName !== '') {
         this.getDomesticStandardTable(this.sarStandardsSearch)
       } else {
         this.getDomesticStandardTable(this.standCommonlySearch)
@@ -4294,7 +4295,6 @@ export default {
     },
     // 分页查询国内标准
     getDomesticStandardTable(item) {
-      console.log('4292',item)
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4305,7 +4305,6 @@ export default {
       }
       // this.sarStandardsSearch.menuId = this.selectSarMenu.id
       const formData = {...data}
-      console.log(formData)
       if (!item) {
         formData.menuId = this.sarStandardsSearch.menuId
       } else {
@@ -4335,11 +4334,8 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
-      console.log('4333',this.advanceSearchMapping)
       for (let key in this.advanceSearchMapping) {
-        console.log('key',key)
         const value = this.advanceSearchMapping[key];
-        console.log('value',value)
         if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
           advanceSearchVOList.push({
             connect: "and",

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -675,7 +675,7 @@
                             ></el-input>
                         </el-form-item>
                     </template>
-                    <template v-else-if="field.attrField === 'DTQBBHBUSS'">
+                    <template v-else-if="field.attrField === 'DTQBBHBUSS' || field.attrField === 'CYBZ' || field.attrField === 'YYBZ'">
                         <custom-input-for-standards
                                 :config="field"
                                 :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -222,6 +222,18 @@
                                                     placeholder="请输入企标名称"
                                                     :maxlength="500"/>
                                         </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 :disabled="DrawerType === 'see'" 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 prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
                                                 <el-option label="未开始" value="0"></el-option>
@@ -237,6 +249,51 @@
                                                 <el-option label="修订" value="2"></el-option>
                                             </el-select>
                                         </el-form-item>
+                                        <el-form-item v-if="addForm.reviseStatus === '1'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-input
+                                                        style="display: none;"
+                                                        v-model="addForm.rqbJson">
+                                                </el-input>
+                                                <el-input
+                                                        clearable
+                                                        v-model="addForm.rqbName"
+                                                        placeholder="请选择代替企标编号"
+                                                        readonly
+                                                        @click.native="choiceQYBZ(addForm.rqbJson)">
+                                                </el-input>
+                                            </div>
+                                        </el-form-item>
+                                        <el-form-item v-else label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-input
+                                                        style="display: none;"
+                                                        v-model="addForm.rqbJson">
+                                                </el-input>
+                                                <el-input
+                                                        clearable
+                                                        v-model="addForm.rqbName"
+                                                        placeholder="请选择代替企标编号"
+                                                        readonly
+                                                        @click.native="choiceQYBZ(addForm.rqbJson)">
+                                                </el-input>
+                                            </div>
+                                        </el-form-item>
+                                        <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div style="display: flex;justify-content: space-between;align-items: center;">
+                                                <el-input
+                                                        style="display: none;"
+                                                        v-model="addForm.unit">
+                                                </el-input>
+                                                <el-input
+                                                        clearable
+                                                        v-model="addForm.unitName"
+                                                        placeholder="请选择起草责任单位"
+                                                        readonly
+                                                        @click.native="choiceZRBM(addForm.unit)">
+                                                </el-input>
+                                            </div>
+                                        </el-form-item>
                                         <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-input
                                                     style="display: none;"
@@ -276,36 +333,6 @@
                                                     placeholder="请选择计划标准发布时间">
                                             </el-date-picker>
                                         </el-form-item>
-                                        <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-                                            <div style="display: flex;justify-content: space-between;align-items: center;">
-                                                <el-input
-                                                        style="display: none;"
-                                                        v-model="addForm.unit">
-                                                </el-input>
-                                                <el-input
-                                                        clearable
-                                                        v-model="addForm.unitName"
-                                                        placeholder="请选择起草责任单位"
-                                                        readonly
-                                                        @click.native="choiceZRBM(addForm.unit)">
-                                                </el-input>
-                                            </div>
-                                        </el-form-item>
-                                        <el-form-item label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-                                            <div style="display: flex;justify-content: space-between;align-items: center;">
-                                                <el-input
-                                                        style="display: none;"
-                                                        v-model="addForm.rqbJson">
-                                                </el-input>
-                                                <el-input
-                                                        clearable
-                                                        v-model="addForm.rqbName"
-                                                        placeholder="请选择企业标准"
-                                                        readonly
-                                                        @click.native="choiceQYBZ(addForm.rqbJson)">
-                                                </el-input>
-                                            </div>
-                                        </el-form-item>
                                         <el-form-item label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item" prop="tsJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex;justify-content: space-between;align-items: center;">
                                                 <el-input
@@ -321,19 +348,7 @@
                                                 </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' : ''">
+                                        <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;justify-content: space-between;align-items: center;">
-                                                <el-select :disabled="DrawerType === 'see'" 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 :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
                                                     <el-radio label="是" value="是"></el-radio>
@@ -371,8 +386,9 @@
                                         <template>
                                             <custom-input-for-all-standards2
                                                     class="classDisplay"
+                                                    :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
                                                     :disabled="DrawerType === 'see'"
-                                                    :config="{attrName: '配套标准'}"
+                                                    :config="{attrName: '引用标准'}"
                                                     :labelWidth="'180px'"
                                                     v-model="addForm.esMatingRelations"
                                             ></custom-input-for-all-standards2>
@@ -672,6 +688,9 @@
                     drafter: [
                         {required: true, message: '请选择起草人', trigger: 'change'},
                     ],
+                    rqbJson: [
+                        {required: true, message: '请选择代替企标编号', trigger: 'change'},
+                    ]
                 },
                 form: {
                     page: 1,
@@ -1073,6 +1092,7 @@
                 this.standSystemOptions = res.data.TXLBBUSS // 体系结构
                 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
                 this.BZList = res.data.ENERGYTYPES
+                console.log(res.data);
             }, e => {
             })
         },