Merge branch 'develop' into FOTON

src/pages/localTool/standardWarning.vue

@@ -46,6 +46,7 @@
                       <el-date-picker
                           size="mini"
                           clearable
+                          unlink-panels
                           v-model="dynamic.putTime"
                           value-format="yyyy-MM-dd"
                           type="daterange"
@@ -62,6 +63,7 @@
                       <el-date-picker
                           size="mini"
                           clearable
+                          unlink-panels
                           v-model="dynamic.SSRQ"
                           value-format="yyyy-MM-dd"
                           type="daterange"
@@ -74,6 +76,7 @@
                       <el-date-picker
                           size="mini"
                           clearable
+                          unlink-panels
                           v-model="dynamic.XCXSSRQ"
                           value-format="yyyy-MM-dd"
                           type="daterange"
@@ -86,6 +89,7 @@
                       <el-date-picker
                           size="mini"
                           clearable
+                          unlink-panels
                           v-model="dynamic.ZCCSSRQ"
                           value-format="yyyy-MM-dd"
                           type="daterange"
@@ -162,7 +166,16 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.itemsName }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="termsConditions" label="条款内容" width="400" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column
+                  prop="termsConditions"
+                  label="条款内容"
+                  width="400"
+                  align="center">
+                  <template slot-scope="scope">
+                    <a v-if="scope.row.termsConditions === null"></a>
+                    <a v-else @click="openDialog(scope.row.termsConditions)">{{ scope.row.termsConditions.replace(/<[^>]+>/g, '').slice(0,20) + '...' }}</a>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="issueTime" label="发布日期" width="120" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.issueTime ? scope.row.issueTime.substring(0, 10) : '' }}</span>
@@ -222,6 +235,16 @@
                      @click="exportExcel">提交</el-button>
         </span>
     </el-dialog>
+
+    <el-dialog
+      class="textDialog"
+      title="条款内容"
+      :visible.sync="detailTextDialog"
+      width="50%">
+      <span style="line-height: normal" v-html="detailText" ></span>
+      <div slot="footer" class="dialog-footer">
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -233,6 +256,8 @@ export default {
   name: "standardWarning",
   data() {
     return {
+      detailTextDialog: false,
+      detailText: '',
       selectedList: [],
       exportName: '',
       exportModelFlag: false,
@@ -649,7 +674,12 @@ export default {
       // this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
       // this.field = field
     },
-    ...mapMutations(["setDetailMap"])
+    ...mapMutations(["setDetailMap"]),
+
+    openDialog(text) {
+      this.detailText = text
+      this.detailTextDialog = true
+    }
   },
   props: {
     reload: {
@@ -1045,5 +1075,11 @@ export default {
       margin: 24px 0;
     }
   }
+  .textDialog {
+    /deep/ .el-dialog__body {
+      height: 400px;
+      overflow-y: auto;
+    }
+  }
 }
 </style>

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

@@ -210,7 +210,7 @@
                             :model="roleForm"
                             :rules="roleFormRules"
                             class="label-input-form">
-                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
+                        <el-timeline-item timestamp="起草" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="applyUserId" style="margin-bottom: 0">
                                     <h4>流程发起人</h4>
@@ -221,15 +221,15 @@
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-                        <el-timeline-item timestamp="批准解读流程" placement="top" :color="roleForm.deptUserId ? '#66b1ff' : ''">
+                        <el-timeline-item timestamp="批准" placement="top" :color="roleForm.deptUserId ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="deptUserId" style="margin-bottom: 0">
-                                    <h4>标准法规部部长</h4>
+                                    <h4>标准法规部高级经理</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.deptUserId" style="display: none;"/>
                                         <el-input
                                                 v-model="roleForm.deptUserIdName"
-                                                placeholder="选择标准法规部部长"
+                                                placeholder="选择标准法规部高级经理"
                                                 @click.native="choiceZRRS(roleForm.deptUserId, 0, '')"
                                         />
                                     </div>
@@ -241,6 +241,7 @@
             </div>
         </div>
         <ProcessFooter
+                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -412,7 +413,11 @@
                             </div>
                         </div>
                     </div>
-                    <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
+                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
+                        <div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+                        <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+                    </div>
+                    <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
                         <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
                             <el-input
                                     v-model="plForm.technicalRequir"
@@ -493,6 +498,7 @@
         name: "bzjdStep1-1",
         data() {
             return {
+                itermsConditions: '',
                 commentText1: '',
                 itemsNum: '',
                 BDtext: false,
@@ -656,8 +662,8 @@
                     for (let a = 0; a < this.itemList.length; a++) {
                         for (let b = 0; b < res.data.length; b++) {
                             if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId = res.data[b].itemsId
+                                this.itemList[a].itemsId2 = res.data[b].itemsId
-                                this.itemList[a].targetStand = res.data[b].targetStand
+                                this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
                             }
                         }
                     }
@@ -669,8 +675,8 @@
                     }, res => {
                         for (let a = 0; a < this.itemList.length; a++) {
                             for (let b = 0; b < res.data.length; b++) {
-                                if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
+                                if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) {
-                                    this.itemList[a].itemsId2 = res.data[b].itemsId
+                                    this.itemList[a].itemsId = res.data[b].itemsId
                                 }
                             }
                         }
@@ -685,6 +691,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {
@@ -700,6 +710,7 @@
                 })
             },
             itemEdit (row, type, index) {
+                this.itermsConditions = row.itermsConditions
                 let itemsEoPage = {
                     oldItemId: row.itemsId,
                     newItemId: row.itemsId2,
@@ -713,6 +724,8 @@
                     this.PLmodalTitle = '编辑'
                     if (res.data.leftString === '' && res.data.rightString === '') {
                         this.BDtext = true
+                    } else if (!row.itemsId || !row.itemsId2) {
+                        this.BDtext = true
                     } else {
                         this.BDtext = false
                         this.leftData = res.data.leftString
@@ -786,12 +799,12 @@
                 this.$http.get('lawss/sarStandCompareHis/page', {
                     page: 1,
                     pageSize: 9999,
-                    newNumOrName: this.form.itemsNum
+                    newNumOrName: this.form.itemsNum,
+                    newFileType: this.form.fileType,
                 }, {
                     _this: this
                 }, res => {
                     this.standInfoList3 = res.data.list
-                    console.log(res);
                 }, e => {
                 })
             },
@@ -988,7 +1001,7 @@
                 if (type === 0) {
                     this.nodeList = []
                     this.nodeList.push(row)
-                    this.drawerTitle = '选择标准法规部部长'
+                    this.drawerTitle = '选择标准法规部高级经理'
                     this.modalshowflag = true
                 } else {
                     this.drawerTitle = '选择责任人'

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

@@ -217,7 +217,7 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="起草" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="applyUserId" style="margin-bottom: 0">
                   <h4>流程发起人</h4>
@@ -228,15 +228,15 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="批准解读流程" placement="top" :color="roleForm.deptUserId ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="批准" placement="top" :color="roleForm.deptUserId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="deptUserId" style="margin-bottom: 0">
-                  <h4>标准法规部部长</h4>
+                  <h4>标准法规部高级经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.deptUserId" style="display: none;"/>
                     <el-input
                       v-model="roleForm.deptUserIdName"
-                      placeholder="选择标准法规部部长"
+                      placeholder="选择标准法规部高级经理"
                       @click.native="choiceZRRS(roleForm.deptUserId, 0, '')"
                     />
                   </div>
@@ -421,6 +421,10 @@
               </div>
             </div>
           </div>
+          <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
+            <div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+            <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+          </div>
           <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
             <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
               <el-input
@@ -503,6 +507,7 @@ export default {
   name: "bzjdStep1",
   data() {
     return {
+      itermsConditions: '',
       commentText1: '',
       itemsNum: '',
       BDtext: false,
@@ -670,8 +675,8 @@ export default {
         for (let a = 0; a < this.itemList.length; a++) {
           for (let b = 0; b < res.data.length; b++) {
             if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-              this.itemList[a].itemsId = res.data[b].itemsId
+              this.itemList[a].itemsId2 = res.data[b].itemsId
-              this.itemList[a].targetStand = res.data[b].targetStand
+              this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
             }
           }
         }
@@ -683,8 +688,8 @@ export default {
         }, res => {
           for (let a = 0; a < this.itemList.length; a++) {
             for (let b = 0; b < res.data.length; b++) {
-              if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
+              if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) {
-                this.itemList[a].itemsId2 = res.data[b].itemsId
+                this.itemList[a].itemsId = res.data[b].itemsId
               }
             }
           }
@@ -699,6 +704,10 @@ export default {
         newItemId: id2,
         flag: 1
       }
+      if (!id || !id2) {
+        this.$message.warning('暂无找到相似的文本')
+        return
+      }
       this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
         _this: this
       }, res => {
@@ -714,6 +723,7 @@ export default {
       })
     },
     itemEdit (row, type, index) {
+      this.itermsConditions = row.itermsConditions
       let itemsEoPage = {
         oldItemId: row.itemsId,
         newItemId: row.itemsId2,
@@ -727,6 +737,8 @@ export default {
         this.PLmodalTitle = '编辑'
         if (res.data.leftString === '' && res.data.rightString === '') {
           this.BDtext = true
+        } else if (!row.itemsId || !row.itemsId2) {
+          this.BDtext = true
         } else {
           this.BDtext = false
           this.leftData = res.data.leftString
@@ -800,7 +812,8 @@ export default {
       this.$http.get('lawss/sarStandCompareHis/page', {
         page: 1,
         pageSize: 9999,
-        newNumOrName: this.form.itemsNum
+        newNumOrName: this.form.itemsNum,
+        newFileType: this.form.fileType,
       }, {
         _this: this
       }, res => {
@@ -993,7 +1006,7 @@ export default {
       if (type === 0) {
         this.nodeList = []
         this.nodeList.push(row)
-        this.drawerTitle = '选择标准法规部部长'
+        this.drawerTitle = '选择标准法规部高级经理'
         this.modalshowflag = true
       } else {
         this.drawerTitle = '选择责任人'

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准解读流程</template>
-            <template slot="proNode">选择执行人</template>
+            <template slot="proNode">选择责任人</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准解读流程</template>
-            <template slot="proNode">填写解读分析</template>
+            <template slot="proNode">解读</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button  type="primary" :disabled="acceptShow && !itemList.length" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
+<!--                <el-button  type="primary" :disabled="acceptShow && !itemList.length" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>-->
             </div>
             <el-table border
                       ref="filterTable"
@@ -113,15 +113,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        :disabled="acceptShow"
-                        prop="changePoint"
-                        width="150"
-                        v-if="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         v-if="sarType === 'FOREIGN' && form.itemsNum1"
                         prop="changePoint"
@@ -168,6 +159,15 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        :disabled="acceptShow"
+                        prop="changePoint"
+                        width="150"
+                        v-if="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
@@ -353,10 +353,10 @@
                 title="编辑"
                 :visible.sync="modalshowflag2"
                 :wrapperClosable="false"
-                :size="form.itemsNum1 ? '1200px' : '800px'">
+                size="1200px">
             <div class="demo-drawer-content">
                 <div style="display: flex; height: 100%;">
-                    <div style="width: 600px; border-right: 1px solid #ccc;">
+                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1">
                         <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
                         <div v-else style="height: 100%;">
                             <div style="margin: 10px 5px;">比对条款: {{ editForm.itemsNum }}</div>
@@ -367,6 +367,10 @@
                             </div>
                         </div>
                     </div>
+                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1">
+                        <div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+                        <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+                    </div>
                     <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
                     <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                         <el-input
@@ -463,6 +467,7 @@
         name: "bzjdStep3",
         data() {
             return {
+                itermsConditions: '',
                 AOLIGEI: '',
                 commentText3: '',
                 BDtext: false,
@@ -553,29 +558,30 @@
                     leftOrRight: 'LEFT'
                 }, {
                     _this: this
-                }, res => {
-                    for (let a = 0; a < this.itemList.length; a++) {
-                        for (let b = 0; b < res.data.length; b++) {
-                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId = res.data[b].itemsId
-                            }
-                        }
-                    }
-                }, e => {
-                })
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    leftOrRight: 'RIGHT'
-                }, {
-                    _this: this
                 }, res => {
                     for (let a = 0; a < this.itemList.length; a++) {
                         for (let b = 0; b < res.data.length; b++) {
                             if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
                                 this.itemList[a].itemsId2 = res.data[b].itemsId
+                                this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
                             }
                         }
                     }
+                    this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+                        standHisId: this.oldNumber,
+                        leftOrRight: 'RIGHT'
+                    }, {
+                        _this: this
+                    }, res => {
+                        for (let a = 0; a < this.itemList.length; a++) {
+                            for (let b = 0; b < res.data.length; b++) {
+                                if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) {
+                                    this.itemList[a].itemsId = res.data[b].itemsId
+                                }
+                            }
+                        }
+                    }, e => {
+                    })
                 }, e => {
                 })
             },
@@ -585,6 +591,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {
@@ -600,6 +610,7 @@
                 })
             },
             itemEdit (row) {
+                this.itermsConditions = row.itermsConditions
                 let itemsEoPage = {
                     oldItemId: row.itemsId,
                     newItemId: row.itemsId2,
@@ -610,6 +621,8 @@
                     }, res => {
                     if (res.data.leftString === '' && res.data.rightString === '') {
                         this.BDtext = true
+                    } else if (!row.itemsId || !row.itemsId2) {
+                        this.BDtext = true
                     } else {
                         this.BDtext = false
                         this.leftData = res.data.leftString
@@ -899,6 +912,7 @@
                         })
                         this.getBDList()
                         this.itemList = itemList
+                        console.log(itemList);
                         this.loading = false
                     }).catch(e => {
                     })

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准解读流程</template>
-            <template slot="proNode">责任人审核</template>
+            <template slot="proNode">审核</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -361,6 +361,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准解读流程</template>
-            <template slot="proNode">工程师审核</template>
+            <template slot="proNode">管理员</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -361,6 +361,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准解读流程</template>
-            <template slot="proNode">部长审批</template>
+            <template slot="proNode">批准</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -359,6 +359,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {

src/pages/processCenter/pages/phone/bzjd/step4.vue

@@ -2,7 +2,7 @@
     <div class="phoneBzjdStep4 phoneBox">
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准解读流程</template>
-            <template slot="proNode">责任人审核</template>
+            <template slot="proNode">审核</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -2,7 +2,7 @@
     <div class="phoneBzjdStep5 phoneBox">
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准解读流程</template>
-            <template slot="proNode">工程师审核</template>
+            <template slot="proNode">管理员</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/bzjd/step6.vue

@@ -2,7 +2,7 @@
     <div class="phoneBzjdStep6 phoneBox">
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准解读流程</template>
-            <template slot="proNode">部长审批</template>
+            <template slot="proNode">批准</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -279,7 +279,6 @@
                 }
                 this.form.responUserList = idList;
                 this.form.responUserListName = nameList;
-
             },
             choiceZRR() {
                 this.nodeList = [];

src/pages/processCenter/pages/phone/bzzqyj/step6.vue

@@ -50,6 +50,16 @@
                                 - -
                             </div>
                         </el-form-item>
+                        <el-form-item label="审批领导" prop="user7" class="add-form-item form-item-disabled">
+                            <el-input
+                                    v-model="form.user7"
+                                    style="display: none;"
+                                    clearable
+                            ></el-input>
+                            <van-cell-group>
+                                <van-field v-model="form.user7Name" readonly  @click.native="choiceZRR"/>
+                            </van-cell-group>
+                        </el-form-item>
                     </div>
                 </el-form>
                 <ProcessTitle>
@@ -179,6 +189,13 @@
         <van-dialog v-model="itermsConditionsFlag" title="条款内容" @confirm="dialogOk">
             <div v-html="itermsConditionsTitle"></div>
         </van-dialog>
+        <phone-role
+                check-more
+                role-title="选择审批领导"
+                :is-show-phone.sync="modalshowflag"
+                @checkedRole="checkedRole2"
+                :result-list="nodeList"
+        />
     </div>
 </template>
 
@@ -230,6 +247,8 @@
                     textType: '',
                     modelList: [],
                     modelNameList: '',
+                    user7: '',
+                    user7Name: '',
                 },
                 formRules: {
                     responUserList: [
@@ -246,6 +265,29 @@
             ProcessTitle
         },
         methods: {
+            checkedRole2(data) {
+                var idList = "";
+                var nameList = "";
+                if (data.length) {
+                    data.forEach(item => {
+                        if (nameList.length > 0) {
+                            nameList += ",";
+                            idList += ",";
+                        }
+                        idList += item.id;
+                        nameList += item.name;
+                    });
+                }
+                this.form.user7 = idList;
+                this.form.user7Name = nameList;
+            },
+            choiceZRR() {
+                this.nodeList = [];
+                if (this.form.user7.length > 0) {
+                    this.nodeList = this.form.user7.split(",");
+                }
+                this.modalshowflag = true;
+            },
             dialogOk () {
                 this.itermsConditionsFlag = false
             },
@@ -362,20 +404,22 @@
             },
             handleSubmit() {
                 this.isSubmit = true;
-                    var json = this.json;
+                var json = this.json;
-                    json.hqFlag = '0';
+                json.hqFlag = '0';
-                    json.commentText = this.commentText;
+                json.user7 = this.form.user7;
-                    this.$http.post("lawss/activiti/completeTask", {
+                json.user7Name = this.form.user7Name;
-                        json: JSON.stringify(json),
+                json.commentText = this.commentText;
-                        taskId: this.taskIds,
+                this.$http.post("lawss/activiti/completeTask", {
-                        userId: this.$store.getters.userInfo.userId
+                    json: JSON.stringify(json),
-                    }, {}, res => {
+                    taskId: this.taskIds,
-                        if (res.success) {
+                    userId: this.$store.getters.userInfo.userId
-                            this.$message.success("提交成功");
+                }, {}, res => {
-                            this.$router.push("/processCenter");
+                    if (res.success) {
-                        }
+                        this.$message.success("提交成功");
-                        this.isSubmit = false;
+                        this.$router.push("/processCenter");
-                    });
+                    }
+                    this.isSubmit = false;
+                });
             },
             handleSubmitNo() {
                 if (this.commentText) {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1545,6 +1545,15 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
+                  <!-- 备案日期 -->
+                  <el-form-item label="备案日期" class="add-form-item form-item-disabled">
+                    <el-date-picker
+                      v-model="advanceSearchMapping.BARQ"
+                      type="date"
+                      value-format="yyyy-MM-dd"
+                      placeholder="根据备案日期查找">
+                    </el-date-picker>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <!--            标准类别-->
@@ -2331,6 +2340,7 @@ export default {
         , TXLB: '',//体系类别
         DYBXH: '',// 模块结构单元变形号
         DYMC: '',//模块结构单元名称
+        BARQ: '' //备案日期
       },
       // 树形结构
       // tree function
@@ -4345,6 +4355,13 @@ export default {
             type: 'between',
             value: value.join(',')
           });
+        }else if (value !== null && value !== '' && (key === 'BARQ')){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'equals',
+            value: value
+          });
         }else if (value !== null && value !== ''){
           advanceSearchVOList.push({
             connect: "and",

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

@@ -1067,6 +1067,17 @@
                                                  value-format="yyyy-MM-dd"
                                                  clearable></el-datePicker>
                               </el-form-item>
+
+                            <!-- 备案日期 -->
+                            <el-form-item label="备案日期" class="add-form-item form-item-disabled">
+                              <el-datePicker
+                                :editable="false"
+                                v-model="sarBussionessSearch.BARQ"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                placeholder="根据备案日期查找">
+                              </el-datePicker>
+                            </el-form-item>
                           </el-col>
                           <el-col :span="12">
                               <el-form-item label="企标编号" class="add-form-item form-item-disabled">
@@ -2005,6 +2016,8 @@ export default {
         // 基础信息
           FZRQBUSS:'',
           FSRQBUSS:'',
+
+        BARQ: '',
         // 文本信息
           FBGBUSS:'',
           BZSMBUSS:'',
@@ -3926,6 +3939,14 @@ export default {
                     });
                   }
                 })
+            if (formData.BARQ !== null){
+                advanceSearchVOList.push({
+                  connect: "and",
+                  field: 'BARQ',
+                  type: 'equals',
+                  value: formData.BARQ
+                });
+              }
             }
           formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
           this.SarExportSearchEo = formData;
@@ -3935,6 +3956,7 @@ export default {
           formData.endPutTime = formData.putTime ? formData.putTime[1] : null;
           formData.FSRQBUSS = null;
           formData.FZRQBUSS = null;
+          formData.BARQ = null
           formData.putTime = null;
           formData.issueTime = null;
         }

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -514,6 +514,16 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
+
+                  <!-- 备案日期 -->
+                  <el-form-item label="备案日期" class="add-form-item form-item-disabled">
+                    <el-date-picker
+                      v-model="advanceSearchMapping.BARQ"
+                      type="date"
+                      value-format="yyyy-MM-dd"
+                      placeholder="根据备案日期查找">
+                    </el-date-picker>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <!--            标准类别-->
@@ -1885,6 +1895,7 @@ export default {
         TXLB: '',//体系类别
         DYMC: '', //模块结构单元名称
         DYBXH: '',// 模块结构单元变形号
+        BARQ: '', // 备案日期
       },
 
       // 分页查询过程中用到的对象
@@ -3831,6 +3842,13 @@ export default {
             type: 'between',
             value: value.join(',')
           });
+        }else if (value !== null && value !== '' && (key === 'BARQ')){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'equals',
+            value: value
+          });
         } else if (value !== null && value !== '') {
           advanceSearchVOList.push({
             connect: "and",