Merge branch 'develop' into FOTON

src/api/process.js

@@ -448,6 +448,22 @@ export function processModelHisOne (data) {
   })
 }
 
+export function saveEditFile (data) {
+    return axios({
+        url: '/api/lawss/activiti/saveEditFile',
+        method: 'get',
+        params: data
+    })
+}
+
+export function processEditFile (data) {
+    return axios({
+        url: '/api/lawss/activiti/processEditFile',
+        method: 'get',
+        params: data
+    })
+}
+
 export function processModelHisOneCount (data) {
   return axios({
     url: '/api/lawss/activiti/processModelHisOneCount',

src/common/index.js

@@ -6,6 +6,9 @@ import base64 from './base64'
 import dateFormat from './date'
 import hasPermission from './hasPermission'
 import preview from './preview'
+import onlineEdit from './onlineEdit'
+import onlinePreview from './onlinePreview'
+import onlineEditPreview from './onlineEditPreview'
 
 // 表单验证
 import verify from './verify'
@@ -38,7 +41,22 @@ const install = function (Vue) {
       get () {
         return preview
       }
-    }
+    },
+    $onlinePreview: {
+      get () {
+        return onlinePreview
+      }
+    },
+    $onlineEditPreview: {
+      get () {
+        return onlineEditPreview
+      }
+    },
+    $onlineEdit: {
+      get () {
+        return onlineEdit
+      }
+    },
   })
 }
 export default {

src/common/onlineEdit/index.js

@@ -0,0 +1,27 @@
+/**
+ *  在线编辑
+ */
+import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
+import { processEditFile } from 'api/process'
+let Base64 = require('js-base64').Base64;
+export default (id,nodeName,userId,userName) => {
+    processEditFile({
+        id
+    }).then(res => {
+        if(res){
+            const editFileInfo = res
+            const showName = nodeName
+            const editFilePath = editFileInfo.editFilePath.split("/")
+            editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
+            editFileInfo.fileName = editFilePath[2]
+            editFileInfo.userId = userId
+            editFileInfo.userName = userName
+            if(editFileInfo.pid){
+                editFileInfo.pId = editFileInfo.pid
+            }
+            const nowTime = new Date().getTime()
+            window.open(onlyOfficeUrl+'/editor?pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+        }
+    }).catch(e => {
+    })
+}

src/common/onlineEditPreview/index.js

@@ -0,0 +1,29 @@
+/**
+ *  工作流文件在线编辑预览
+ */
+import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
+import { processEditFile } from 'api/process'
+let Base64 = require('js-base64').Base64;
+export default (id,nodeName,userId,userName) => {
+    processEditFile({
+        id
+    }).then(res => {
+        if(res){
+            const editFileInfo = res
+            const showName = nodeName
+            const editFilePath = editFileInfo.editFilePath.split("/")
+            editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
+            editFileInfo.fileName = editFilePath[2]
+            editFileInfo.userId = userId
+            editFileInfo.userName = userName
+            if(editFileInfo.pid){
+                editFileInfo.pId = editFileInfo.pid
+            }
+            editFileInfo.fileSuffix = 'docx'
+            const nowTime = new Date().getTime()
+            window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + showName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+        }
+    }).catch(e => {
+    })
+}
+

src/common/onlinePreview/index.js

@@ -0,0 +1,17 @@
+/**
+ *  工作流文件预览
+ */
+import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
+import { processEditFile } from 'api/process'
+let Base64 = require('js-base64').Base64;
+export default id => {
+    processEditFile({
+        id
+    }).then(res => {
+        if(res){
+            const editFileInfo = res
+             window.open(kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
+            }
+    }).catch(e => {
+    })
+}

src/components/CustomFormComponents/DatePicker.vue

@@ -15,6 +15,7 @@
         format="yyyy-MM-dd"
         :value="value"
         type="date"
+        clearable
         :editable="true"
         :disabled="disabled"
         :placeholder="placeholder"

src/pages/loginVerify/index.vue

@@ -135,10 +135,12 @@
                 if (res.ok) {
                     this.loginNew(res)
                 } else {
-                  this.$message.warning('系统无权限访问')
-                  this.$store.dispatch('logout')
-                    // window.location.href = 'http://sso.foton.com.cn/logout?service='
-                   window.location.href = ssoLogoutUrlDev
+                    if(res.code && res.code === 'r0011'){
+                        this.$message.warning('系统无权限访问')
+                        this.$store.dispatch('logout')
+                        // window.location.href = 'http://sso.foton.com.cn/logout?service='
+                        window.location.href = ssoLogoutUrlDev
+                    }
                 }
             })
 

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

@@ -132,21 +132,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        v-if="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -177,6 +162,21 @@
                         prop="zrUserName"
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        v-if="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         label="操作"
                         width="240"
@@ -403,7 +403,10 @@
             <div class="demo-drawer-content">
                 <div style="display: flex; height: 100%;">
                     <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
-                        <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
+                        <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
+                            <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+                            <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+                        </div>
                         <div v-else style="height: 100%;">
                             <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
                             <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
@@ -414,7 +417,7 @@
                         </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-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" 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%;' : ''">
@@ -710,7 +713,7 @@
                 })
             },
             itemEdit (row, type, index) {
-                this.itermsConditions = row.itermsConditions
+                this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
                 let itemsEoPage = {
                     oldItemId: row.itemsId,
                     newItemId: row.itemsId2,
@@ -844,7 +847,7 @@
             },
             itermsConditionsOpen (row) {
                 this.itermsConditionsFlag = true
-                this.itermsConditionsTitle = row
+                this.itermsConditionsTitle = row.replace(/''/g, '\'')
             },
             getData () {
                 queryTaskFirst({
@@ -1085,11 +1088,12 @@
                                         }
                                     }
                                 }
-                                if (num4 > 0) {
-                                    this.$message.warning('请输入新车型实施日期')
-                                } else if (num5 > 0) {
-                                    this.$message.warning('请输入在产车实施日期')
-                                } else if (num6 > 0) {
+                                // if (num4 > 0) {
+                                //     this.$message.warning('请输入新车型实施日期')
+                                // } else if (num5 > 0) {
+                                //     this.$message.warning('请输入在产车实施日期')
+                                // } else
+                                if (num6 > 0) {
                                     this.$message.warning('请选择适用车型')
                                 } else if (b > 0) {
                                     this.$message.warning('请选择责任人')

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

@@ -68,6 +68,15 @@
                       clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                          v-model="form.endTime"
+                          type="date"
+                          disabled
+                          placeholder="请选择截止日期"
+                          value-format="yyyy-MM-dd">
+                  </el-date-picker>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -164,22 +173,6 @@
             <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
           </template>
         </el-table-column>
-        <el-table-column
-                v-if="!form.itemsNum1"
-                prop="technicalRequir"
-                width="200"
-                label="核心技术要求"
-                show-overflow-tooltip
-                align="center">
-        </el-table-column>
-        <el-table-column
-                prop="changePoint"
-                width="150"
-                v-show="form.itemsNum1"
-                label="基于上一版本差异"
-                show-overflow-tooltip
-                align="center">
-        </el-table-column>
         <el-table-column
                 v-show="sarType === 'FOREIGN' && form.itemsNum1"
                 prop="changePoint"
@@ -219,6 +212,22 @@
                 show-overflow-tooltip
                 align="center">
         </el-table-column>
+        <el-table-column
+                v-if="!form.itemsNum1"
+                prop="technicalRequir"
+                width="200"
+                label="核心技术要求"
+                show-overflow-tooltip
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="changePoint"
+                width="150"
+                v-show="form.itemsNum1"
+                label="基于上一版本差异"
+                show-overflow-tooltip
+                align="center">
+        </el-table-column>
         <el-table-column
                 label="责任人"
                 width="170"
@@ -383,6 +392,7 @@ export default {
         itemsName: '',
         itemsNum1: '',
         itemsName1: '',
+        endTime: '',
       },
       json: {},
     }
@@ -436,6 +446,10 @@ export default {
         newItemId: id2,
         flag: 1
       }
+      if (!id || !id2) {
+        this.$message.warning('暂无找到相似的文本')
+        return
+      }
       this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
         _this: this
       }, res => {
@@ -459,7 +473,7 @@ export default {
     },
     itermsConditionsOpen (row) {
       this.itermsConditionsFlag = true
-      this.itermsConditionsTitle = row
+      this.itermsConditionsTitle = row.replace(/''/g, '\'')
     },
     getHistoryData () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -500,6 +514,7 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
+          this.form.endTime = data.endTime || data.form.endTime
           this.form.itemsNum = data.itemsNum || data.form.itemsNum
           this.form.itemsName = data.itemsName || data.form.itemsName
           if (data.form) {

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

@@ -139,21 +139,6 @@
                 show-overflow-tooltip
                 align="center">
         </el-table-column>
-        <el-table-column
-                prop="changePoint"
-                v-if="form.itemsNum1"
-                label="基于上一版本差异"
-                show-overflow-tooltip
-                align="center">
-        </el-table-column>
-        <el-table-column
-                v-if="sarType === 'FOREIGN' && form.itemsNum1"
-                prop="changePoint"
-                width="150"
-                label="相对于国行标差异点"
-                show-overflow-tooltip
-                align="center">
-        </el-table-column>
         <el-table-column
                 prop="newData"
                 width="180"
@@ -178,6 +163,21 @@
             {{ scope.row.applyArctic.toString() }}
           </template>
         </el-table-column>
+        <el-table-column
+                prop="changePoint"
+                v-if="form.itemsNum1"
+                label="基于上一版本差异"
+                show-overflow-tooltip
+                align="center">
+        </el-table-column>
+        <el-table-column
+                v-if="sarType === 'FOREIGN' && form.itemsNum1"
+                prop="changePoint"
+                width="150"
+                label="相对于国行标差异点"
+                show-overflow-tooltip
+                align="center">
+        </el-table-column>
         <el-table-column
           label="责任人"
           width="170"
@@ -411,7 +411,10 @@
       <div class="demo-drawer-content">
         <div style="display: flex; height: 100%;">
           <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
-            <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
+            <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
+              <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+              <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+            </div>
             <div v-else style="height: 100%;">
               <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
               <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
@@ -422,7 +425,7 @@
             </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-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" 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%;' : ''">
@@ -723,7 +726,7 @@ export default {
       })
     },
     itemEdit (row, type, index) {
-      this.itermsConditions = row.itermsConditions
+      this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
       let itemsEoPage = {
         oldItemId: row.itemsId,
         newItemId: row.itemsId2,
@@ -857,7 +860,7 @@ export default {
     },
     itermsConditionsOpen(row) {
       this.itermsConditionsFlag = true
-      this.itermsConditionsTitle = row
+      this.itermsConditionsTitle = row.replace(/''/g, '\'')
     },
     showUser(row) {
       let routeUrl = this.$router.resolve({
@@ -1090,11 +1093,12 @@ export default {
                   }
                 }
               }
-              if (num4 > 0) {
-                this.$message.warning('请输入新车型实施日期')
-              } else if (num5 > 0) {
-                this.$message.warning('请输入在产车实施日期')
-              } else if (num6 > 0) {
+              // if (num4 > 0) {
+              //   this.$message.warning('请输入新车型实施日期')
+              // } else if (num5 > 0) {
+              //   this.$message.warning('请输入在产车实施日期')
+              // } else
+              if (num6 > 0) {
                 this.$message.warning('请选择适用车型')
               } else if (b > 0) {
                 this.$message.warning('请选择责任人')

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

@@ -54,6 +54,15 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -114,21 +123,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        v-if="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -153,6 +147,21 @@
                         {{ JSON.parse(scope.row.applyArctic).join(',') }}
                     </template>
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        v-if="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         label="执行人"
                         width="170"
@@ -312,6 +321,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
                 itemList: []
@@ -370,7 +380,7 @@
             },
             itermsConditionsOpen (row) {
                 this.itermsConditionsFlag = true
-                this.itermsConditionsTitle = row
+                this.itermsConditionsTitle = row.replace(/''/g, '\'')
             },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -493,6 +503,7 @@
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText2 = data.commentText2 || ''
+                        this.form.endTime = data.endTime || data.form.endTime
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

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

@@ -54,6 +54,15 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -113,14 +122,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -159,6 +160,14 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         :disabled="acceptShow"
                         prop="changePoint"
@@ -357,7 +366,10 @@
             <div class="demo-drawer-content">
                 <div style="display: flex; height: 100%;">
                     <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-if="BDtext" style="width: 100%; height: 100%;display: flex;">
+                            <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+                            <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+                        </div>
                         <div v-else style="height: 100%;">
                             <div style="margin: 10px 5px;">比对条款: {{ editForm.itemsNum }}</div>
                             <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
@@ -368,7 +380,7 @@
                         </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-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" 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>
@@ -535,6 +547,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
                 idList: []
@@ -610,7 +623,7 @@
                 })
             },
             itemEdit (row) {
-                this.itermsConditions = row.itermsConditions
+                this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
                 let itemsEoPage = {
                     oldItemId: row.itemsId,
                     newItemId: row.itemsId2,
@@ -704,7 +717,7 @@
             },
             itermsConditionsOpen (row) {
                 this.itermsConditionsFlag = true
-                this.itermsConditionsTitle = row
+                this.itermsConditionsTitle = row.replace(/''/g, '\'')
             },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -832,11 +845,13 @@
                         }
                         if (num3 > 0) {
                             this.$message.warning('请输入符合性要求')
-                        } else if (num4 > 0) {
-                            this.$message.warning('请输入新车型实施日期')
-                        } else if (num5 > 0) {
-                            this.$message.warning('请输入在产车实施日期')
-                        } else if (num6 > 0) {
+                        }
+                        // else if (num4 > 0) {
+                        //     this.$message.warning('请输入新车型实施日期')
+                        // } else if (num5 > 0) {
+                        //     this.$message.warning('请输入在产车实施日期')
+                        // }
+                        else if (num6 > 0) {
                             this.$message.warning('请选择适用车型')
                         } else if (b > 0) {
                             this.$message.warning('请选择责任人')
@@ -870,6 +885,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.endTime = data.endTime || data.form.endTime
                         let commitStatus = res.commitStatus
                         if(commitStatus && commitStatus > 0){
                             this.acceptShow = true

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

@@ -54,6 +54,15 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -108,22 +117,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        width="150"
-                        v-show="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -162,6 +155,22 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        width="150"
+                        v-show="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
@@ -340,6 +349,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
             }
@@ -379,21 +389,6 @@
                     }
                 })
             },
-            itemEdit (row) {
-                this.itemId = row.id
-                this.modalshowflag2 = true
-                this.editForm = {
-                    technicalRequir: row.technicalRequir, // 核心技术要求
-                    changePoint: row.changePoint, // 国内标准的差异点
-                    complianceRequir: row.complianceRequir || '1', // 符合性要求
-                    complianceState: row.complianceState, // 合规性分析
-                    newData: row.newData, // 新车型实施日期
-                    onlineData: row.onlineData, // 在产车实施日期
-                    applyArctic: row.applyArctic, // 适用车型
-                    itemsId: row.itemsId,
-                    itemsId2: row.itemsId2
-                }
-            },
             phoneClick () {
                 this.$router.push('/phoneBzjdStep4')
             },
@@ -439,7 +434,7 @@
             },
             itermsConditionsOpen (row) {
                 this.itermsConditionsFlag = true
-                this.itermsConditionsTitle = row
+                this.itermsConditionsTitle = row.replace(/''/g, '\'')
             },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -496,6 +491,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText4 = data.commentText4 || ''

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

@@ -54,6 +54,15 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -108,22 +117,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        width="150"
-                        v-show="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -162,6 +155,22 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        width="150"
+                        v-show="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
@@ -340,6 +349,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
             }
@@ -421,7 +431,7 @@
             },
             itermsConditionsOpen (row) {
                 this.itermsConditionsFlag = true
-                this.itermsConditionsTitle = row
+                this.itermsConditionsTitle = row.replace(/''/g, '\'')
             },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -478,6 +488,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText5 = data.commentText5 || ''

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

@@ -54,6 +54,15 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -108,22 +117,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="changePoint"
-                        width="150"
-                        v-show="form.itemsNum1"
-                        label="基于上一版本差异"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
-                        prop="changePoint"
-                        width="150"
-                        label="相对于国行标差异点"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -162,6 +155,22 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="changePoint"
+                        width="150"
+                        v-show="form.itemsNum1"
+                        label="基于上一版本差异"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
@@ -338,6 +347,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
             }
@@ -419,7 +429,7 @@
             },
             itermsConditionsOpen (row) {
                 this.itermsConditionsFlag = true
-                this.itermsConditionsTitle = row
+                this.itermsConditionsTitle = row.replace(/''/g, '\'')
             },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -476,6 +486,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText6 = data.commentText6 || ''

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

@@ -76,7 +76,7 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
+                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled blueClass">
                   <el-input
                     v-model="form.responUserList"
                     style="display: none;"
@@ -404,7 +404,15 @@ export default {
       padding: 0 20px 0;
     }
   }
-
+  .blueClass {
+    background: #1E89FF;
+    /deep/.el-form-item__label {
+      color: #fff;
+    }
+    /deep/.el-input__inner {
+      color: #fff !important;
+    }
+  }
   .fileClass {
     cursor: pointer;
   }

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

@@ -449,13 +449,13 @@
       },
       saveUserInfo2 () {
         for( let a = 0; a < this.data.length; a++) {
-          if (a === this.itemId) {
-            this.data[a].chapterNumber = this.editForm.chapterNumber
-            this.data[a].chapterName = this.editForm.chapterName
-            this.data[a].oldText = this.editForm.oldText
-            this.data[a].newText = this.editForm.newText
-            this.data[a].reason = this.editForm.reason
-            this.data[a].cause = this.editForm.cause
+          if (this.data[a].id === this.itemId) {
+            // this.data[a].chapterNumber = this.editForm.chapterNumber
+            // this.data[a].chapterName = this.editForm.chapterName
+            // this.data[a].oldText = this.editForm.oldText
+            // this.data[a].newText = this.editForm.newText
+            // this.data[a].reason = this.editForm.reason
+            // this.data[a].cause = this.editForm.cause
             this.$set(this.data, a, this.editForm);
           }
         }
@@ -465,7 +465,7 @@
         this.modalshowflag2 = false
       },
       itemEdit (row, index) {
-        this.itemId = index
+        this.itemId = row.id
         this.modalshowflag2 = true
         this.editForm = {
           chapterNumber: row.chapterNumber,
@@ -597,7 +597,6 @@
             pId: this.pId
           }).then(res => {
             let data = JSON.parse(res.mesg);
-            console.log(data);
             this.commentText5 = data.commentText5 || ''
             this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
             this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )

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

@@ -105,7 +105,7 @@
         </div>
         <el-table
                 ref="multipleTable"
-                :data="data"
+                :data="data2"
                 tooltip-effect="dark"
                 border
                 style="width: 100%; flex: auto;"
@@ -299,6 +299,7 @@
     name: "bzzqyjStep6",
     data() {
       return {
+        data2: [],
         commentText6: '',
         itermsConditionsFlag: false,
         itermsConditionsTitle: '',
@@ -435,6 +436,8 @@
           return "上报";
         } else if (row === "2") {
           return "处理后上报";
+        } else {
+          return "不上报";
         }
       },
       upload(row, title) {
@@ -526,7 +529,6 @@
             pId: this.pId
           }).then(res => {
             let data = JSON.parse(res.mesg);
-            console.log(data);
             this.commentText6 = data.commentText6 || ''
             this.form.fjList = data.fjList || data.form.fjList
             this.form.cid = data.cid || data.form.cid;
@@ -544,6 +546,7 @@
               }
             })
             this.json = data
+            this.data2 = newArr
             this.data = arr
           }).catch(e => {
           });

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

@@ -97,7 +97,7 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="data"
+          :data="data2"
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
@@ -284,6 +284,7 @@ export default {
   name: "bzzqyjStep7",
   data() {
     return {
+      data2: [],
       commentText7: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
@@ -437,6 +438,8 @@ export default {
         return '上报'
       } else if (row === '2') {
         return '处理后上报'
+      } else {
+        return '不上报'
       }
     },
     handleTabs(name) {
@@ -502,6 +505,7 @@ export default {
             }
           })
           this.json = data
+          this.data2 = newArr
           this.data = arr
         }).catch(e => {
         })

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

@@ -97,7 +97,7 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="data"
+          :data="data2"
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
@@ -287,6 +287,7 @@ export default {
   name: "bzzqyjStep8",
   data() {
     return {
+      data2: [],
       commentText8: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
@@ -440,6 +441,8 @@ export default {
         return '上报'
       } else if (row === '2') {
         return '处理后上报'
+      } else {
+        return '不上报'
       }
     },
     handleTabs(name) {
@@ -505,6 +508,7 @@ export default {
             }
           })
           this.json = data
+          this.data2 = newArr
           this.data = arr
         }).catch(e => {
         })

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

@@ -97,7 +97,7 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="data"
+          :data="data2"
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
@@ -287,6 +287,7 @@ export default {
   name: "bzzqyjStep9",
   data() {
     return {
+      data2: [],
       commentText9: '',
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
@@ -440,6 +441,8 @@ export default {
         return "上报";
       } else if (row === "2") {
         return "处理后上报";
+      } else {
+        return "不上报";
       }
     },
     handleTabs(name) {
@@ -506,6 +509,7 @@ export default {
           })
           this.json = data
           this.data = arr
+          this.data2 = newArr
         }).catch(e => {
         });
       });

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -64,13 +64,6 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-              <el-input
-                disabled
-                v-model="qbfsForm.rqbName"
-                placeholder="请输入代替企标编号"
-                :maxlength="500"/>
-            </el-form-item>
             <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
               <el-input
                 disabled
@@ -87,14 +80,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
-              <el-input
-                readonly
-                v-model="qbfsForm.drafterName"
-                placeholder="请输入起草人"
-                clearable
-              ></el-input>
-            </el-form-item>
             <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
               <div v-if="qbfsForm.unitName">
                 <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
@@ -115,6 +100,14 @@
                 ></el-input>
               </div>
             </el-form-item>
+            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.drafterName"
+                placeholder="请输入起草人"
+                clearable
+              ></el-input>
+            </el-form-item>
             <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -164,13 +157,18 @@
                 placeholder="请输入采用标准"
                 :maxlength="500"/>
             </el-form-item>
-            <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
-              <el-input
-                disabled
-                v-model="qbfsForm.useLevel"
-                placeholder="请输入采标程度"
-                :maxlength="500"/>
-            </el-form-item>            <el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+            <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
+                <el-option
+                  v-for="(item, index) in cbcdOptions"
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
               <el-input
                 type="textarea"
                 v-model="qbfsForm.cancelReason"
@@ -206,6 +204,13 @@
                     <el-option label="修订" value="修订"></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="qbfsForm.rqbName"
+                    placeholder="请输入代替企标编号"
+                    :maxlength="500"/>
+                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"
@@ -339,6 +344,7 @@ export default {
       },
       ListModel: false,
       standinfoList: [],
+      cbcdOptions: [],
       BZList: [],
       standSortOptions: [],
       page: 1,
@@ -374,7 +380,6 @@ export default {
     }
   },
   mounted(){
-    console.log(this.qbfsForm);
     if(!this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
@@ -382,6 +387,7 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
       this.BZList = res.data.ENERGYTYPES //标准范围
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -63,13 +63,6 @@
                placeholder="请选择初稿完成时间">
              </el-date-picker>
            </el-form-item>
-           <el-form-item v-if="qbfsForm.reviseStatus === '修订'"  label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-             <el-input
-               disabled
-               v-model="qbfsForm.rqbName"
-               placeholder="请输入代替企标编号"
-               :maxlength="500"/>
-           </el-form-item>
            <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
              <el-input
                disabled
@@ -94,14 +87,6 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-           <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
-             <el-input
-               readonly
-               v-model="qbfsForm.drafterName"
-               placeholder="请输入起草人"
-               clearable
-             ></el-input>
-           </el-form-item>
            <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
              <div v-if="qbfsForm.unitName">
                <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
@@ -122,6 +107,14 @@
                ></el-input>
              </div>
            </el-form-item>
+           <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
+             <el-input
+               readonly
+               v-model="qbfsForm.drafterName"
+               placeholder="请输入起草人"
+               clearable
+             ></el-input>
+           </el-form-item>
            <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
              <el-input
                readonly
@@ -171,12 +164,16 @@
                placeholder="请输入采用标准"
                :maxlength="500"/>
            </el-form-item>
-           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
-             <el-input
-               disabled
-               v-model="qbfsForm.useLevel"
-               placeholder="请输入采标程度"
-               :maxlength="500"/>
+           <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
+                         class="add-form-item form-item-disabled">
+             <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
+               <el-option
+                 v-for="(item, index) in cbcdOptions"
+                 :key="index"
+                 :value="item.value"
+                 :label="item.label">
+               </el-option>
+             </el-select>
            </el-form-item>
            <el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
              <el-date-picker
@@ -222,6 +219,13 @@
                    <el-option label="修订" value="修订"></el-option>
                  </el-select>
                </el-form-item>
+               <el-form-item v-if="qbfsForm.reviseStatus === '修订'"  label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+                 <el-input
+                   disabled
+                   v-model="qbfsForm.rqbName"
+                   placeholder="请输入代替企标编号"
+                   :maxlength="500"/>
+               </el-form-item>
                <el-form-item class="search-item btn-box">
                  <el-button
                    type="primary"
@@ -345,6 +349,7 @@ export default {
   data(){
     return{
       BZList: [],
+      cbcdOptions: [],
       standSortOptions: [],
       formRules: {
         bussSort: [
@@ -405,6 +410,7 @@ export default {
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
     })
   },
   methods: {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -34,11 +34,17 @@
           <el-option label="修订" value="修订"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
-                    class="add-form-item form-item-disabled">
-        <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
-        <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人" readonly
-                  @click.native="choiceZRRS('1')">
+      <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <el-input
+          style="display: none;"
+          v-model="qbfsForm.rqbJson">
+        </el-input>
+        <el-input
+          clearable
+          v-model="qbfsForm.rqbName"
+          placeholder="请选择代替企标编号"
+          readonly
+          @click.native="choiceQYBZ">
         </el-input>
       </el-form-item>
       <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
@@ -47,6 +53,13 @@
                   @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
         </el-input>
       </el-form-item>
+      <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
+        <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人" readonly
+                  @click.native="choiceZRRS('1')">
+        </el-input>
+      </el-form-item>
       <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
@@ -75,19 +88,6 @@
           placeholder="请选择计划标准发布时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-        <el-input
-          style="display: none;"
-          v-model="qbfsForm.rqbJson">
-        </el-input>
-        <el-input
-          clearable
-          v-model="qbfsForm.rqbName"
-          placeholder="请选择代替企标编号"
-          readonly
-          @click.native="choiceQYBZ">
-        </el-input>
-      </el-form-item>
       <el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
         <el-input
           style="display: none;"
@@ -171,6 +171,17 @@
           placeholder="请输入立项原因"
           :maxlength="500"/>
       </el-form-item>
+      <el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
+        <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+          <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+          <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+          <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-edit"  @click="handleFilePreview(item,'onlineEdit')"></el-button>
+                  </span>
+        </div>
+      </el-form-item>
     </el-form>
 <!--    选择企业标准弹窗-->
     <el-drawer
@@ -367,6 +378,7 @@ export default {
       cbcdOptions: [],
       BZList: [],
       qcdwOptions: [],
+      LXDList: [],
       qbfsForm: {
         type: "5",
         unit: "", // 单位
@@ -386,7 +398,9 @@ export default {
         drafter: "", // 起草人
         drafterName: "",
         esMatingRelations: "", //配套标准
-        newReason: "" //立项原因
+        newReason: "", //立项原因
+        LXDName: "", //立项单名称
+        LXD: "", //立项单
         // remarks: '', // 备注
       },
       qbfsFormRules: {
@@ -428,6 +442,15 @@ export default {
     }
   },
   watch:{
+    'qbfsForm.esName': {
+      handler: function(val) {
+        if(val && val !== ''){
+          this.qbfsForm.LXDName = val+'-立项单'
+          this.LXDList = []
+          this.LXDList=this.assemble(this.qbfsForm.LXD,val+'-立项单');
+        }
+      }
+    },
     message: {
       immediate: true,
       deep: true,
@@ -449,10 +472,61 @@ export default {
        this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
        this.standSystemOptions = res.data.TXLBBUSS // 体系结构
        this.qcdwOptions = res.data.QCDW // 起草单位
-
      })
+    if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){
+      this.$http.get('/lawss/activiti/saveEditFile', '',{
+        _this: this
+      }, res => {
+        console.log(res)
+        if(res){
+          this.qbfsForm.LXD = res.id
+          this.qbfsForm.LXDName = '立项单'
+          this.LXDList=this.assemble(res.id,'立项单');
+        }
+
+      })
+    }
   },
   methods: {
+    assemble(ids,names){
+      let list= new Array();
+      let idArray=ids.split(',');
+      let nameArray=names.split(',');
+      for(let i=0; i<idArray.length; i++){
+        list.push({id:idArray[i],name:nameArray[i]});
+      }
+
+      return list;
+    },
+    // 文件预览及下载
+    handleFilePreview(file,type) {
+      let id = ""
+      let fileName = ""
+      let fileNam2 = ""
+      if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
+        fileName = this.qbfsForm.esName+'-立项单.docx'
+        fileNam2 = this.qbfsForm.esName+'-立项单'
+      }else {
+        fileName = '立项单.docx'
+        fileNam2 = '立项单'
+      }
+      if(file && file.id){
+        id = file.id
+      }else {
+        id = file.response.data.id
+      }
+      if (type === 'down') {
+        if (id) {
+          window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
+        } else {
+          this.$message.warning('文件不存在,下载失败')
+        }
+      } else if(type === 'preview'){
+        this.$onlineEditPreview(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+      }else {
+        this.$onlineEdit(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+      }
+    },
     //体系结构单选
     handleClick(data,checked, node){
       if(checked){

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -84,19 +84,6 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-input
-                style="display: none;"
-                v-model="qbfsForm.rqbJson">
-              </el-input>
-              <el-input
-                clearable
-                v-model="qbfsForm.rqbName"
-                placeholder="请选择代替企标编号"
-                readonly
-                @click.native="choiceQYBZ">
-              </el-input>
-            </el-form-item>
             <template>
               <custom-input-for-all-standards2
                 class="classDisplay"
@@ -136,18 +123,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
-              <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
-              <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
-                        @click.native="choiceZRRS('1')">
-              </el-input>
-            </el-form-item>
             <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
               <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
               <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
                         @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
               </el-input>
             </el-form-item>
+            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
+              <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
+              <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
+                        @click.native="choiceZRRS('1')">
+              </el-input>
+            </el-form-item>
             <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
               <el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
               <el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
@@ -228,6 +215,19 @@
                     <el-option label="修订" value="修订"></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+                  <el-input
+                    style="display: none;"
+                    v-model="qbfsForm.rqbJson">
+                  </el-input>
+                  <el-input
+                    clearable
+                    v-model="qbfsForm.rqbName"
+                    placeholder="请选择代替企标编号"
+                    readonly
+                    @click.native="choiceQYBZ">
+                  </el-input>
+                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -63,13 +63,6 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-              <el-input
-                disabled
-                v-model="qbfsForm.rqbName"
-                placeholder="请输入代替企标编号"
-                :maxlength="500"/>
-            </el-form-item>
             <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
               <el-input
                 disabled
@@ -93,14 +86,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
-              <el-input
-                readonly
-                v-model="qbfsForm.drafterName"
-                placeholder="请输入起草人"
-                clearable
-              ></el-input>
-            </el-form-item>
             <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
               <div v-if="qbfsForm.unitName">
                 <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
@@ -121,6 +106,14 @@
                 ></el-input>
               </div>
             </el-form-item>
+            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.drafterName"
+                placeholder="请输入起草人"
+                clearable
+              ></el-input>
+            </el-form-item>
             <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -170,12 +163,16 @@
                 placeholder="请输入采用标准"
                 :maxlength="500"/>
             </el-form-item>
-            <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
-              <el-input
-                disabled
-                v-model="qbfsForm.useLevel"
-                placeholder="请输入采标程度"
-                :maxlength="500"/>
+            <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
+                <el-option
+                  v-for="(item, index) in cbcdOptions"
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
               <el-input
@@ -213,6 +210,13 @@
                     <el-option label="修订" value="修订"></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="qbfsForm.rqbName"
+                    placeholder="请输入代替企标编号"
+                    :maxlength="500"/>
+                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"
@@ -350,6 +354,7 @@ export default {
       ListModel: false,
       standinfoList: [],
       BZList: [],
+      cbcdOptions: [],
       standSortOptions: [],
       page: 1,
       total: 0,
@@ -390,6 +395,7 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
       this.BZList = res.data.ENERGYTYPES //标准范围
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })

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

@@ -36,11 +36,11 @@
               <el-option label="未制定" value="未制定"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
@@ -50,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,13 +89,6 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.rqbName"
-              placeholder="请输入代替企标编号"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -153,6 +153,17 @@
               placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
+            <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              <!--              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
+              <!--                        <el-button type="primary" size="mini" plain icon="el-icon-edit"  @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
+              <!--                  </span>-->
+            </div>
+          </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -337,6 +348,7 @@ export default {
   },
   data(){
     return {
+      LXDList: [],
       BZList: [],
       active: '1',
       type: '',
@@ -368,6 +380,32 @@ export default {
     })
   },
   methods:{
+    // 文件预览及下载
+    handleFilePreview(file,type) {
+      let id = ""
+      let fileName = ""
+      if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
+        fileName = this.qbfsForm.esName+'-立项单.docx'
+      }else {
+        fileName = '立项单.docx'
+      }
+      if(file && file.id){
+        id = file.id
+      }else {
+        id = file.response.data.id
+      }
+      if (type === 'down') {
+        if (id) {
+          window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
+        } else {
+          this.$message.warning('文件不存在,下载失败')
+        }
+      } else if(type === 'preview'){
+        this.$onlinePreview(id)
+      }else {
+        this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+      }
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -403,8 +441,19 @@ export default {
       this.$nextTick(() => {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
+        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= new Array();
+      let idArray=ids.split(',');
+      let nameArray=names.split(',');
+      for(let i=0; i<idArray.length; i++){
+        list.push({id:idArray[i],name:nameArray[i]});
+      }
+
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },

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

@@ -36,11 +36,11 @@
               <el-option label="未制定" value="未制定"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
@@ -50,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,13 +89,6 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.rqbName"
-              placeholder="请输入代替企标编号"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -153,6 +153,17 @@
               placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
+            <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+<!--              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
+<!--                        <el-button type="primary" size="mini" plain icon="el-icon-edit"  @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
+<!--                  </span>-->
+            </div>
+          </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -337,6 +348,7 @@ export default {
   },
   data(){
     return {
+      LXDList: [],
       BZList: [],
       standSortOptions: [],
       active: '1',
@@ -369,6 +381,32 @@ export default {
     })
   },
   methods:{
+    // 文件预览及下载
+    handleFilePreview(file,type) {
+      let id = ""
+      let fileName = ""
+      if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
+        fileName = this.qbfsForm.esName+'-立项单.docx'
+      }else {
+        fileName = '立项单.docx'
+      }
+      if(file && file.id){
+        id = file.id
+      }else {
+        id = file.response.data.id
+      }
+      if (type === 'down') {
+        if (id) {
+          window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
+        } else {
+          this.$message.warning('文件不存在,下载失败')
+        }
+      } else if(type === 'preview'){
+        this.$onlinePreview(id)
+      }else {
+        this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+      }
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -405,8 +443,19 @@ export default {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         console.log(item.area.join(','));
         this.type = item.type
+        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= new Array();
+      let idArray=ids.split(',');
+      let nameArray=names.split(',');
+      for(let i=0; i<idArray.length; i++){
+        list.push({id:idArray[i],name:nameArray[i]});
+      }
+
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },

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

@@ -36,11 +36,11 @@
               <el-option label="未制定" value="未制定"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
@@ -50,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,13 +89,6 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.rqbName"
-              placeholder="请输入代替企标编号"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -153,6 +153,17 @@
               placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
+            <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              <!--              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
+              <!--                        <el-button type="primary" size="mini" plain icon="el-icon-edit"  @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
+              <!--                  </span>-->
+            </div>
+          </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -335,6 +346,7 @@ export default {
   },
   data(){
     return {
+      LXDList: [],
       BZList: [],
       active: '1',
       type: '',
@@ -366,6 +378,32 @@ export default {
     })
   },
   methods:{
+    // 文件预览及下载
+    handleFilePreview(file,type) {
+      let id = ""
+      let fileName = ""
+      if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
+        fileName = this.qbfsForm.esName+'-立项单.docx'
+      }else {
+        fileName = '立项单.docx'
+      }
+      if(file && file.id){
+        id = file.id
+      }else {
+        id = file.response.data.id
+      }
+      if (type === 'down') {
+        if (id) {
+          window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
+        } else {
+          this.$message.warning('文件不存在,下载失败')
+        }
+      } else if(type === 'preview'){
+        this.$onlinePreview(id)
+      }else {
+        this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+      }
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -401,8 +439,19 @@ export default {
       this.$nextTick(() => {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
+        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= new Array();
+      let idArray=ids.split(',');
+      let nameArray=names.split(',');
+      for(let i=0; i<idArray.length; i++){
+        list.push({id:idArray[i],name:nameArray[i]});
+      }
+
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },

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

@@ -36,11 +36,11 @@
               <el-option label="未制定" value="未制定"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
@@ -50,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,13 +89,6 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.rqbName"
-              placeholder="请输入代替企标编号"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -153,6 +153,17 @@
               placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
+            <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              <!--              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
+              <!--                        <el-button type="primary" size="mini" plain icon="el-icon-edit"  @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
+              <!--                  </span>-->
+            </div>
+          </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -337,6 +348,7 @@ export default {
   },
   data(){
     return {
+      LXDList: [],
       BZList: [],
       active: '1',
       type: '',
@@ -368,6 +380,32 @@ export default {
     })
   },
   methods:{
+    // 文件预览及下载
+    handleFilePreview(file,type) {
+      let id = ""
+      let fileName = ""
+      if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
+        fileName = this.qbfsForm.esName+'-立项单.docx'
+      }else {
+        fileName = '立项单.docx'
+      }
+      if(file && file.id){
+        id = file.id
+      }else {
+        id = file.response.data.id
+      }
+      if (type === 'down') {
+        if (id) {
+          window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
+        } else {
+          this.$message.warning('文件不存在,下载失败')
+        }
+      } else if(type === 'preview'){
+        this.$onlinePreview(id)
+      }else {
+        this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+      }
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -403,8 +441,19 @@ export default {
       this.$nextTick(() => {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
+        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= new Array();
+      let idArray=ids.split(',');
+      let nameArray=names.split(',');
+      for(let i=0; i<idArray.length; i++){
+        list.push({id:idArray[i],name:nameArray[i]});
+      }
+
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },

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

@@ -36,11 +36,11 @@
               <el-option label="未制定" value="未制定"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
@@ -50,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,13 +89,6 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.rqbName"
-              placeholder="请输入代替企标编号"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -153,6 +153,17 @@
               placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
+            <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              <!--              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
+              <!--                        <el-button type="primary" size="mini" plain icon="el-icon-edit"  @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
+              <!--                  </span>-->
+            </div>
+          </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -337,6 +348,7 @@ export default {
   },
   data(){
     return {
+      LXDList: [],
       BZList: [],
       active: '1',
       type: '',
@@ -368,6 +380,32 @@ export default {
     })
   },
   methods:{
+    // 文件预览及下载
+    handleFilePreview(file,type) {
+      let id = ""
+      let fileName = ""
+      if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
+        fileName = this.qbfsForm.esName+'-立项单.docx'
+      }else {
+        fileName = '立项单.docx'
+      }
+      if(file && file.id){
+        id = file.id
+      }else {
+        id = file.response.data.id
+      }
+      if (type === 'down') {
+        if (id) {
+          window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
+        } else {
+          this.$message.warning('文件不存在,下载失败')
+        }
+      } else if(type === 'preview'){
+        this.$onlinePreview(id)
+      }else {
+        this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+      }
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -403,8 +441,19 @@ export default {
       this.$nextTick(() => {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
+        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= new Array();
+      let idArray=ids.split(',');
+      let nameArray=names.split(',');
+      for(let i=0; i<idArray.length; i++){
+        list.push({id:idArray[i],name:nameArray[i]});
+      }
+
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -402,6 +402,17 @@
                                                     v-model="addForm.esMatingRelations"
                                             ></custom-input-for-all-standards2>
                                         </template>
+                                        <el-form-item label="立项单" prop="LXDName" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                            <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer">
+                                                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                                                <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                                                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                                                  </span>
+                                                <span style="width: 20%;margin-left: 15px;" v-if="item.id !== '' && DrawerType !== 'see'">
+                                                        <el-button type="primary" size="mini" plain icon="el-icon-edit"  @click="handleFilePreview(item,'onlineEdit')"></el-button>
+                                                  </span>
+                                            </div>
+                                        </el-form-item>
                                     </el-form>
                                 </el-col>
                             </el-row>
@@ -597,6 +608,7 @@
         },
         data() {
             return {
+                LXDList: [],
                 CBList: [],
                 BZList: [],
                 TXJGList: [],
@@ -1031,6 +1043,34 @@
                 this.form.pageSize = pageSize
                 this.getData()
             },
+            handleFilePreview(file,type) {
+                let id = ""
+                let fileName = ""
+                let fileNam2 = ""
+                if(this.addForm.esName && this.addForm.esName !== ''){
+                    fileName = this.addForm.esName+'-立项单.docx'
+                    fileNam2 = this.addForm.esName+'-立项单'
+                }else {
+                    fileName = '立项单.docx'
+                    fileNam2 = '立项单'
+                }
+                if(file && file.id){
+                    id = file.id
+                }else {
+                    id = file.response.data.id
+                }
+                if (type === 'down') {
+                    if (id) {
+                        window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
+                    } else {
+                        this.$message.warning('文件不存在,下载失败')
+                    }
+                } else if(type === 'preview'){
+                    this.$onlineEditPreview(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+                }else {
+                    this.$onlineEdit(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+                }
+            },
             handleCommand (command) {
                 switch (command[1]) {
                     case '编辑':
@@ -1064,6 +1104,16 @@
                             drafterName: command[0].drafterName, // 起草人
                             drafter: command[0].drafter,
                             }
+                        this.addForm.LXD = command[0].lxd
+                        let fileName1 = ""
+                        if(this.addForm.esName && this.addForm.esName !== ''){
+                            fileName1 = this.addForm.esName+'-立项单'
+                        }else {
+                            fileName1 = '立项单'
+                        }
+                        this.addForm.LXDName = fileName1
+                        this.LXDList=this.assemble(command[0].lxd,fileName1)
+                        console.log(this.LXDList)
                         if (typeof (this.addForm.area) === 'string') {
                             this.addForm.area = command[0].area.split(',')
                         }
@@ -1096,12 +1146,32 @@
                         this.DrawerType = 'see'
                         this.addDrawer = true
                         this.addForm = command[0]
+                        this.addForm.LXD = command[0].lxd
+                        let fileName = ""
+                        if(this.addForm.esName && this.addForm.esName !== ''){
+                            fileName = this.addForm.esName+'-立项单'
+                        }else {
+                            fileName = '立项单'
+                        }
+                        this.addForm.LXDName = fileName
+                        this.LXDList=this.assemble(command[0].lxd,fileName);
+                        console.log(this.LXDList)
                         if (typeof (this.addForm.area) === 'string') {
                             this.addForm.area = command[0].area.split(',')
                         }
                         break
                 }
             },
+            assemble(ids,names){
+                let list= new Array();
+                let idArray=ids.split(',');
+                let nameArray=names.split(',');
+                for(let i=0; i<idArray.length; i++){
+                    list.push({id:idArray[i],name:nameArray[i]});
+                }
+
+                return list;
+            },
             getData () {
                 this.loading = true
                 this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.form, {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -955,22 +955,22 @@
                             placeholder="请输入标准英文名称"
                             clearable></el-input>
                 </el-form-item>
-                <!--                <el-form-item prop="standNature" label-width="150px" class="add-form-item">-->
-                <!--                  <template slot="label">标准性质</template>-->
-                <!--                  <el-select v-model="sarStandardsInfoEO.standNature"-->
-                <!--                             placeholder="请选择标准性质"-->
-                <!--                             clearable>-->
-                <!--                    <el-option-->
-                <!--                      v-for="item in standNatureOptions"-->
-                <!--                      placeholder="请选择"-->
-                <!--                      :key="item.value"-->
-                <!--                      :value="item.value"-->
-                <!--                      :label="item.label"-->
-                <!--                    >-->
-                <!--                      {{ item.label }}-->
-                <!--                    </el-option>-->
-                <!--                  </el-select>-->
-                <!--                </el-form-item>-->
+                <!--                <el-form-item prop="standNature" label-width="150px" class="add-form-item">
+                                  <template slot="label">标准性质</template>
+                                  <el-select v-model="sarStandardsInfoEO.standNature"
+                                             placeholder="请选择标准性质"
+                                             clearable>
+                                    <el-option
+                                      v-for="item in standNatureOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                    >
+                                      {{ item.label }}
+                                    </el-option>
+                                  </el-select>
+                                </el-form-item>-->
                 <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                               prop="standState" label-width="150px" class="add-form-item">
                   <template slot="label">文本状态</template>
@@ -988,10 +988,7 @@
                   </el-select>
                 </el-form-item>
                 <custom-date-pick
-                  :config="{
-                attrName: '发布日期',
-                attrField: 'issueTime'
-              }"
+                  :config="{ attrName: '发布日期',attrField: 'issueTime'}"
                   v-model="sarStandardsInfoEO.issueTime"
                   :disabled="formdisableflag"
                 ></custom-date-pick>
@@ -1002,7 +999,7 @@
                   class="add-form-item"
                 >
                   <template slot="label">是否纳入认证清单</template>
-                  <el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">
+                  <el-select v-model="sarStandardsInfoEO.isRelateAccess" clearable @change="isRegulationsChange">
                     <el-option value="1" label="是" key="1"></el-option>
                     <el-option value="2" label="否" key="2"></el-option>
                   </el-select>
@@ -1072,6 +1069,7 @@
                     >
                       <template slot="label">关联模块--乘用车VPPS编码</template>
                       <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
+                                clearable
                                 @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
                     </el-form-item>
                   </template>
@@ -1082,7 +1080,7 @@
                       class="add-form-item"
                     >
                       <template slot="label">关联模块--卡车VPPS编码</template>
-                      <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
+                      <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" clearable @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'DYBXH'">
@@ -1092,13 +1090,14 @@
                       class="add-form-item"
                     >
                       <template slot="label">模块结构单元变型号</template>
-                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
+                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'CYCVPPSCN'">
                     <el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="CYCVPPSCN" class="add-form-item">
                       <el-input
-                        v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
+                        v-model="sarStandardsInfoEO.CYCVPPSCN"
+                        disabled
                         clearable
                       ></el-input>
                     </el-form-item>
@@ -1106,7 +1105,8 @@
                   <template v-else-if="field.attrField === 'KCCVPPSCN'">
                     <el-form-item label="关联模块--卡车vpps中文名称" label-width="150px" prop="KCCVPPSCN" class="add-form-item">
                       <el-input
-                        v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
+                        v-model="sarStandardsInfoEO.KCCVPPSCN"
+                        disabled
                         clearable
                       ></el-input>
                     </el-form-item>
@@ -1114,7 +1114,8 @@
                   <template v-else-if="field.attrField === 'DYMC'">
                     <el-form-item label="模块结构单元名称" label-width="150px" prop="DYMC" class="add-form-item">
                       <el-input
-                        v-model="sarStandardsInfoEO.DYMC" disabled
+                        v-model="sarStandardsInfoEO.DYMC"
+                        disabled
                         clearable
                       ></el-input>
                     </el-form-item>
@@ -1819,6 +1820,7 @@ export default {
       urlChild: '',
       drawerTitle: '', //drawer标题
       nodeKey: 'id',
+      defaultCheckedKeys: [],
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
@@ -2298,11 +2300,11 @@ export default {
         synopsis: [
           {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
         ],
-       /* standEnName: [
-          {required: true, message: '英文名称不能为空', trigger: 'change'},
-          // {validator: this.verify.valiateEnName, trigger: 'blur'},
-          {type: 'string', max: 500, message: '英文名称不能超过500个字符不', trigger: 'change'}
-        ],*/
+        /* standEnName: [
+           {required: true, message: '英文名称不能为空', trigger: 'change'},
+           // {validator: this.verify.valiateEnName, trigger: 'blur'},
+           {type: 'string', max: 500, message: '英文名称不能超过500个字符不', trigger: 'change'}
+         ],*/
         standName: [
           {required: false, message: '中文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
@@ -2490,6 +2492,27 @@ export default {
         }
       }
     },
+    'sarStandardsInfoEO.CYCVPPSBM': {
+      handler() {
+        if (this.sarStandardsInfoEO.CYCVPPSBM === '') {
+          this.sarStandardsInfoEO.CYCVPPSCN = ''
+        }
+      }
+    },
+    'sarStandardsInfoEO.KCCVPPSBM': {
+      handler() {
+        if (this.sarStandardsInfoEO.KCCVPPSBM === '') {
+          this.sarStandardsInfoEO.KCCVPPSCN = ''
+        }
+      }
+    },
+    'sarStandardsInfoEO.DYBXH': {
+      handler() {
+        if (this.sarStandardsInfoEO.DYBXH === '') {
+          this.sarStandardsInfoEO.DYMC = ''
+        }
+      }
+    },
     filterText(val) {
       this.$refs.tree.filter(val);
     }
@@ -3842,7 +3865,7 @@ export default {
             type: 'between',
             value: value.join(',')
           });
-        }else if (value !== null && value !== '' && (key === 'BARQ')){
+        } else if (value !== null && value !== '' && (key === 'BARQ')) {
           advanceSearchVOList.push({
             connect: "and",
             field: key || '',