From 3abb5364b43f24ed56bb6c41810de83d821630f6 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Fri, 7 Apr 2023 12:48:37 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 4dbe6a85f..231786700 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -1227,7 +1227,7 @@
                             _this: this
                         }, res => {
                             if (res.ok) {
-                                if (res.data === '操作成功') {
+                                if (res.message === '操作成功') {
                                     this.$message.success(tips + '成功')
                                     this.getData()
                                   if(this.DrawerType === 'add'){

From e044c6207751808766285a65d03225d470baf7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 7 Apr 2023 15:43:41 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9pdf=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk/step5.vue         | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 955da075b..90adad6c8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -893,6 +893,7 @@
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
     import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
+    import { processEditFile } from 'api/process'
     import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
@@ -1445,8 +1446,10 @@
             },
             previewShow(attId) {
                 this.iframeLoading = true
+                console.log(attId);
                 return new Promise((resolve, reject) => {
-                  if(attId.indexOf('ATT_FILE') === 0){
+                    console.log(attId.indexOf('ATT_FILE'));
+                    if(attId.indexOf('ATT_FILE') === 0){
                     getBusStandFileByAttId({
                       attId
                     }).then(res => {
@@ -1469,7 +1472,28 @@
                     }).catch(e => {
                     })
                   }else{
-                    axios({
+                        processEditFile({
+                            id:attId
+                        }).then(res => {
+                            if(res){
+                                const editFileInfo = res
+                                const showName = ''
+                                const editFilePath = editFileInfo.editFilePath.split("/")
+                                editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
+                                editFileInfo.fileName = editFilePath[2]
+                                if(editFileInfo.pid){
+                                    editFileInfo.pId = editFileInfo.pid
+                                }
+                                editFileInfo.fileSuffix = 'docx'
+                                const nowTime = new Date().getTime()
+                                this.iframeUrl = onlyOfficeUrl+'/onlyOffice?oldFileName=' + showName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName
+                                // window.open()
+                                this.iframeLoading = false
+                            }
+                        }).catch(e => {
+                        })
+                        return
+                        axios({
                       url: 'api/lawss/activiti/selectOnlineFile',
                       method: 'get',
                       params: attId
@@ -1490,7 +1514,9 @@
                         this.$forceUpdate()
                         resolve(history)
                       }
-                    }).catch(e=>{})
+                    }).catch(e=>{
+                            console.log(e);
+                        })
                   }
 
                 })

From 62f13b28b1659ca3fecbc4295ebf3add0a933288 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 7 Apr 2023 16:30:29 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-?=
 =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E8=8A=82=E7=82=B9=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=9D=A1=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk/step5.vue         | 63 +++++++++----------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 90adad6c8..e85771ce7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -1444,11 +1444,9 @@
             emitDataLoading(boo){
                 this.dataLoading = boo
             },
-            previewShow(attId) {
+            previewShow(attId, label) {
                 this.iframeLoading = true
-                console.log(attId);
                 return new Promise((resolve, reject) => {
-                    console.log(attId.indexOf('ATT_FILE'));
                     if(attId.indexOf('ATT_FILE') === 0){
                     getBusStandFileByAttId({
                       attId
@@ -1477,7 +1475,7 @@
                         }).then(res => {
                             if(res){
                                 const editFileInfo = res
-                                const showName = ''
+                                const showName = label
                                 const editFilePath = editFileInfo.editFilePath.split("/")
                                 editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
                                 editFileInfo.fileName = editFilePath[2]
@@ -1487,36 +1485,37 @@
                                 editFileInfo.fileSuffix = 'docx'
                                 const nowTime = new Date().getTime()
                                 this.iframeUrl = onlyOfficeUrl+'/onlyOffice?oldFileName=' + showName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName
-                                // window.open()
                                 this.iframeLoading = false
+                                resolve(res)
                             }
                         }).catch(e => {
                         })
-                        return
-                        axios({
-                      url: 'api/lawss/activiti/selectOnlineFile',
-                      method: 'get',
-                      params: attId
-                    }).then(res=>{
-                      if(res){
-                        const history = res;
-                        const editFileInfo = res.data
-                        if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
-                          this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
-                        }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
-                          this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
-                        }else {
-                          const nowTime = new Date().getTime()
-                          // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                          this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf';
-                        }
-                        this.iframeLoading = false
-                        this.$forceUpdate()
-                        resolve(history)
-                      }
-                    }).catch(e=>{
-                            console.log(e);
-                        })
+                        // return
+                  //       axios({
+                  //     url: 'api/lawss/activiti/selectOnlineFile',
+                  //     method: 'get',
+                  //     params: attId
+                  //   }).then(res=>{
+                  //     if(res){
+                  //       const history = res;
+                  //       const editFileInfo = res.data
+                  //       if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
+                  //         this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
+                  //       }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
+                  //         this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
+                  //       }else {
+                  //         const nowTime = new Date().getTime()
+                  //         // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+                  //         this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf';
+                  //         // onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName
+                  //       }
+                  //       this.iframeLoading = false
+                  //       this.$forceUpdate()
+                  //       resolve(history)
+                  //     }
+                  //   }).catch(e=>{
+                  //           console.log(e);
+                  //       })
                   }
 
                 })
@@ -1524,7 +1523,7 @@
             previewIframe(targetName, action){
                 let attId = targetName.name
                 this.iframeUrl = ""
-                this.previewShow(attId)
+                this.previewShow(attId, targetName.label)
             },
             showDrawerClose () {
                 this.showForm.modelNum = ""
@@ -1722,7 +1721,7 @@
                 // }
                 if(this.FBGBUSSFileList.length > 0){
                     this.editableTabsValue = this.FBGBUSSFileList[0].id
-                    this.previewShow(this.FBGBUSSFileList[0].id)
+                    this.previewShow(this.FBGBUSSFileList[0].id, this.FBGBUSSFileList[0].name)
                 }
                 this.showDrawer = true
                 this.showDrawerTitle = "新增征求意见"

From 3decbacdf72a51c2bd707a9f2f61d9abe8799296 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 7 Apr 2023 18:50:52 +0800
Subject: [PATCH 04/10] =?UTF-8?q?ios=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/domesticDetails.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue
index 32bdeecc4..aa56b0568 100644
--- a/src/pages/phone/domesticDetails.vue
+++ b/src/pages/phone/domesticDetails.vue
@@ -2803,17 +2803,17 @@
                                 const nowTime = new Date().getTime()
                                 this.loadingText = true
                                 if (editFileInfo.fileSuffix.toLowerCase() === 'pdf') {
-                                    if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
-                                        //alert(navigator.userAgent);
-                                        this.getFileInfo(editFileInfo.id)
-                                    } else if (/(Android)/i.test(navigator.userAgent)) {
-                                        //alert(navigator.userAgent);
+                                    // if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
+                                    //     //alert(navigator.userAgent);
+                                    //     this.getFileInfo(editFileInfo.id)
+                                    // } else if (/(Android)/i.test(navigator.userAgent)) {
+                                    //     //alert(navigator.userAgent);
+                                    //     this.loadingText = false
+                                    //     window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
+                                    // } else {
                                         this.loadingText = false
                                         window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-                                    } else {
-                                        this.loadingText = false
-                                        window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-                                    }
+                                    // }
                                     //    window.open('/#/phonePDF?fileId='+editFileInfo.id)
                                 } else {
                                     const nowTime = new Date().getTime()

From 516e25d990a50e1e5605494c4e180c76c8172b45 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 7 Apr 2023 21:19:13 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ResolveTable.vue               | 390 +++++++++++++++++
 .../details/otherStandardDetails/index.vue    | 409 ++++++++++--------
 .../qbrk/common/formEditListFb.vue            |  11 +-
 3 files changed, 626 insertions(+), 184 deletions(-)
 create mode 100644 src/pages/details/otherStandardDetails/components/ResolveTable.vue

diff --git a/src/pages/details/otherStandardDetails/components/ResolveTable.vue b/src/pages/details/otherStandardDetails/components/ResolveTable.vue
new file mode 100644
index 000000000..38d3de121
--- /dev/null
+++ b/src/pages/details/otherStandardDetails/components/ResolveTable.vue
@@ -0,0 +1,390 @@
+<template>
+  <div style="height: 100%;">
+    <div style="height: 100%;display: flex;flex-direction: row">
+      <el-table
+          style="height: calc(100% - 56px)"
+          :data="itemInfoList"
+          height="100%"
+          border
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+          @selection-change="standSelectChange"
+          ref="selection"
+      >
+        <el-table-column
+            type="selection"
+            width="55"
+            :resizable="false"
+            align="center">
+        </el-table-column>
+        <el-table-column
+            prop="itemsNum"
+            label="条款号"
+            width="150"
+            fixed="left"
+            :resizable="false"
+            align="center">
+        </el-table-column>
+        <el-table-column
+            prop="itemsName"
+            label="条款名称"
+            width="150"
+            fixed="left"
+            :resizable="false"
+            show-overflow-tooltip
+            align="center">
+        </el-table-column>
+        <el-table-column
+            prop="itermsConditions"
+            label="条款内容"
+            fixed="left"
+            :resizable="false"
+            align="center">
+          <template slot-scope="scope">
+            <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+          style="position:absolute;height: 56px;left: 0;bottom: 0;background: #ffffff;z-index: 999;"
+          @size-change="pageSizeChange"
+          @current-change="pageChange"
+          :current-page="itemsPage"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="itemsPageSize"
+          layout="total, prev, pager, next, sizes, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+    <loading :loading="loading">数据加载中...</loading>
+    <!--内容简介-->
+    <el-dialog :visible.sync="itemsTextDialogs" title="内容简介" append-to-body :close-on-click-modal="false">
+      <div v-html="itemsText" class="itemsTextBox"></div>
+      <div slot="footer">
+        <el-button type="primary" size="large" @click="itemsTextDialogs = false">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ResolveTable",
+  data(){
+    return {
+      itemInfoList: [],
+      infoId: '8H94ZSWC2UQSANNG79CK',
+      total: 0,
+      itemsPage: 1,
+      itemsPageSize: this.$store.getters.userInfo.configContent,
+      selectedList:[],
+      selectedList1:[],
+      itemsEo: {
+        menuId: '',
+        infoId: '',
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent
+      },
+      selectSarMenu: {},
+      infoForm: {
+        id: '',
+        standId: '',
+        standNumSplit: '', // 标准号/政策号
+        standNameSplit: '', // 标准名称/政策名称
+        fileType: '' // 文本状态
+      },
+      itemsTextDialogs:false,
+      itemsText: ""
+    }
+  },
+
+  mounted(){
+    this.findInfoId().then(res => {
+      if(res && res.data){
+        this.infoId = res.data.list[0].infoId
+        this.queryInfoByInfoId().then(res=>{
+          this.getSplitItemsByPage()
+        })
+      }
+    })
+  },
+  methods:{
+    getSplitItemsByPage (query) {
+      let itemsEoPage = this.itemsEo
+      itemsEoPage.infoId = this.infoId
+      itemsEoPage.page = this.itemsPage
+      itemsEoPage.pageSize = this.itemsPageSize
+      itemsEoPage.getItemsName = query ? query.clauseName : undefined
+      this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', itemsEoPage, {
+        _this: this,
+        loading: 'loading'
+      }, res => {
+        this.itemInfoList = res.data.list
+        this.total = res.data.count
+      }, e => {
+      })
+    },
+    findInfoId(){
+      return new Promise((resolve,reject)=>{
+        this.$http.get('SarStandItems/sar-stand-items/selectSarItemAndInterpretation', {
+          standId: this.$route.params.id
+        }, {
+          _this: this,
+        }, res => {
+          resolve(res)
+        })
+      })
+    },
+    queryInfoByInfoId() {
+      return new Promise((resolve,reject)=>{
+        this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', {
+          id: this.infoId
+        }, {
+          _this: this,
+        }, res => {
+          if (res.ok) {
+            const info = res.data.list
+            if (info) {
+              const query = info[0]
+              this.infoForm = {
+                id: this.infoId,
+                standNumSplit: query.splitStatus=='0' ? query.showNumber : query.standNumSplit,
+                standNameSplit: query.splitStatus=='0' ? query.standName : query.standNameSplit,
+                fileType: query.fileType
+              }
+              resolve(res)
+            }
+          } else {
+            this.$message.warning(res.message)
+          }
+        })
+      })
+    },
+    itemsTextDialog (itemsNum, text) {
+      this.itemsTextDialogs = true
+      this.itemsText = '<p>' + itemsNum + '</p>' + text.replace(/''/g, '\'')
+    },
+    standSelectChange (data) {
+      this.selectedList = []
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id)
+      }
+    },
+    // 分页点击后方法
+    pageChange (page) {
+      this.selectedAllList = []
+      this.itemsPage = page
+      this.getSplitItemsByPage()
+    },
+    // 分页每页显示数改变后方法
+    pageSizeChange (pageSize) {
+      this.selectedAllList = []
+      this.itemsPageSize = pageSize
+      this.getSplitItemsByPage()
+    },
+    // 导出事件
+    exportItemInfo () {
+      let exportName = this.infoForm.standNumSplit + this.infoForm.standNameSplit
+      if (this.selectedList != null && this.selectedList.length > 0) {
+        let ids = this.selectedList.join(',')
+        window.open('/api/lawss/sarFileSplitItems/exportSplitInfoZip?idList=' + ids + '&infoId=' + this.infoId + '&exportName=' + exportName)
+      } else {
+        this.$confirm('当前未选择条款信息，是否导出全部内容？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: false
+        }).then(() => {
+          window.open('/api/lawss/sarFileSplitItems/exportSplitInfoZip?ids=null&infoId=' + this.infoId + '&exportName=' + exportName)
+        }).catch(() => {})
+      }
+    },
+    // jurisdictionCheck() {
+    //   return true
+    // },
+    // // 点击更多 事件
+    // handleCommand (command) {
+    //   switch (command[1]) {
+    //     case '复制':
+    //       this.$confirm('确认复制该条款？', '提示', {
+    //         confirmButtonText: '确定',
+    //         cancelButtonText: '取消',
+    //         type: 'warning',
+    //         confirmButtonClass: 'common-button-primary',
+    //         roundButton: false
+    //       }).then(() => {
+    //         this.$http.postData('lawss/sarFileSplitMenu/copyMenuNotChildren', command[0], {
+    //           _this: this, loading: 'loading'
+    //         }, res => {
+    //           // this.selectMenu()
+    //           this.getSplitItemsByPage()
+    //         }, e => {
+    //         })
+    //       }).catch(() => {})
+    //       break
+    //     case '删除':
+    //       this.selectedList = []
+    //       this.selectedList.push(command[0].id)
+    //       this.selectedList1.push(command[0].editFlag)
+    //       this.judgebatchDeleteItem()
+    //       break
+    //       // case '内容简介':
+    //       //   this.clause(command[0])
+    //       //   break
+    //     case '属性':
+    //       this.attribute(command[2], command[0])
+    //       break
+    //     case '编辑':
+    //       this.editLawsInfo(command[2], command[0])
+    //       break
+    //   }
+    // },
+    // // 点击表格 属性按钮事件
+    // attribute (index, row) {
+    //   this.isSubmit = false
+    //   this.standItemEO.id = row.id
+    //   this.showItemInfoModal = true
+    //   this.saveEditItemIndex = index
+    //   this.standItemEO = JSON.parse(JSON.stringify(row))
+    //   if (this.standItemEO.applyArctic && !(this.standItemEO.applyArctic instanceof Array)) {
+    //     let a = this.standItemEO.applyArctic.split(',')
+    //     this.standItemEO.applyArctic = a // 适用车型
+    //   }
+    //   if (this.standItemEO.newcarPutTime != null && this.standItemEO.newcarPutTime !== '') {
+    //     this.standItemEO.newcarPutTime = this.standItemEO.newcarPutTime.replace(new RegExp(/-/gm), '/')
+    //     this.standItemEO.newcarPutTime = new Date(this.standItemEO.newcarPutTime)
+    //   }
+    //   if (this.standItemEO.productPutTime != null && this.standItemEO.productPutTime !== '') {
+    //     this.standItemEO.productPutTime = this.standItemEO.productPutTime.replace(new RegExp(/-/gm), '/')
+    //     this.standItemEO.productPutTime = new Date(this.standItemEO.productPutTime)
+    //   }
+    //   if (this.standItemEO.paramsList == null || this.standItemEO.paramsList.length < 1) {
+    //     let specialObj = {
+    //       description: '',
+    //       figure: ''
+    //     }
+    //     this.standItemEO.paramsList.push(specialObj)
+    //   }
+    //   this.standItemEO.ZRBM = this.standItemEO.responsibleUnit
+    //   this.saveItemId = row.id
+    //   this.showUpdateItemInfo()
+    // },
+    // // 点击表格 编辑按钮事件
+    // editLawsInfo (index, row) {
+    //   this.isSubmit = false
+    //   this.standItemEO.id = row.id
+    //   this.modalItemaddShowflag = true
+    //   this.saveEditItemIndex = index
+    //   this.standItemEO = JSON.parse(JSON.stringify(row))
+    //   if (this.standItemEO.applyArctic && !(this.standItemEO.applyArctic instanceof Array)) {
+    //     let a = this.standItemEO.applyArctic.split(',')
+    //     this.standItemEO.applyArctic = a // 适用车型
+    //   }
+    //   if (this.standItemEO.newcarPutTime != null && this.standItemEO.newcarPutTime !== '') {
+    //     this.standItemEO.newcarPutTime = this.standItemEO.newcarPutTime.replace(new RegExp(/-/gm), '/')
+    //     this.standItemEO.newcarPutTime = new Date(this.standItemEO.newcarPutTime)
+    //   }
+    //   if (this.standItemEO.productPutTime != null && this.standItemEO.productPutTime !== '') {
+    //     this.standItemEO.productPutTime = this.standItemEO.productPutTime.replace(new RegExp(/-/gm), '/')
+    //     this.standItemEO.productPutTime = new Date(this.standItemEO.productPutTime)
+    //   }
+    //   if (this.standItemEO.paramsList == null || this.standItemEO.paramsList.length < 1) {
+    //     let specialObj = {
+    //       description: '',
+    //       figure: ''
+    //     }
+    //     this.standItemEO.paramsList.push(specialObj)
+    //   }
+    //   this.standItemEO.ZRBM = this.standItemEO.responsibleUnit
+    //   this.saveItemId = row.id
+    //   this.showUpdateItemInfo()
+    // },
+    // showUpdateItemInfo () {
+    //   this.itemsContentList = []
+    //   this.saveChooseAddType = ''
+    //   this.saveAddIndex = 0
+    //   this.saveDeleteItemIds = ''
+    //   // this.editItemsContentModel = true
+    //   this.$http.get('lawss/sarFileSplitItemsVal/getItemsValList', {
+    //     itemId: this.saveItemId
+    //   }, {
+    //     _this: this
+    //   }, res => {
+    //     res.data.map(item => {
+    //       item.itemContent = item.itemContent.replace(/''/g, '\'')
+    //     })
+    //     this.itemsContentList = res.data
+    //   }, e => {
+    //   })
+    // },
+    // // 批量删除
+    // judgebatchDeleteItem () {
+    //   if (!this.jurisdictionCheck()) {
+    //     return
+    //   }
+    //   if (this.selectedList != null && this.selectedList.length > 0) {
+    //     this.$http.get('lawss/sarFileSplitItems/judgeContaintChilds', {
+    //       ids: this.selectedList.join(',')
+    //     }, {
+    //       _this: this
+    //     }, res => {
+    //       this.batchDeleteItem()
+    //     }, e => {
+    //     })
+    //   } else {
+    //     this.$message.warning('请确认选择条款是否有子节点，若有，则此次删除将全部删除。')
+    //   }
+    // },
+    // batchDeleteItem () {
+    //   if (this.selectedList != null && this.selectedList.length > 0) {
+    //     this.$confirm('请确认选择条款是否有子节点，若有，则此次删除将全部删除。', '提示', {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning',
+    //       confirmButtonClass: 'common-button-primary',
+    //       roundButton: false
+    //     }).then(() => {
+    //       this.itemsPage = 1
+    //       this.itemsEo.page = 1
+    //       this.loading = true
+    //       this.deleteItemsModal = false
+    //       this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', {
+    //         ids: this.selectedList.join(','),
+    //         editFlag: this.selectedList1.join(','),
+    //       }, {
+    //         _this: this
+    //       }, res => {
+    //         this.getSplitItemsByPage()
+    //         this.selectMenu()
+    //         // 获取下一个节点
+    //         let currentNode = this.$refs.domesticTree.getNextNode()
+    //         let nodeId = ''
+    //         // 如果这个节点为null, 本次删除了最后一个节点
+    //         if (currentNode === null) {
+    //           // 选中根节点
+    //           this.$refs.domesticTree.selectRootNode()
+    //         } else {
+    //           nodeId = currentNode.id
+    //         }
+    //         this.selectSarMenu.id = nodeId
+    //         this.loading = false
+    //       }, e => {
+    //       })
+    //     }).catch(() => {})
+    //   } else {
+    //     this.$message.warning('请确认选择条款是否有子节点，若有，则此次删除将全部删除。')
+    //   }
+    // },
+  }
+}
+</script>
+
+<style scoped>
+.itemsText {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: #409EFF;
+  cursor: pointer;
+}
+</style>
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index e31d8de91..3b4484898 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -750,45 +750,69 @@
 >
 <div class="search-area">
   <div class="left">
-    <el-form ref="ruleForm" :model="standardForm" class="label-input-form" inline>
-      <el-form-item class="search-item">
-        <el-input v-show="false" v-model="standItemSearch.orgName" size="small" style="height: 32px"/>
-        <el-input v-show="false" v-model="standItemSearch.responsibleUnit" size="small" style="height: 32px"/>
-        <el-popover
-            :value="false"
-            placement="bottom"
-            popper-class="user-dept-popper"
-            trigger="click"
-        >
-        </el-popover>
-      </el-form-item>
+    <!--<el-form ref="ruleForm" :model="standardForm" class="label-input-form" inline>-->
+    <!--  <el-form-item class="search-item">-->
+    <!--    <el-input v-show="false" v-model="standItemSearch.orgName" size="small" style="height: 32px"/>-->
+    <!--    <el-input v-show="false" v-model="standItemSearch.responsibleUnit" size="small" style="height: 32px"/>-->
+    <!--    <el-popover-->
+    <!--        :value="false"-->
+    <!--        placement="bottom"-->
+    <!--        popper-class="user-dept-popper"-->
+    <!--        trigger="click"-->
+    <!--    >-->
+    <!--    </el-popover>-->
+    <!--  </el-form-item>-->
 
 
-      <el-form-item class="search-item">
-        <el-input v-model="standItemSearch.itemsName" clearable maxlength="100" placeholder="根据条款名称查找"
-                  size="small"></el-input>
-      </el-form-item>
+    <!--  <el-form-item class="search-item">-->
+    <!--    <el-input v-model="standItemSearch.itemsName" clearable maxlength="100" placeholder="根据条款名称查找"-->
+    <!--              size="small"></el-input>-->
+    <!--  </el-form-item>-->
       <!--            新车实施日期-->
+      <!--<el-form-item class="search-item">-->
+      <!--  <div class="block">-->
+      <!--    <el-date-picker-->
+      <!--        v-model="standItemSearch.XCXSSRQ"-->
+      <!--        placeholder="新车实施日期"-->
+      <!--        type="date"-->
+      <!--        value-format="yyyy-MM-dd">-->
+      <!--    </el-date-picker>-->
+      <!--  </div>-->
+      <!--</el-form-item>-->
+      <!--&lt;!&ndash;            //在产车实施日期&ndash;&gt;-->
+      <!--<el-form-item class="search-item">-->
+      <!--  <div class="block">-->
+      <!--    <el-date-picker-->
+      <!--        v-model="standItemSearch.ZCCSSRQ"-->
+      <!--        placeholder="在产车实施日期"-->
+      <!--        type="date"-->
+      <!--        value-format="yyyy-MM-dd">-->
+      <!--    </el-date-picker>-->
+      <!--  </div>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item class="search-item btn-box">-->
+      <!--  <el-button-->
+      <!--      :loading="searching"-->
+      <!--      class="common-button-primary"-->
+      <!--      size="mini"-->
+      <!--      type="primary"-->
+      <!--      @click="searchSarStandItems">-->
+      <!--    查询-->
+      <!--  </el-button>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item class="search-item btn-box">-->
+      <!--  <el-button-->
+      <!--      class="common-button-default"-->
+      <!--      size="mini"-->
+      <!--      @click="clearAllSearch">-->
+      <!--    清空-->
+      <!--  </el-button>-->
+      <!--</el-form-item>-->
+    <!--</el-form>-->
+    <el-form ref="ruleForm" class="label-input-form" inline>
       <el-form-item class="search-item">
-        <div class="block">
-          <el-date-picker
-              v-model="standItemSearch.XCXSSRQ"
-              placeholder="新车实施日期"
-              type="date"
-              value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </div>
-      </el-form-item>
-      <!--            //在产车实施日期-->
-      <el-form-item class="search-item">
-        <div class="block">
-          <el-date-picker
-              v-model="standItemSearch.ZCCSSRQ"
-              placeholder="在产车实施日期"
-              type="date"
-              value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </div>
+        <el-input v-model="clauseName" maxlength="100" placeholder="根据条款名称查找"
+                  size="small"></el-input>
       </el-form-item>
       <el-form-item class="search-item btn-box">
         <el-button
@@ -796,7 +820,7 @@
             class="common-button-primary"
             size="mini"
             type="primary"
-            @click="searchSarStandItems">
+            @click="searchClause">
           查询
         </el-button>
       </el-form-item>
@@ -804,7 +828,7 @@
         <el-button
             class="common-button-default"
             size="mini"
-            @click="clearAllSearch">
+            @click="clearClause">
           清空
         </el-button>
       </el-form-item>
@@ -812,12 +836,17 @@
   </div>
 </div>
 <div class="action-bar">
+  <!--<el-button class="common-button-default export-button" icon="export" size="mini"-->
+  <!--           @click="exportStandardItem"-->
+  <!--&gt;-->
+  <!--  导出-->
+  <!--</el-button>-->
   <el-button class="common-button-default export-button" icon="export" size="mini"
-             @click="exportStandardItem"
+             @click="exportItemInfo"
   >
     导出
   </el-button>
-  <el-button
+  <el-button v-if="false"
       v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
       class="common-button-primary"
       size="mini"
@@ -825,14 +854,14 @@
       @click="openRelatedTermsDrawer"
   >关联条款
   </el-button>
-  <el-button
-      v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
-      class="common-button-primary"
-      size="mini"
-      type="primary"
-      @click="editResolveList"
-  >编辑
-  </el-button>
+  <!--<el-button-->
+  <!--    v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"-->
+  <!--    class="common-button-primary"-->
+  <!--    size="mini"-->
+  <!--    type="primary"-->
+  <!--    @click="editResolveList"-->
+  <!--&gt;编辑-->
+  <!--</el-button>-->
   <el-upload
       :key="cfjgscUploadKey"
       style="display: inline-block;margin:0 5px;"
@@ -862,139 +891,140 @@
   <!--</el-button>-->
 </div>
 <div class="content">
-  <el-table
-      ref="multipleTable"
-      :data="standItemList"
-      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-       fontWeight: 'bold', height: '48px'}"
-      :height="tableHeight"
-      border
-      style="width: 100%"
-      tooltip-effect="dark"
-      @sort-change='sort'
-      @selection-change="selectAllStand">
-    <el-table-column
-        fixed="left"
-        type="selection"
-        width="60"
-    >
-    </el-table-column>
-    <el-table-column
-        label="条款号"
-        prop="itemsNum"
-        show-overflow-tooltip
-        sortable="custom"
-        width="90"
-    >
-    </el-table-column>
-    <el-table-column
-        label="条款名称"
-        min-width="300"
-        prop="itemsName"
-        show-overflow-tooltip
-    >
-    </el-table-column>
-    <el-table-column
-        :resizable="false"
-        label="条款内容"
-        min-width="200"
-        prop="termsConditions"
-    >
-      <template slot-scope="scope">
-        <!--              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
-        <!--                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
-        <!--              </div>-->
-        <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"
-             @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
-          {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
-        </div>
-        <!--              <el-tooltip placement="top">-->
-        <!--                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>-->
-        <!--                <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
-        <!--                  {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
-        <!--                </div>-->
-        <!--              </el-tooltip>-->
-      </template>
-    </el-table-column>
-    <el-table-column
-        label="核心技术要求/变化点"
-        prop="readContent"
-        show-overflow-tooltip
-        width="170"
-    >
-    </el-table-column>
-    <el-table-column
-        label="基于上一版本差异"
-        prop="comparedWithPrevious"
-        show-overflow-tooltip
-        width="170">
-    </el-table-column>
-    <el-table-column
-        label="新车型实施日期(文本)"
-        prop="xccssrq"
-        width="180">
-    </el-table-column>
-    <el-table-column
-        label="在产车实施日期(文本)"
-        prop="zccssrq"
-        width="170">
-    </el-table-column>
-    <el-table-column
-        label="适用车型"
-        prop="applyArctic"
-        show-overflow-tooltip
-        width="90"
-    >
-      <template slot-scope="scope">
-        {{ filterApplyArctic(scope.row) }}
-      </template>
-    </el-table-column>
-    <!--          <el-table-column-->
-    <!--              prop="responsibleUnit"-->
-    <!--              label="责任部门">-->
-    <!--          </el-table-column>-->
-    <el-table-column
-        label="责任工程师"
-        prop="dutyEngineer"
-        width="100">
-    </el-table-column>
-    <!--          <el-table-column-->
-    <!--            show-overflow-tooltip-->
-    <!--            label="符合性状态"-->
-    <!--            width="100">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--            show-overflow-tooltip-->
-    <!--            prop="complianceState"-->
-    <!--            label="合规性分析"-->
-    <!--            width="100">-->
-    <!--          </el-table-column>-->
-    <el-table-column align="center" fixed="right" label="操作" width="50">
-      <template slot-scope="scope">
-        <div @click.stop>
-          <el-dropdown trigger="click" @command="handleCommand">
-            <i class="iconfont">&#xe61e;</i>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :command="[scope.row, '查看']" :disabled="scope.row.enable==='0'">查看
-              </el-dropdown-item>
-              <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>-->
-              <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>-->
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
-      </template>
-    </el-table-column>
-  </el-table>
-  <loading :loading="tableLoading">数据加载中...</loading>
+  <!--<el-table-->
+  <!--    ref="multipleTable"-->
+  <!--    :data="standItemList"-->
+  <!--    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
+  <!--     fontWeight: 'bold', height: '48px'}"-->
+  <!--    :height="tableHeight"-->
+  <!--    border-->
+  <!--    style="width: 100%"-->
+  <!--    tooltip-effect="dark"-->
+  <!--    @sort-change='sort'-->
+  <!--    @selection-change="selectAllStand">-->
+  <!--  <el-table-column-->
+  <!--      fixed="left"-->
+  <!--      type="selection"-->
+  <!--      width="60"-->
+  <!--  >-->
+  <!--  </el-table-column>-->
+  <!--  <el-table-column-->
+  <!--      label="条款号"-->
+  <!--      prop="itemsNum"-->
+  <!--      show-overflow-tooltip-->
+  <!--      sortable="custom"-->
+  <!--      width="90"-->
+  <!--  >-->
+  <!--  </el-table-column>-->
+  <!--  <el-table-column-->
+  <!--      label="条款名称"-->
+  <!--      min-width="300"-->
+  <!--      prop="itemsName"-->
+  <!--      show-overflow-tooltip-->
+  <!--  >-->
+  <!--  </el-table-column>-->
+  <!--  <el-table-column-->
+  <!--      :resizable="false"-->
+  <!--      label="条款内容"-->
+  <!--      min-width="200"-->
+  <!--      prop="termsConditions"-->
+  <!--  >-->
+  <!--    <template slot-scope="scope">-->
+  <!--      &lt;!&ndash;              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">&ndash;&gt;-->
+  <!--      &lt;!&ndash;                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}&ndash;&gt;-->
+  <!--      &lt;!&ndash;              </div>&ndash;&gt;-->
+  <!--      <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"-->
+  <!--           @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
+  <!--        {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
+  <!--      </div>-->
+  <!--      &lt;!&ndash;              <el-tooltip placement="top">&ndash;&gt;-->
+  <!--      &lt;!&ndash;                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>&ndash;&gt;-->
+  <!--      &lt;!&ndash;                <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">&ndash;&gt;-->
+  <!--      &lt;!&ndash;                  {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}&ndash;&gt;-->
+  <!--      &lt;!&ndash;                </div>&ndash;&gt;-->
+  <!--      &lt;!&ndash;              </el-tooltip>&ndash;&gt;-->
+  <!--    </template>-->
+  <!--  </el-table-column>-->
+  <!--  <el-table-column-->
+  <!--      label="核心技术要求/变化点"-->
+  <!--      prop="readContent"-->
+  <!--      show-overflow-tooltip-->
+  <!--      width="170"-->
+  <!--  >-->
+  <!--  </el-table-column>-->
+  <!--  <el-table-column-->
+  <!--      label="基于上一版本差异"-->
+  <!--      prop="comparedWithPrevious"-->
+  <!--      show-overflow-tooltip-->
+  <!--      width="170">-->
+  <!--  </el-table-column>-->
+  <!--  <el-table-column-->
+  <!--      label="新车型实施日期(文本)"-->
+  <!--      prop="xccssrq"-->
+  <!--      width="180">-->
+  <!--  </el-table-column>-->
+  <!--  <el-table-column-->
+  <!--      label="在产车实施日期(文本)"-->
+  <!--      prop="zccssrq"-->
+  <!--      width="170">-->
+  <!--  </el-table-column>-->
+  <!--  <el-table-column-->
+  <!--      label="适用车型"-->
+  <!--      prop="applyArctic"-->
+  <!--      show-overflow-tooltip-->
+  <!--      width="90"-->
+  <!--  >-->
+  <!--    <template slot-scope="scope">-->
+  <!--      {{ filterApplyArctic(scope.row) }}-->
+  <!--    </template>-->
+  <!--  </el-table-column>-->
+  <!--  &lt;!&ndash;          <el-table-column&ndash;&gt;-->
+  <!--  &lt;!&ndash;              prop="responsibleUnit"&ndash;&gt;-->
+  <!--  &lt;!&ndash;              label="责任部门">&ndash;&gt;-->
+  <!--  &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
+  <!--  <el-table-column-->
+  <!--      label="责任工程师"-->
+  <!--      prop="dutyEngineer"-->
+  <!--      width="100">-->
+  <!--  </el-table-column>-->
+  <!--  &lt;!&ndash;          <el-table-column&ndash;&gt;-->
+  <!--  &lt;!&ndash;            show-overflow-tooltip&ndash;&gt;-->
+  <!--  &lt;!&ndash;            label="符合性状态"&ndash;&gt;-->
+  <!--  &lt;!&ndash;            width="100">&ndash;&gt;-->
+  <!--  &lt;!&ndash;            <template slot-scope="scope">&ndash;&gt;-->
+  <!--  &lt;!&ndash;              {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}&ndash;&gt;-->
+  <!--  &lt;!&ndash;            </template>&ndash;&gt;-->
+  <!--  &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
+  <!--  &lt;!&ndash;          <el-table-column&ndash;&gt;-->
+  <!--  &lt;!&ndash;            show-overflow-tooltip&ndash;&gt;-->
+  <!--  &lt;!&ndash;            prop="complianceState"&ndash;&gt;-->
+  <!--  &lt;!&ndash;            label="合规性分析"&ndash;&gt;-->
+  <!--  &lt;!&ndash;            width="100">&ndash;&gt;-->
+  <!--  &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
+  <!--  <el-table-column align="center" fixed="right" label="操作" width="50">-->
+  <!--    <template slot-scope="scope">-->
+  <!--      <div @click.stop>-->
+  <!--        <el-dropdown trigger="click" @command="handleCommand">-->
+  <!--          <i class="iconfont">&#xe61e;</i>-->
+  <!--          <el-dropdown-menu slot="dropdown">-->
+  <!--            <el-dropdown-item :command="[scope.row, '查看']" :disabled="scope.row.enable==='0'">查看-->
+  <!--            </el-dropdown-item>-->
+  <!--            &lt;!&ndash;<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>&ndash;&gt;-->
+  <!--            &lt;!&ndash;<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>&ndash;&gt;-->
+  <!--          </el-dropdown-menu>-->
+  <!--        </el-dropdown>-->
+  <!--      </div>-->
+  <!--    </template>-->
+  <!--  </el-table-column>-->
+  <!--</el-table>-->
+  <ResolveTable ref="resolveTable"></ResolveTable>
+  <!--<loading :loading="tableLoading">数据加载中...</loading>-->
 </div>
-<pagination
-    :page="page7"
-    :total="total7"
-    @pageChange="pageChange7"
-    @pageSizeChange="pageSizeChange7"></pagination>
+<!--<pagination-->
+<!--    :page="page7"-->
+<!--    :total="total7"-->
+<!--    @pageChange="pageChange7"-->
+<!--    @pageSizeChange="pageSizeChange7"></pagination>-->
 <!--      <el-pagination-->
 <!--          @size-change="pageSizeChange"-->
 <!--          @current-change="pageChange"-->
@@ -1808,6 +1838,7 @@ import {dateFormat} from '@/common/date'
 import RelatedTermsSelect from './components/RelatedTermsSelect'
 import {getBusStandFileByAttId} from 'api/process'
 import {dicTypeData} from "api/unqualProcess";
+import ResolveTable from './components/ResolveTable.vue'
 
 
 export default {
@@ -1817,7 +1848,8 @@ export default {
     CustomSVPPS,
     CustomSelectArray,
     CustomOrg,
-    RelatedTermsSelect
+    RelatedTermsSelect,
+    ResolveTable
   },
   filters: {
     ellipsis(value) {
@@ -1837,6 +1869,7 @@ export default {
   },
   data() {
     return {
+      clauseName:"", // 条款名称
       cfjgscUploadKey:1,
       externalStatus: '',
       handleList: [],
@@ -3937,6 +3970,22 @@ export default {
     itemsTextDialog(itemsNum, text) {
       this.itemsTextDialogs = true
       this.itemsText = '<p>' + itemsNum + '</p>' + text.replace(/''/g, '\'')
+    },
+    exportItemInfo(){
+      this.$refs.resolveTable.exportItemInfo();
+    },
+    searchClause(){
+      let query = {}
+      query.clauseName = this.clauseName
+      this.$refs.resolveTable.getSplitItemsByPage(query)
+    },
+    clearClause(){
+      this.clauseName = ''
+      let query = {}
+      query.clauseName = this.clauseName
+      this.$refs.resolveTable.itemsPage = 1
+      this.$refs.resolveTable.itemsPageSize = this.$store.getters.userInfo.configContent
+      this.$refs.resolveTable.getSplitItemsByPage(query)
     }
   },
   computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
index 11352d498..aed3af715 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
@@ -134,7 +134,7 @@
   <div class="prc-content-border"  v-show="verifySarStandard">
     <el-row :gutter="24">
       <el-col :span="12">
-        <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
+        <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled uploadBtnFormItem">
           <el-input
                   disabled
                   style="display: none;"
@@ -220,7 +220,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
+        <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled uploadBtnFormItem">
           <el-input
                   disabled
                   style="display: none;"
@@ -640,7 +640,7 @@
   <div class="prc-content-border"  v-show="opinionsShow">
     <el-row :gutter="24">
       <el-col :span="12">
-        <el-form-item label="培训文件" prop="madelSubName" class="add-form-item form-item-disabled">
+        <el-form-item label="培训文件" prop="madelSubName" class="add-form-item form-item-disabled uploadBtnFormItem">
           <el-input
                   disabled
                   style="display: none;"
@@ -661,7 +661,7 @@
                       type="primary"
                       class="common-button-primary"
                       size="mini"
-                      style="margin-top: 6px; float: left;"
+                      style="margin-top: 6px; float: right;"
                       @click="fileUpload('madelSub')">
                 <i class="el-icon-upload"></i>
               </el-button>
@@ -1132,4 +1132,7 @@ export default {
   /deep/ .fileClass{
     line-height: 22px !important;
   }
+  .uploadBtnFormItem /deep/ .el-form-item__error{
+    right: 45px !important;
+  }
 </style>

From a8ed30868501295b36703def73eb2556c191806b Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 7 Apr 2023 21:26:08 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/components/ResolveTable.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/components/ResolveTable.vue b/src/pages/details/otherStandardDetails/components/ResolveTable.vue
index 38d3de121..cd6c49b41 100644
--- a/src/pages/details/otherStandardDetails/components/ResolveTable.vue
+++ b/src/pages/details/otherStandardDetails/components/ResolveTable.vue
@@ -113,7 +113,7 @@ export default {
       itemsEoPage.infoId = this.infoId
       itemsEoPage.page = this.itemsPage
       itemsEoPage.pageSize = this.itemsPageSize
-      itemsEoPage.getItemsName = query ? query.clauseName : undefined
+      itemsEoPage.itemsName = query ? query.clauseName : undefined
       this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', itemsEoPage, {
         _this: this,
         loading: 'loading'

From c737a5130edfc101b57aab71f81e326bafbfe705 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Sat, 8 Apr 2023 20:40:06 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk/common/formEditListFb.vue | 11 +++++++----
 .../processCenter/pages/creatProcess/qbrk/step13.vue  |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
index 11352d498..aed3af715 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
@@ -134,7 +134,7 @@
   <div class="prc-content-border"  v-show="verifySarStandard">
     <el-row :gutter="24">
       <el-col :span="12">
-        <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
+        <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled uploadBtnFormItem">
           <el-input
                   disabled
                   style="display: none;"
@@ -220,7 +220,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
+        <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled uploadBtnFormItem">
           <el-input
                   disabled
                   style="display: none;"
@@ -640,7 +640,7 @@
   <div class="prc-content-border"  v-show="opinionsShow">
     <el-row :gutter="24">
       <el-col :span="12">
-        <el-form-item label="培训文件" prop="madelSubName" class="add-form-item form-item-disabled">
+        <el-form-item label="培训文件" prop="madelSubName" class="add-form-item form-item-disabled uploadBtnFormItem">
           <el-input
                   disabled
                   style="display: none;"
@@ -661,7 +661,7 @@
                       type="primary"
                       class="common-button-primary"
                       size="mini"
-                      style="margin-top: 6px; float: left;"
+                      style="margin-top: 6px; float: right;"
                       @click="fileUpload('madelSub')">
                 <i class="el-icon-upload"></i>
               </el-button>
@@ -1132,4 +1132,7 @@ export default {
   /deep/ .fileClass{
     line-height: 22px !important;
   }
+  .uploadBtnFormItem /deep/ .el-form-item__error{
+    right: 45px !important;
+  }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 869892d72..8bef8f07f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -1191,7 +1191,7 @@
                   _this: this
                 }, res => {
                   const obj = res.data
-                  let standSn = obj.newStandSn + 1
+                  let standSn = (obj.newStandSn / 1) + 1
                   this.form.standSn = standSn
                   this.form.standNumber = standSn
                   this.form.standNum = standSn

From 222918ed5ef9df91d0d36d5c2f86a6bdb54ec07e Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Sat, 8 Apr 2023 21:29:04 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/components/ProcessMixin.vue   | 6 +++++-
 .../pages/processList/tabComponents/processCenter/index.vue | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue
index 89d232ba1..281de6f8c 100644
--- a/src/pages/processCenter/pages/components/ProcessMixin.vue
+++ b/src/pages/processCenter/pages/components/ProcessMixin.vue
@@ -141,8 +141,12 @@ export default {
      * @date: 2020-11-25 15:47:12
      * @auth: chenxiaoxi
      */
-    getPrcName(prcType) {
+    getPrcName(prcType, taskInfo) {
       let prcName = "";
+      if(prcType === '25' && taskInfo === '技术标准起草'){
+        prcName = '企标制修订-技术标准'
+        return prcName
+      }
       this.processTypeList.map(item => {
         if (item.value === prcType) {
           prcName = item.label;
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index acf5c66d5..aa9994893 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -87,7 +87,7 @@
             width="180"
           >
             <template slot-scope="scope">
-              <span @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcName(scope.row.prcType) }}</span>
+              <span @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
             </template>
           </el-table-column>
           <el-table-column

From 19c9ba17db622e8402e1917ec14112b258fa647c Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Sat, 8 Apr 2023 21:39:32 +0800
Subject: [PATCH 09/10] =?UTF-8?q?Revert=20"=E6=A0=87=E5=87=86=E6=8B=86?=
 =?UTF-8?q?=E5=88=86"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 516e25d9
---
 .../details/otherStandardDetails/index.vue    | 413 ++++++++----------
 1 file changed, 182 insertions(+), 231 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 3b4484898..e31d8de91 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -750,77 +750,53 @@
 >
 <div class="search-area">
   <div class="left">
-    <!--<el-form ref="ruleForm" :model="standardForm" class="label-input-form" inline>-->
-    <!--  <el-form-item class="search-item">-->
-    <!--    <el-input v-show="false" v-model="standItemSearch.orgName" size="small" style="height: 32px"/>-->
-    <!--    <el-input v-show="false" v-model="standItemSearch.responsibleUnit" size="small" style="height: 32px"/>-->
-    <!--    <el-popover-->
-    <!--        :value="false"-->
-    <!--        placement="bottom"-->
-    <!--        popper-class="user-dept-popper"-->
-    <!--        trigger="click"-->
-    <!--    >-->
-    <!--    </el-popover>-->
-    <!--  </el-form-item>-->
-
-
-    <!--  <el-form-item class="search-item">-->
-    <!--    <el-input v-model="standItemSearch.itemsName" clearable maxlength="100" placeholder="根据条款名称查找"-->
-    <!--              size="small"></el-input>-->
-    <!--  </el-form-item>-->
-      <!--            新车实施日期-->
-      <!--<el-form-item class="search-item">-->
-      <!--  <div class="block">-->
-      <!--    <el-date-picker-->
-      <!--        v-model="standItemSearch.XCXSSRQ"-->
-      <!--        placeholder="新车实施日期"-->
-      <!--        type="date"-->
-      <!--        value-format="yyyy-MM-dd">-->
-      <!--    </el-date-picker>-->
-      <!--  </div>-->
-      <!--</el-form-item>-->
-      <!--&lt;!&ndash;            //在产车实施日期&ndash;&gt;-->
-      <!--<el-form-item class="search-item">-->
-      <!--  <div class="block">-->
-      <!--    <el-date-picker-->
-      <!--        v-model="standItemSearch.ZCCSSRQ"-->
-      <!--        placeholder="在产车实施日期"-->
-      <!--        type="date"-->
-      <!--        value-format="yyyy-MM-dd">-->
-      <!--    </el-date-picker>-->
-      <!--  </div>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item class="search-item btn-box">-->
-      <!--  <el-button-->
-      <!--      :loading="searching"-->
-      <!--      class="common-button-primary"-->
-      <!--      size="mini"-->
-      <!--      type="primary"-->
-      <!--      @click="searchSarStandItems">-->
-      <!--    查询-->
-      <!--  </el-button>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item class="search-item btn-box">-->
-      <!--  <el-button-->
-      <!--      class="common-button-default"-->
-      <!--      size="mini"-->
-      <!--      @click="clearAllSearch">-->
-      <!--    清空-->
-      <!--  </el-button>-->
-      <!--</el-form-item>-->
-    <!--</el-form>-->
-    <el-form ref="ruleForm" class="label-input-form" inline>
+    <el-form ref="ruleForm" :model="standardForm" class="label-input-form" inline>
       <el-form-item class="search-item">
-        <el-input v-model="clauseName" maxlength="100" placeholder="根据条款名称查找"
+        <el-input v-show="false" v-model="standItemSearch.orgName" size="small" style="height: 32px"/>
+        <el-input v-show="false" v-model="standItemSearch.responsibleUnit" size="small" style="height: 32px"/>
+        <el-popover
+            :value="false"
+            placement="bottom"
+            popper-class="user-dept-popper"
+            trigger="click"
+        >
+        </el-popover>
+      </el-form-item>
+
+
+      <el-form-item class="search-item">
+        <el-input v-model="standItemSearch.itemsName" clearable maxlength="100" placeholder="根据条款名称查找"
                   size="small"></el-input>
       </el-form-item>
+      <!--            新车实施日期-->
+      <el-form-item class="search-item">
+        <div class="block">
+          <el-date-picker
+              v-model="standItemSearch.XCXSSRQ"
+              placeholder="新车实施日期"
+              type="date"
+              value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </div>
+      </el-form-item>
+      <!--            //在产车实施日期-->
+      <el-form-item class="search-item">
+        <div class="block">
+          <el-date-picker
+              v-model="standItemSearch.ZCCSSRQ"
+              placeholder="在产车实施日期"
+              type="date"
+              value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </div>
+      </el-form-item>
       <el-form-item class="search-item btn-box">
         <el-button
             :loading="searching"
             class="common-button-primary"
             size="mini"
             type="primary"
-            @click="searchClause">
+            @click="searchSarStandItems">
           查询
         </el-button>
       </el-form-item>
@@ -828,7 +804,7 @@
         <el-button
             class="common-button-default"
             size="mini"
-            @click="clearClause">
+            @click="clearAllSearch">
           清空
         </el-button>
       </el-form-item>
@@ -836,17 +812,12 @@
   </div>
 </div>
 <div class="action-bar">
-  <!--<el-button class="common-button-default export-button" icon="export" size="mini"-->
-  <!--           @click="exportStandardItem"-->
-  <!--&gt;-->
-  <!--  导出-->
-  <!--</el-button>-->
   <el-button class="common-button-default export-button" icon="export" size="mini"
-             @click="exportItemInfo"
+             @click="exportStandardItem"
   >
     导出
   </el-button>
-  <el-button v-if="false"
+  <el-button
       v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
       class="common-button-primary"
       size="mini"
@@ -854,14 +825,14 @@
       @click="openRelatedTermsDrawer"
   >关联条款
   </el-button>
-  <!--<el-button-->
-  <!--    v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"-->
-  <!--    class="common-button-primary"-->
-  <!--    size="mini"-->
-  <!--    type="primary"-->
-  <!--    @click="editResolveList"-->
-  <!--&gt;编辑-->
-  <!--</el-button>-->
+  <el-button
+      v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
+      class="common-button-primary"
+      size="mini"
+      type="primary"
+      @click="editResolveList"
+  >编辑
+  </el-button>
   <el-upload
       :key="cfjgscUploadKey"
       style="display: inline-block;margin:0 5px;"
@@ -891,140 +862,139 @@
   <!--</el-button>-->
 </div>
 <div class="content">
-  <!--<el-table-->
-  <!--    ref="multipleTable"-->
-  <!--    :data="standItemList"-->
-  <!--    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
-  <!--     fontWeight: 'bold', height: '48px'}"-->
-  <!--    :height="tableHeight"-->
-  <!--    border-->
-  <!--    style="width: 100%"-->
-  <!--    tooltip-effect="dark"-->
-  <!--    @sort-change='sort'-->
-  <!--    @selection-change="selectAllStand">-->
-  <!--  <el-table-column-->
-  <!--      fixed="left"-->
-  <!--      type="selection"-->
-  <!--      width="60"-->
-  <!--  >-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="条款号"-->
-  <!--      prop="itemsNum"-->
-  <!--      show-overflow-tooltip-->
-  <!--      sortable="custom"-->
-  <!--      width="90"-->
-  <!--  >-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="条款名称"-->
-  <!--      min-width="300"-->
-  <!--      prop="itemsName"-->
-  <!--      show-overflow-tooltip-->
-  <!--  >-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      :resizable="false"-->
-  <!--      label="条款内容"-->
-  <!--      min-width="200"-->
-  <!--      prop="termsConditions"-->
-  <!--  >-->
-  <!--    <template slot-scope="scope">-->
-  <!--      &lt;!&ndash;              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">&ndash;&gt;-->
-  <!--      &lt;!&ndash;                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}&ndash;&gt;-->
-  <!--      &lt;!&ndash;              </div>&ndash;&gt;-->
-  <!--      <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"-->
-  <!--           @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
-  <!--        {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
-  <!--      </div>-->
-  <!--      &lt;!&ndash;              <el-tooltip placement="top">&ndash;&gt;-->
-  <!--      &lt;!&ndash;                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>&ndash;&gt;-->
-  <!--      &lt;!&ndash;                <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">&ndash;&gt;-->
-  <!--      &lt;!&ndash;                  {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}&ndash;&gt;-->
-  <!--      &lt;!&ndash;                </div>&ndash;&gt;-->
-  <!--      &lt;!&ndash;              </el-tooltip>&ndash;&gt;-->
-  <!--    </template>-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="核心技术要求/变化点"-->
-  <!--      prop="readContent"-->
-  <!--      show-overflow-tooltip-->
-  <!--      width="170"-->
-  <!--  >-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="基于上一版本差异"-->
-  <!--      prop="comparedWithPrevious"-->
-  <!--      show-overflow-tooltip-->
-  <!--      width="170">-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="新车型实施日期(文本)"-->
-  <!--      prop="xccssrq"-->
-  <!--      width="180">-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="在产车实施日期(文本)"-->
-  <!--      prop="zccssrq"-->
-  <!--      width="170">-->
-  <!--  </el-table-column>-->
-  <!--  <el-table-column-->
-  <!--      label="适用车型"-->
-  <!--      prop="applyArctic"-->
-  <!--      show-overflow-tooltip-->
-  <!--      width="90"-->
-  <!--  >-->
-  <!--    <template slot-scope="scope">-->
-  <!--      {{ filterApplyArctic(scope.row) }}-->
-  <!--    </template>-->
-  <!--  </el-table-column>-->
-  <!--  &lt;!&ndash;          <el-table-column&ndash;&gt;-->
-  <!--  &lt;!&ndash;              prop="responsibleUnit"&ndash;&gt;-->
-  <!--  &lt;!&ndash;              label="责任部门">&ndash;&gt;-->
-  <!--  &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-  <!--  <el-table-column-->
-  <!--      label="责任工程师"-->
-  <!--      prop="dutyEngineer"-->
-  <!--      width="100">-->
-  <!--  </el-table-column>-->
-  <!--  &lt;!&ndash;          <el-table-column&ndash;&gt;-->
-  <!--  &lt;!&ndash;            show-overflow-tooltip&ndash;&gt;-->
-  <!--  &lt;!&ndash;            label="符合性状态"&ndash;&gt;-->
-  <!--  &lt;!&ndash;            width="100">&ndash;&gt;-->
-  <!--  &lt;!&ndash;            <template slot-scope="scope">&ndash;&gt;-->
-  <!--  &lt;!&ndash;              {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}&ndash;&gt;-->
-  <!--  &lt;!&ndash;            </template>&ndash;&gt;-->
-  <!--  &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-  <!--  &lt;!&ndash;          <el-table-column&ndash;&gt;-->
-  <!--  &lt;!&ndash;            show-overflow-tooltip&ndash;&gt;-->
-  <!--  &lt;!&ndash;            prop="complianceState"&ndash;&gt;-->
-  <!--  &lt;!&ndash;            label="合规性分析"&ndash;&gt;-->
-  <!--  &lt;!&ndash;            width="100">&ndash;&gt;-->
-  <!--  &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-  <!--  <el-table-column align="center" fixed="right" label="操作" width="50">-->
-  <!--    <template slot-scope="scope">-->
-  <!--      <div @click.stop>-->
-  <!--        <el-dropdown trigger="click" @command="handleCommand">-->
-  <!--          <i class="iconfont">&#xe61e;</i>-->
-  <!--          <el-dropdown-menu slot="dropdown">-->
-  <!--            <el-dropdown-item :command="[scope.row, '查看']" :disabled="scope.row.enable==='0'">查看-->
-  <!--            </el-dropdown-item>-->
-  <!--            &lt;!&ndash;<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>&ndash;&gt;-->
-  <!--            &lt;!&ndash;<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>&ndash;&gt;-->
-  <!--          </el-dropdown-menu>-->
-  <!--        </el-dropdown>-->
-  <!--      </div>-->
-  <!--    </template>-->
-  <!--  </el-table-column>-->
-  <!--</el-table>-->
-  <ResolveTable ref="resolveTable"></ResolveTable>
-  <!--<loading :loading="tableLoading">数据加载中...</loading>-->
+  <el-table
+      ref="multipleTable"
+      :data="standItemList"
+      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+       fontWeight: 'bold', height: '48px'}"
+      :height="tableHeight"
+      border
+      style="width: 100%"
+      tooltip-effect="dark"
+      @sort-change='sort'
+      @selection-change="selectAllStand">
+    <el-table-column
+        fixed="left"
+        type="selection"
+        width="60"
+    >
+    </el-table-column>
+    <el-table-column
+        label="条款号"
+        prop="itemsNum"
+        show-overflow-tooltip
+        sortable="custom"
+        width="90"
+    >
+    </el-table-column>
+    <el-table-column
+        label="条款名称"
+        min-width="300"
+        prop="itemsName"
+        show-overflow-tooltip
+    >
+    </el-table-column>
+    <el-table-column
+        :resizable="false"
+        label="条款内容"
+        min-width="200"
+        prop="termsConditions"
+    >
+      <template slot-scope="scope">
+        <!--              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
+        <!--                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
+        <!--              </div>-->
+        <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"
+             @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
+          {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
+        </div>
+        <!--              <el-tooltip placement="top">-->
+        <!--                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>-->
+        <!--                <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
+        <!--                  {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
+        <!--                </div>-->
+        <!--              </el-tooltip>-->
+      </template>
+    </el-table-column>
+    <el-table-column
+        label="核心技术要求/变化点"
+        prop="readContent"
+        show-overflow-tooltip
+        width="170"
+    >
+    </el-table-column>
+    <el-table-column
+        label="基于上一版本差异"
+        prop="comparedWithPrevious"
+        show-overflow-tooltip
+        width="170">
+    </el-table-column>
+    <el-table-column
+        label="新车型实施日期(文本)"
+        prop="xccssrq"
+        width="180">
+    </el-table-column>
+    <el-table-column
+        label="在产车实施日期(文本)"
+        prop="zccssrq"
+        width="170">
+    </el-table-column>
+    <el-table-column
+        label="适用车型"
+        prop="applyArctic"
+        show-overflow-tooltip
+        width="90"
+    >
+      <template slot-scope="scope">
+        {{ filterApplyArctic(scope.row) }}
+      </template>
+    </el-table-column>
+    <!--          <el-table-column-->
+    <!--              prop="responsibleUnit"-->
+    <!--              label="责任部门">-->
+    <!--          </el-table-column>-->
+    <el-table-column
+        label="责任工程师"
+        prop="dutyEngineer"
+        width="100">
+    </el-table-column>
+    <!--          <el-table-column-->
+    <!--            show-overflow-tooltip-->
+    <!--            label="符合性状态"-->
+    <!--            width="100">-->
+    <!--            <template slot-scope="scope">-->
+    <!--              {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}-->
+    <!--            </template>-->
+    <!--          </el-table-column>-->
+    <!--          <el-table-column-->
+    <!--            show-overflow-tooltip-->
+    <!--            prop="complianceState"-->
+    <!--            label="合规性分析"-->
+    <!--            width="100">-->
+    <!--          </el-table-column>-->
+    <el-table-column align="center" fixed="right" label="操作" width="50">
+      <template slot-scope="scope">
+        <div @click.stop>
+          <el-dropdown trigger="click" @command="handleCommand">
+            <i class="iconfont">&#xe61e;</i>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="[scope.row, '查看']" :disabled="scope.row.enable==='0'">查看
+              </el-dropdown-item>
+              <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>-->
+              <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>-->
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+      </template>
+    </el-table-column>
+  </el-table>
+  <loading :loading="tableLoading">数据加载中...</loading>
 </div>
-<!--<pagination-->
-<!--    :page="page7"-->
-<!--    :total="total7"-->
-<!--    @pageChange="pageChange7"-->
-<!--    @pageSizeChange="pageSizeChange7"></pagination>-->
+<pagination
+    :page="page7"
+    :total="total7"
+    @pageChange="pageChange7"
+    @pageSizeChange="pageSizeChange7"></pagination>
 <!--      <el-pagination-->
 <!--          @size-change="pageSizeChange"-->
 <!--          @current-change="pageChange"-->
@@ -1838,7 +1808,6 @@ import {dateFormat} from '@/common/date'
 import RelatedTermsSelect from './components/RelatedTermsSelect'
 import {getBusStandFileByAttId} from 'api/process'
 import {dicTypeData} from "api/unqualProcess";
-import ResolveTable from './components/ResolveTable.vue'
 
 
 export default {
@@ -1848,8 +1817,7 @@ export default {
     CustomSVPPS,
     CustomSelectArray,
     CustomOrg,
-    RelatedTermsSelect,
-    ResolveTable
+    RelatedTermsSelect
   },
   filters: {
     ellipsis(value) {
@@ -1869,7 +1837,6 @@ export default {
   },
   data() {
     return {
-      clauseName:"", // 条款名称
       cfjgscUploadKey:1,
       externalStatus: '',
       handleList: [],
@@ -3970,22 +3937,6 @@ export default {
     itemsTextDialog(itemsNum, text) {
       this.itemsTextDialogs = true
       this.itemsText = '<p>' + itemsNum + '</p>' + text.replace(/''/g, '\'')
-    },
-    exportItemInfo(){
-      this.$refs.resolveTable.exportItemInfo();
-    },
-    searchClause(){
-      let query = {}
-      query.clauseName = this.clauseName
-      this.$refs.resolveTable.getSplitItemsByPage(query)
-    },
-    clearClause(){
-      this.clauseName = ''
-      let query = {}
-      query.clauseName = this.clauseName
-      this.$refs.resolveTable.itemsPage = 1
-      this.$refs.resolveTable.itemsPageSize = this.$store.getters.userInfo.configContent
-      this.$refs.resolveTable.getSplitItemsByPage(query)
     }
   },
   computed: {

From 3f5aad5b49136c1f0a7963022a0fe5201c7a8368 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Sun, 9 Apr 2023 13:58:21 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 8bef8f07f..df9345e42 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -2992,7 +2992,7 @@
                         _this: this
                     }, res => {
                         const obj = res.data
-                        let standSn = obj.newStandSn + 1
+                        let standSn = (obj.newStandSn / 1) + 1
                         this.form.standSn = standSn
                         this.form.standNumber = standSn
                         this.form.standNum = standSn