Merge remote-tracking branch 'origin/develop' into develop

src/components/CustomFormComponents/InputForStandardsForForeign.vue

@@ -335,6 +335,8 @@ export default {
     },
     // 点击查看
     handlePreview (item) {
+      console.log(item)
+      if (item.standType !== 'FOREIGN') {
         let routeUrl = this.$router.resolve({
           name: 'OtherBussStandardDetails',
           params: {
@@ -343,6 +345,17 @@ export default {
           }
         })
         window.open(routeUrl.href, '_blank')
+      }else {
+
+        let routeUrl = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.id,
+            pageType: 'FOREIGN_STAND'
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      }
     },
     getResetLawsNumRow() {
       this.replacePage = 1

src/pages/details/otherStandardDetails/index.vue

@@ -848,12 +848,15 @@
 <!--              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
 <!--                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
 <!--              </div>-->
-              <el-tooltip placement="top">
-                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>
                 <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
                   {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
                 </div>
-              </el-tooltip>
+<!--              <el-tooltip placement="top">-->
+<!--                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>-->
+<!--                <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
+<!--                  {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
+<!--                </div>-->
+<!--              </el-tooltip>-->
             </template>
           </el-table-column>
           <el-table-column
@@ -960,7 +963,7 @@
       size="800px"
       :wrapperClosable="false"
     >
-      <el-form :model="resolveListForm" ref="resolveListForm">
+      <el-form :model="resolveListForm"  :rules="resolveListFormRules"  ref="resolveListForm" style="padding-left: 10px;">
         <el-input
           v-show="false"
           v-model="resolveListForm.id"
@@ -1792,6 +1795,11 @@ export default {
         name: '',
         public: false
       },
+      resolveListFormRules:{
+        applyArcticyRule: [
+          {required: true, message: '适用车型不能为空', trigger: 'blur'},
+        ]
+      },
       listVOFormRules: {
         name: [
           {required: true, message: '名称不能为空', trigger: 'blur'},
@@ -1825,6 +1833,7 @@ export default {
           {required: true, message: '标题不能为空', trigger: 'blur'},
           {type: 'string', max: 200, message: '标题不能超过200个字符', trigger: 'change'}
         ],
+
         content: [
           {required: true, message: '内容不能为空', trigger: 'blur'},
           {type: 'string', max: 200, message: '内容不能超过200个字符', trigger: 'change'}
@@ -1951,6 +1960,7 @@ export default {
       },
       applyArcticOptions: {
         attrName: '适用车型',
+        attrField: 'applyArcticyRule',
         options: []
       },  // 适用车辆类型下拉框
       modalshowflagZRBM: false,

src/pages/details/otherStandardExternalDetails/index.vue

@@ -987,7 +987,7 @@
       size="800px"
       :wrapperClosable="false"
     >
-      <el-form :model="resolveListForm" ref="resolveListForm">
+      <el-form :model="resolveListForm" :rules="resolveListFormRules" ref="resolveListForm">
         <el-input
           v-show="false"
           v-model="resolveListForm.id"
@@ -1816,6 +1816,11 @@ export default {
         name: '',
         public: false
       },
+      resolveListFormRules:{
+        applyArcticyRule: [
+          {required: true, message: '适用车型不能为空', trigger: 'blur'},
+        ]
+      },
       listVOFormRules: {
         name: [
           {required: true, message: '名称不能为空', trigger: 'blur'},
@@ -1975,6 +1980,7 @@ export default {
       },
       applyArcticOptions: {
         attrName: '适用车型',
+        attrField: 'applyArcticyRule',
         options: []
       },  // 适用车辆类型下拉框
       modalshowflagZRBM: false,

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -86,10 +86,11 @@
               :resizable="false"
               align="center">
               <template slot-scope="scope">
-                <el-tooltip placement="top">
-                  <div slot="content">{{scope.row.itermsConditions}}</div>
                 <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
-                </el-tooltip>
+<!--                <el-tooltip placement="top">-->
+<!--                  <div slot="content">{{scope.row.itermsConditions}}</div>-->
+<!--                  <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>-->
+<!--                </el-tooltip>-->
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" :resizable="false" fixed="right">

src/pages/localTool/standardRecognition/index.vue

@@ -311,7 +311,7 @@
                 width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" class="table-jump" style="color: #F56C6C"
+                <a v-if="scope.row.standYear && scope.row.standTextStatusShow === '废止'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -331,7 +331,7 @@
                 min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standTextStatusShow === '废止'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -341,7 +341,7 @@
                 width="120"
                 label="发布日期">
               <template slot-scope="scope">
-                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
                 <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
@@ -352,7 +352,7 @@
                 label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
+                <span v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
 
               </template>
@@ -364,7 +364,7 @@
                 width="150"
                 label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
@@ -374,7 +374,7 @@
                 width="150"
                 label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
@@ -389,7 +389,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">{{
                     scope.row.standTextStatusShow
                   }}</span>
                 <span v-else>{{ scope.row.standTextStatusShow }}</span>
@@ -402,7 +402,7 @@
                 width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && scope.row.standTextStatusShow === '废止'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear && scope.row.standTextStatusShow === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -424,7 +424,7 @@
                 min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
                 <a v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -441,7 +441,7 @@
                 width="120"
                 label="发布日期">
               <template slot-scope="scope">
-                <div v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">
+                <div v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">
@@ -459,7 +459,7 @@
                 label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">{{
                     scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
                   }}</span>
                 <span v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">{{
@@ -475,7 +475,7 @@
                 width="150"
                 label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">{{
                     scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
                   }}</span>
                 <span v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">{{
@@ -492,7 +492,7 @@
                 width="150"
                 label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">{{
                     scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
                   }}</span>
                 <span v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">{{
@@ -514,7 +514,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止'" style="color: #F56C6C">{{
                     scope.row.standTextStatusShow
                   }}</span>
                 <span v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">{{

src/pages/personal/pages/my-collection/components/CollectionStandard.vue

@@ -18,15 +18,16 @@
                 type="primary"
                 class="common-button-primary"
                 size="mini"
-                v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"
                 @click="selectStandardBtn">
                 查询
               </el-button>
+              <!--                v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"-->
               <el-button
                 class="common-button-default"
                 size="mini"
-                v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"
                 @click="resetSelect">清空</el-button>
+<!--              v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"-->
+
 <!--              <el-button-->
 <!--                      class="common-button-default"-->
 <!--                      size="mini"-->
@@ -63,7 +64,8 @@
                 <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
+<!--                v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'"-->
+                <el-button size="mini"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
               </el-col>
             </el-row>
           </div>

src/pages/personal/pages/my-questions/index.vue

@@ -938,7 +938,7 @@
             width="150"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" class="table-jump" style="color: #F56C6C"
                  @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                   scope.row.standNumber
                 }}-{{ scope.row.standYear }}</a>
@@ -958,7 +958,7 @@
             min-width="300"
           >
             <template slot-scope="scope">
-              <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+              <a v-if="textStatusMap[scope.row.textStatus] === '废止' " @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
               <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
@@ -967,7 +967,7 @@
             width="120"
             label="发布日期">
             <template slot-scope="scope">
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
               <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
             </template>
           </el-table-column>
@@ -977,7 +977,7 @@
             label="实施日期">
             <template slot-scope="scope">
               <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
               <span v-else>{{ scope.row.ssrq }}</span>
 
             </template>
@@ -988,7 +988,7 @@
             width="150"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
               <span v-else>{{ scope.row.xcxssrq }}</span>
             </template>
           </el-table-column>
@@ -997,7 +997,7 @@
             width="150"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
               <span v-else>{{ scope.row.zccssrq }}</span>
             </template>
           </el-table-column>
@@ -1006,7 +1006,7 @@
             width="110"
             label="文本状态">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
               <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -1019,7 +1019,7 @@
             width="150"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                   scope.row.standSortShow
                 }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
               <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -1041,7 +1041,7 @@
             min-width="300"
           >
             <template slot-scope="scope">
-              <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+              <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                   scope.row.standName
                 }}</a>
               <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -1057,7 +1057,7 @@
             width="120"
             label="发布日期">
             <template slot-scope="scope">
-              <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+              <div v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">
                 {{ formatIssueDate(scope.row.issueTime) }}
               </div>
               <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
@@ -1074,7 +1074,7 @@
             label="实施日期">
             <template slot-scope="scope">
               <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                   scope.row.ssrq
                 }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -1089,7 +1089,7 @@
             width="150"
             label="新车型实施日期">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.xcxssrq
                   }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -1105,7 +1105,7 @@
             width="150"
             label="在产车实施日期">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.zccssrq
                   }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -1121,7 +1121,7 @@
             width="110"
             label="文本状态">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{

src/pages/phone/domesticDetails.vue

@@ -5,7 +5,7 @@
     <div class="details-header">
       <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
           sarStandardsInfoEO.standNumber
-        }} 《{{ sarStandardsInfoEO.standName }}》</span>
+        }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》</span>
       <span v-else>{{ sarStandardsInfoEO.standSortShow || '' }} {{
           sarStandardsInfoEO.standNumber
         }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》</span>
@@ -31,30 +31,52 @@
                 <div class="details-content-modular basic-information" style="border-top:none; border-bottom: none;">
                   <div class="basic-information-content">
                     <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
-                    <p class="">
+                    <el-row :gutter="5" class="">
-                      <label style=" margin-right: 164px;">标准号</label>
+                      <el-col :span="8">
+                        <label>标准号</label>
+                      </el-col>
+                      <el-col :span="16">
                         <span v-if="sarStandardsInfoEO.standYear">{{
                             sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
                           }}</span>
                         <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
-                    </p>
+                      </el-col>
+                    </el-row>
                     <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
-                    <p><label style=" margin-right: 150px;">中文名称</label><span>{{
+                    <el-row :gutter="5" class="">
+                      <el-col :span="8">
+                        <label>中文名称</label>
+                      </el-col>
+                      <el-col :span="16">
+                        <span>{{
                             sarStandardsInfoEO.standName || '-'
-                      }}</span></p>
+                          }}</span>
-                    <p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{
+                      </el-col>
+                    </el-row>
+                    <el-row v-if="activeState" :gutter="5">
+                      <el-col :span="8">
+                        <label>英文名称</label>
+                      </el-col>
+                      <el-col :span="16">
+                        <span>{{
                             sarStandardsInfoEO.standEnName || '-'
-                      }}</span></p>
+                          }}</span>
+                      </el-col>
+                    </el-row>
                     <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
-                      <p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
+                      <el-row :gutter="5" class="files-titles" style="border-bottom: 1px solid #E5E5E5">
+                        <el-col :span="8">
                           <label style="float: left">{{ child.attrName }}</label>
+                        </el-col>
+                        <el-col :span="16">
                           <template v-if="child.value && child.value.length > 0">
                             <!--                          单个文件时-->
-                          <div style="position: relative;margin-left: 19em; line-height: 32px">
+                            <div style=" line-height: 32px">
                               <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
-                            <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
+                                <span v-if="child.value && child.value.length > 0 && child.value.length === 1"
-                              <a style="font-size:0.2rem;color: #409EFF;cursor: pointer;display: inline-block"
+                                  style="display: flex; align-items: center;">
+                                  <a style="font-size:0.2rem;color: #409EFF;cursor: pointer;display: inline-block;"
                                   @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                   :title="file.oldFileName">{{ file.oldFileName | ellipsis50 }}</a>
                               <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
@@ -62,7 +84,7 @@
                                 <!--                          多个文件时-->
                                 <div v-else-if="child.value && child.value.length > 0">
                                   <span style="display: flex; align-items: center;">
-                                <a style="ffont-size:0.2rem;color: #409EFF;cursor: pointer"
+                                    <a style="font-size:0.2rem;color: #409EFF;cursor: pointer"
                                     @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                     :title="file.oldFileName">{{ file.oldFileName | ellipsis50 }}</a>
                                   </span>
@@ -71,18 +93,22 @@
                               </div>
                             </div>
                           </template>
-                      </p>
+                        </el-col>
+                      </el-row>
                     </template>
                     <template v-else-if="child.value === null">-</template>
                     <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child6" v-if="child.value && child.value.length > 0">
-                      <p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
+                      <el-row :gutter="5" class="files-titles" style="border-bottom: 1px solid #E5E5E5">
+                        <el-col :span="8">
                           <label style="float: left">{{ child.attrName }}</label>
+                        </el-col>
+                        <el-col :span="16">
                           <template v-if="child.value && child.value.length > 0" >
-                          <div style="position: relative;margin-left: 214px; line-height: 32px">
+                            <div style="line-height: 32px">
                               <div v-for="(file, fileIndex) in child6Func(child.value)" style="display: flex;">
                               <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
-                                <a style="font-size: 16px;color: #409EFF;cursor: pointer;display: inline-block"
+                                <a style="font-size: 0.2rem;color: #409EFF;cursor: pointer;display: inline-block"
                                    @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                    :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                               </span>
@@ -94,18 +120,22 @@
                                 </span>
                                 </div>
                               </div>
-                            <el-button v-if="child.attrField === 'FBGYWBD'" @click="showItemsModel(child.attrField)" class="decomposition-btn">标准分解单
+<!--                              <el-button v-if="child.attrField === 'FBGYWBD'" @click="showItemsModel(child.attrField)" class="decomposition-btn">标准分解单-->
-                            </el-button>
+<!--                              </el-button>-->
                             </div>
                           </template>
                           <template v-else-if="child.value === null">-</template>
-                      </p>
+                        </el-col>
+                      </el-row>
                     </template>
                     <template v-else-if="child.value === null">-</template>
                     <!--修订本-->
                     <template v-for="(child, childIndex) in item.child5">
-                      <p class="files-title">
+                      <el-row :gutter="5" class="files-title">
-                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <el-col :span="8">
+                          <label>{{ child.attrName }}</label>
+                        </el-col>
+                        <el-col :span="16">
                           <template v-if="child.value && child.value.length > 0"
                                     v-for="(file, fileIndex) in child5Func(child.value)">
                               <span>
@@ -114,19 +144,23 @@
                                    :title="file.oldFileName">{{ file.oldFileName }}</a>
                                 <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                                 </span>
-                          <el-button v-if="child.value && child.value.length > 1"
+<!--                            <el-button v-if="child.value && child.value.length > 1"-->
-                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+<!--                                       style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
-                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+<!--                                       class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
-                            更多
+<!--                              更多-->
-                          </el-button>
+<!--                            </el-button>-->
                           </template>
                           <template v-if="child.value === null">-</template>
-                      </p>
+                        </el-col>
+                      </el-row>
                     </template>
                     <!--勘误件-->
                     <template v-for="(child, childIndex) in item.child4">
-                      <p class="files-title">
+                      <el-row :gutter="5" class="files-title">
-                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <el-col :span="8">
+                          <label>{{ child.attrName }}</label>
+                        </el-col>
+                        <el-col :span="16">
                           <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child4Func(child.value)">
                           <span>
                             <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@@ -134,19 +168,23 @@
                                :title="file.oldFileName">{{ file.oldFileName }}</a>
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
-                          <el-button v-if="child.value && child.value.length > 1"
+<!--                            <el-button v-if="child.value && child.value.length > 1"-->
-                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+<!--                                       style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
-                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+<!--                                       class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
-                            更多
+<!--                              更多-->
-                          </el-button>
+<!--                            </el-button>-->
                           </template>
                           <template v-if="child.value === null">-</template>
-                      </p>
+                        </el-col>
+                      </el-row>
                     </template>
                     <!--增补件（必读）-->
                     <template v-for="(child, childIndex) in item.child3">
-                      <p class="files-title">
+                      <el-row :gutter="5" class="files-title">
-                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <el-col :span="8">
+                          <label>{{ child.attrName }}</label>
+                        </el-col>
+                        <el-col :span="16">
                           <template v-if="child.value && child.value.length > 0"
                                     v-for="(file, fileIndex) in child3Func(child.value)">
                           <span>
@@ -155,40 +193,61 @@
                              :title="file.oldFileName">{{ file.oldFileName }}</a>
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
-                          <el-button v-if="child.value && child.value.length > 1"
+<!--                            <el-button v-if="child.value && child.value.length > 1"-->
-                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+<!--                                       style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
-                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+<!--                                       class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
-                            更多
+<!--                              更多-->
-                          </el-button>
+<!--                            </el-button>-->
                           </template>
                           <template v-if="child.value === null">-</template>
-                      </p>
+                        </el-col>
+                      </el-row>
                     </template>
-                    <p class="half">
+                    <el-row :gutter="5" class="half">
-                      <label style=" margin-right: 150px;" title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。">文本状态</label>
+                      <el-col :span="8">
+                        <label title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。">文本状态</label>
+                      </el-col>
+                      <el-col :span="16">
                         <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
-                    </p>
+                      </el-col>
-                    <p class="half">
+                    </el-row>
-                      <label style=" margin-right: 150px;">发布日期</label>
+                    <el-row :gutter="5" class="half">
+                      <el-col :span="8">
+                        <label>发布日期</label>
+                      </el-col>
+                      <el-col :span="16">
                         <span>{{ sarStandardsInfoEO.issueTime || '-' }}</span>
-                    </p>
+                      </el-col>
-                    <p class="half">
+                    </el-row>
-                      <label style=" margin-right: 150px;">标准体系</label>
+                    <el-row :gutter="5" class="half">
+                      <el-col :span="8">
+                        <label>标准体系</label>
+                      </el-col>
+                      <el-col :span="16">
                         <span>
                         {{ sarStandardsInfoEO.standSystem || '-' }}
                         </span>
-                    </p>
+                      </el-col>
-                    <p class="half">
+                    </el-row>
-                      <label style=" margin-right: 11em;">是否纳入认证清单</label>
+                    <el-row :gutter="5" class="half">
+                      <el-col :span="8">
+                        <label>是否纳入认证清单</label>
+                      </el-col>
+                      <el-col :span="16">
                         <span>
                         {{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}
                         </span>
-                    </p>
+                      </el-col>
+                    </el-row>
                     <template v-for="(child, childIndex) in item.child2">
-                      <p class="half">
+                      <el-row :gutter="5" class="half">
-                        <label style=" margin-right: 150px;">{{ child.attrName }}</label>
+                        <el-col :span="8">
+                          <label>{{ child.attrName }}</label>
+                        </el-col>
+                        <el-col :span="16">
                           <span>{{ child.value || '-' }}</span>
-                      </p>
+                        </el-col>
+                      </el-row>
                     </template>
                   </div>
                 </div>
@@ -201,8 +260,11 @@
               </div>
               <template v-for="(child, childIndex) in item.half" v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'">
                 <!--     modular-item half       代替标准编号-->
-                <div :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'" v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' ">
+                <el-row :gutter="5" :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'" v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' ">
+                  <el-col :span="8">
                     <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                  </el-col>
+                  <el-col :span="16"></el-col>
                   <span class="modular-content-p-val" :title="child.value || '-'">
                     <div v-if="child.value != null && child.value !== '' && child.value.split(',').length > 0">
         <!--相关流程-->
@@ -237,7 +299,7 @@
                       {{ '-' }}
                     </div>
                   </span>
-                </div>
+                </el-row>
                 <!--            其他项-->
                 <div v-else :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'">
                   <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
@@ -327,12 +389,15 @@
               </template>
               <template v-for="(child, childIndex) in item.one" v-if="child.isShowImp === '0' && item.label == '过程稿件'">
                 <!--                增补件（必读）和勘误件不放在过程稿件里了-->
-                <div
+                <el-row :gutter="5"
                   v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ' && child.attrField !== 'FBGYWBD' "
                   :key="child.id"
                   :class="'modular-item half'"
                 >
+                  <el-col :span="8">
                     <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                  </el-col>
+                  <el-col :span="16">
                     <span
                         v-if="child.attrType !== 'FILE'"
                         class="modular-content-p-val"
@@ -352,17 +417,18 @@
                   || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
                   || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
                           <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-                          file.oldFileName | ellipsis
+                              file.oldFileName
                             }}</a>
                         </template>
                         <template v-else>
                           <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-                          file.oldFileName | ellipsis
+                              file.oldFileName
                             }}</a>
                         </template>
                       </p>
                     </div>
-                </div>
+                  </el-col>
+                </el-row>
               </template>
               <template
                 v-for="(child, childIndex) in item.one"
@@ -3471,8 +3537,8 @@
     a {
       overflow: hidden;
       text-overflow: ellipsis;
-      width: calc(~'100% - 40px');
+      //width: calc(~'100% - 40px');
-      white-space: nowrap;
+      //white-space: nowrap;
       display: block;
     }
   }
@@ -3481,7 +3547,6 @@
       overflow: hidden;
       text-overflow: ellipsis;
       max-width: 780px;
-      white-space: nowrap;
       display: block;
     }
   }
@@ -3867,10 +3932,10 @@
               line-height: 32px;
               //position: relative;
               display: inline-block;
-              width: calc(~'100% - 225px');
+              //width: calc(~'100% - 225px');
 
               & > .files-title {
-                width: calc(~'100% - 120px');
+                //width: calc(~'100% - 120px');
                 //报批稿撑开
                 //min-height: 50px;
                 //line-height: 50px;
@@ -4051,4 +4116,5 @@
   ::v-deep .el-drawer {
     outline: none !important;
   }
+
 </style>

src/pages/phone/domesticStand.vue

@@ -40,11 +40,11 @@
 <!--         </span>-->
 <!--         </div>-->
          <div class="standSubTime" v-if="titleType === 'POLICY'">标准状态:
-           <span v-if="lawsMap[item.lawsTextState] === '作废' || lawsMap[item.lawsTextState] === '被代替'"
+           <span v-if="lawsMap[item.lawsTextState] === '作废'"
                  style="color: #F56C6C; padding-left: 5px;">
                       {{ lawsMap[item.lawsTextState] }}
          </span>
-           <span v-else-if="lawsMap[item.lawsTextState] === '参考' || lawsMap[item.lawsTextState] === '现行有效'"
+           <span v-else-if="lawsMap[item.lawsTextState] === '参考' || lawsMap[item.lawsTextState] === '被代替' || lawsMap[item.lawsTextState] === '现行有效'"
                  style="color: #35720B; padding-left: 5px;">
                       {{ lawsMap[item.lawsTextState] }}
          </span>
@@ -53,11 +53,11 @@
          </span>
          </div>
          <div class="standSubTime" v-else >标准状态:
-           <span v-if="textStatusMap[item.textStatus] === '废止' || textStatusMap[item.textStatus] === '被代替'"
+           <span v-if="textStatusMap[item.textStatus] === '废止'"
                  style="color: #F56C6C; padding-left: 5px;">
                       {{ textStatusMap[item.textStatus] }}
          </span>
-           <span v-else-if="textStatusMap[item.textStatus] === '参考'"
+           <span v-else-if="textStatusMap[item.textStatus] === '参考' || textStatusMap[item.textStatus] === '被代替'"
                  style="color: #35720B; padding-left: 5px;">
                       {{ textStatusMap[item.textStatus] }}
          </span>

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

@@ -1108,9 +1108,9 @@ export default {
     OkDrawer() {
       if (this.selectedList.length === 1) {
         if(this.selectedList[0].standYear){
-          this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber + "-" + this.selectedList[0].standYear;
+          this.listForm.standNumber = this.selectedList[0].standSortShow + " " + this.selectedList[0].standNumber + "-" + this.selectedList[0].standYear;
         }else{
-          this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber ;
+          this.listForm.standNumber = this.selectedList[0].standSortShow + " " + this.selectedList[0].standNumber ;
         }
         this.listForm.standName = this.selectedList[0].standName;
         this.listForm.standType = this.selectedList[0].standType;

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

@@ -235,7 +235,8 @@
             <el-input
               v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
                     || dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
-                    || dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null"
+                    || dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null
+                || dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
               disabled
               v-model="dataList[scope.$index].complianceReasons"
               placeholder="请输入合规原因"
@@ -263,7 +264,8 @@
             label="不合规项目">
             <template slot-scope="scope">
               <el-input
-                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0
+                || dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
                 disabled
                 v-model="dataList[scope.$index].noCompliance"
                 placeholder="请输入不合规项"
@@ -285,7 +287,8 @@
             label="应对措施">
             <template slot-scope="scope">
               <el-input
-                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0
+                || dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
                 disabled
                 v-model="dataList[scope.$index].countermeasures"
                 placeholder="请输入应对措施"
@@ -307,7 +310,8 @@
             label="完成时间">
             <template slot-scope="scope">
               <el-date-picker
-                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0
+                || dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
                 disabled
                 v-model="dataList[scope.$index].completionTime"
                 type="date"
@@ -326,6 +330,32 @@
             </template>
           </el-table-column>
         </el-table-column>
+        <el-table-column
+                prop="researchCompliance"
+                align="center"
+                width="160"
+                label="不涉及理由">
+          <template slot-scope="scope">
+            <el-input
+                    v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
+                    || dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
+                    || dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null
+                    || dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
+                    disabled
+                    v-model="dataList[scope.$index].noInvolve"
+                    placeholder="请输入不涉及理由"
+            >
+            </el-input>
+            <el-input
+                    v-else
+                    :disabled="acceptShow"
+                    clearable
+                    v-model="dataList[scope.$index].noInvolve"
+                    placeholder="请输入不涉及理由"
+            >
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
@@ -456,7 +486,8 @@
             <el-input
               v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
                     || batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
-                    || batchEditForm.completionTime && batchEditForm.completionTime !== null"
+                    || batchEditForm.completionTime && batchEditForm.completionTime !== null
+                    || batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
               disabled
               v-model="batchEditForm.complianceReasons"
               placeholder="请输入合规原因"
@@ -472,7 +503,8 @@
           </el-formItem>
           <el-form-item label="不合规项目" class="add-form-item">
             <el-input
-              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
+              || batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
               disabled
               v-model="batchEditForm.noCompliance"
               placeholder="请输入不合规项"
@@ -488,7 +520,8 @@
           </el-form-item>
           <el-form-item label="不合规应对措施" class="add-form-item">
             <el-input
-              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
+              || batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
               disabled
               v-model="batchEditForm.countermeasures"
               placeholder="请输入不合规应对措施"
@@ -504,7 +537,8 @@
           </el-form-item>
           <el-form-item label="完成时间" class="add-form-item">
             <el-date-picker
-              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
+              || batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
               disabled
               v-model="batchEditForm.completionTime"
               type="date"
@@ -521,6 +555,25 @@
               placeholder="请选择日期">
             </el-date-picker>
           </el-form-item>
+          <el-formItem label="不涉及理由" class="add-form-item">
+            <el-input
+                    v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
+                    || batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
+                    || batchEditForm.completionTime && batchEditForm.completionTime !== null
+                    || batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+                    disabled
+                    v-model="batchEditForm.noInvolve"
+                    placeholder="请输入不涉及理由"
+            >
+            </el-input>
+            <el-input
+                    v-else
+                    :disabled="acceptShow"
+                    v-model="batchEditForm.noInvolve"
+                    placeholder="请输入不涉及理由"
+            >
+            </el-input>
+          </el-formItem>
           <br>
         </el-form>
       </div>
@@ -573,6 +626,8 @@ export default {
         noCompliance: "",
         // 应对措施
         countermeasures: "",
+        // 不涉及理由
+        noInvolve: "",
         // 完成时间
         completionTime: "",
       },
@@ -620,6 +675,8 @@ export default {
           complianceReasons: "", //在研合规原因
           noCompliance: "", //在研不合规项目
           countermeasures: "", //在研应对措施
+          // 不涉及理由
+          noInvolve: "",
           completionTime: "", //在研完成时间
         }]
       },
@@ -818,6 +875,9 @@ export default {
         if(item.complianceReasons){
           this.comFlag = 0;
           return
+        }else if (item.noInvolve){
+          this.comFlag = 0;
+          return
         }else{
           for (let i = 0; i < this.dataList.length; i++) {
             if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
@@ -834,7 +894,7 @@ export default {
     handleSubmit() {
       let submitFlag = 0;
       this.dataList.forEach(item => {
-        if(item.complianceReasons || item.noCompliance){
+        if(item.complianceReasons || item.noCompliance || item.noInvolve){
           submitFlag = 1
         }
         return
@@ -905,6 +965,8 @@ export default {
             item.countermeasures = this.batchEditForm.countermeasures;
             //完成时间
             item.completionTime = this.batchEditForm.completionTime;
+            //不涉及理由
+            item.noInvolve = this.batchEditForm.noInvolve;
           }
         });
       });

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

@@ -251,6 +251,12 @@
             </template>
           </el-table-column>
         </el-table-column>
+        <el-table-column
+            prop="noInvolve"
+            align="center"
+            width="160"
+            label="不涉及理由">
+        </el-table-column>
         <el-table-column
           prop="implementer"
           align="center"
@@ -445,6 +451,7 @@ export default {
           distributePersonId: "",
           complianceReasons: "", //在研合规原因
           noCompliance: "", //在研不合规项目
+          noInvolve: "", //不涉及理由
           countermeasures: "", //在研应对措施
           completionTime: "", //在研完成时间
           zcComplianceReasons: "", //在产的合规原因

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

@@ -260,6 +260,12 @@
             </template>
           </el-table-column>
         </el-table-column>
+        <el-table-column
+          prop="noInvolve"
+          align="center"
+          width="160"
+          label="不涉及理由">
+        </el-table-column>
         <el-table-column
           prop="implementer"
           align="center"
@@ -456,6 +462,7 @@ export default {
           noCompliance: "", //在研不合规项目
           countermeasures: "", //在研应对措施
           completionTime: "", //在研完成时间
+          noInvolve: "", //不涉及理由
           zcComplianceReasons: "", //在产的合规原因
           zcNoCompliance: "", //在产不合规项目
           zcCountermeasures: "", //在产的应对措施

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

@@ -260,6 +260,12 @@
             </template>
           </el-table-column>
         </el-table-column>
+        <el-table-column
+          prop="noInvolve"
+          align="center"
+          width="160"
+          label="不涉及理由">
+        </el-table-column>
         <el-table-column
           prop="implementer"
           align="center"
@@ -456,6 +462,7 @@ export default {
           noCompliance: "", //在研不合规项目
           countermeasures: "", //在研应对措施
           completionTime: "", //在研完成时间
+          noInvolve: "", //不涉及理由
           zcComplianceReasons: "", //在产的合规原因
           zcNoCompliance: "", //在产不合规项目
           zcCountermeasures: "", //在产的应对措施

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

@@ -670,40 +670,40 @@
                     :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
                     :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">-->
-                  <el-input :disabled="disabledXX"  v-model="form.dybxh" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
+<!--                  <el-input :disabled="disabledXX"  v-model="form.dybxh" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>-->
-                  <tree-select-module v-if="!disabledXX"
+<!--                  <tree-select-module v-if="!disabledXX"-->
-                    width="800"
+<!--                    width="800"-->
-                    :key="key3"
+<!--                    :key="key3"-->
-                    :lazy=true
+<!--                    :lazy=true-->
-                    :multiple=true
+<!--                    :multiple=true-->
-                    :check-strictly=true
+<!--                    :check-strictly=true-->
-                    :modalShowFlag="modalShowFlag4"
+<!--                    :modalShowFlag="modalShowFlag4"-->
-                    :drawerTitle="drawerTitle"
+<!--                    :drawerTitle="drawerTitle"-->
-                    :url="url"
+<!--                    :url="url"-->
-                    :type="'TRUCK'"
+<!--                    :type="'TRUCK'"-->
-                    :show-checkBox="showCheckBox"
+<!--                    :show-checkBox="showCheckBox"-->
-                    :urlChild="urlChild"
+<!--                    :urlChild="urlChild"-->
-                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+<!--                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"-->
-                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
+<!--                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">-->
-                  <el-input :disabled="disabledXX"  v-model="form.dybxhcar" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR5('dybxhcar', '模块结构单元', form.dybxhcar)"></el-input>
+<!--                  <el-input :disabled="disabledXX"  v-model="form.dybxhcar" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR5('dybxhcar', '模块结构单元', form.dybxhcar)"></el-input>-->
-                  <tree-select-module v-if="!disabledXX"
+<!--                  <tree-select-module v-if="!disabledXX"-->
-                    width="800"
+<!--                    width="800"-->
-                    :key="key4"
+<!--                    :key="key4"-->
-                    :lazy=true
+<!--                    :lazy=true-->
-                    :multiple=true
+<!--                    :multiple=true-->
-                    :check-strictly=true
+<!--                    :check-strictly=true-->
-                    :modalShowFlag="modalShowFlag5"
+<!--                    :modalShowFlag="modalShowFlag5"-->
-                    :drawerTitle="drawerTitle"
+<!--                    :drawerTitle="drawerTitle"-->
-                    :url="url"
+<!--                    :url="url"-->
-                    :type="'CAR'"
+<!--                    :type="'CAR'"-->
-                    :show-checkBox="showCheckBox"
+<!--                    :show-checkBox="showCheckBox"-->
-                    :urlChild="urlChild"
+<!--                    :urlChild="urlChild"-->
-                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+<!--                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"-->
-                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
+<!--                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :disabled="disabledXX"  :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -807,34 +807,34 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">-->
-                  <el-input :disabled="disabledXX"
+<!--                  <el-input :disabled="disabledXX"-->
-                    v-if="form.dybxh === ''"
+<!--                    v-if="form.dybxh === ''"-->
-                    v-model="form.dymc = ''"
+<!--                    v-model="form.dymc = ''"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                  <el-input :disabled="disabledXX"
+<!--                  <el-input :disabled="disabledXX"-->
-                    v-else
+<!--                    v-else-->
-                    v-model="form.dymc"
+<!--                    v-model="form.dymc"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">-->
-                  <el-input :disabled="disabledXX"
+<!--                  <el-input :disabled="disabledXX"-->
-                    v-if="form.dybxhcar === ''"
+<!--                    v-if="form.dybxhcar === ''"-->
-                    v-model="form.dymccar = ''"
+<!--                    v-model="form.dymccar = ''"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                  <el-input :disabled="disabledXX"
+<!--                  <el-input :disabled="disabledXX"-->
-                    v-else
+<!--                    v-else-->
-                    v-model="form.dymccar"
+<!--                    v-model="form.dymccar"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"  v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceWSSMR('wssmr', '选择我司署名人', form.wssmr)">
                   </el-input>

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

@@ -441,12 +441,12 @@
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
                   <el-input v-model="form.kccvppsbm" disabled></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">-->
-                  <el-input v-model="form.dybxh" disabled></el-input>
+<!--                  <el-input v-model="form.dybxh" disabled></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">-->
-                  <el-input v-model="form.dybxhcar" disabled></el-input>
+<!--                  <el-input v-model="form.dybxhcar" disabled></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -523,20 +523,20 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                    v-model="form.dymc"
+<!--                    v-model="form.dymc"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                    v-model="form.dymccar"
+<!--                    v-model="form.dymccar"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <span>{{ form.wssmr }}</span>
                   <!--                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->

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

@@ -402,12 +402,12 @@
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
                   <el-input v-model="form.kccvppsbm" disabled></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">-->
-                  <el-input v-model="form.dybxh" disabled></el-input>
+<!--                  <el-input v-model="form.dybxh" disabled></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">-->
-                  <el-input v-model="form.dybxhcar" disabled></el-input>
+<!--                  <el-input v-model="form.dybxhcar" disabled></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -484,20 +484,20 @@
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                      v-model="form.dymc"
+<!--                      v-model="form.dymc"-->
-                      disabled
+<!--                      disabled-->
-                      clearable
+<!--                      clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                      v-model="form.dymccar"
+<!--                      v-model="form.dymccar"-->
-                      disabled
+<!--                      disabled-->
-                      clearable
+<!--                      clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <span style="color: rgb(118 122 120)">{{form.wssmr}}</span>
 <!--                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->

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

@@ -887,40 +887,40 @@
                     :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
                     :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">-->
-                  <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
+<!--                  <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>-->
-                  <tree-select-module
+<!--                  <tree-select-module-->
-                    width="800"
+<!--                    width="800"-->
-                    :key="key3"
+<!--                    :key="key3"-->
-                    :lazy=true
+<!--                    :lazy=true-->
-                    :multiple=true
+<!--                    :multiple=true-->
-                    :check-strictly=true
+<!--                    :check-strictly=true-->
-                    :modalShowFlag="modalShowFlag4"
+<!--                    :modalShowFlag="modalShowFlag4"-->
-                    :drawerTitle="drawerTitle"
+<!--                    :drawerTitle="drawerTitle"-->
-                    :url="url"
+<!--                    :url="url"-->
-                    :type="'TRUCK'"
+<!--                    :type="'TRUCK'"-->
-                    :show-checkBox="showCheckBox"
+<!--                    :show-checkBox="showCheckBox"-->
-                    :urlChild="urlChild"
+<!--                    :urlChild="urlChild"-->
-                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+<!--                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"-->
-                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
+<!--                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">-->
-                  <el-input v-model="form.dybxhcar" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR5('dybxhcar', '模块结构单元', form.dybxhcar)"></el-input>
+<!--                  <el-input v-model="form.dybxhcar" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR5('dybxhcar', '模块结构单元', form.dybxhcar)"></el-input>-->
-                  <tree-select-module
+<!--                  <tree-select-module-->
-                    width="800"
+<!--                    width="800"-->
-                    :key="key4"
+<!--                    :key="key4"-->
-                    :lazy=true
+<!--                    :lazy=true-->
-                    :multiple=true
+<!--                    :multiple=true-->
-                    :check-strictly=true
+<!--                    :check-strictly=true-->
-                    :modalShowFlag="modalShowFlag5"
+<!--                    :modalShowFlag="modalShowFlag5"-->
-                    :drawerTitle="drawerTitle"
+<!--                    :drawerTitle="drawerTitle"-->
-                    :url="url"
+<!--                    :url="url"-->
-                    :type="'CAR'"
+<!--                    :type="'CAR'"-->
-                    :show-checkBox="showCheckBox"
+<!--                    :show-checkBox="showCheckBox"-->
-                    :urlChild="urlChild"
+<!--                    :urlChild="urlChild"-->
-                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+<!--                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"-->
-                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
+<!--                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -1035,34 +1035,34 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                    v-if="form.dybxh === ''"
+<!--                    v-if="form.dybxh === ''"-->
-                    v-model="form.dymc = ''"
+<!--                    v-model="form.dymc = ''"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                  <el-input
+<!--                  <el-input-->
-                    v-else
+<!--                    v-else-->
-                    v-model="form.dymc"
+<!--                    v-model="form.dymc"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                    v-if="form.dybxhcar === ''"
+<!--                    v-if="form.dybxhcar === ''"-->
-                    v-model="form.dymccar = ''"
+<!--                    v-model="form.dymccar = ''"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                  <el-input
+<!--                  <el-input-->
-                    v-else
+<!--                    v-else-->
-                    v-model="form.dymccar"
+<!--                    v-model="form.dymccar"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
                   </el-input>

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

@@ -441,12 +441,12 @@
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
                   <el-input v-model="form.kccvppsbm" disabled></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">-->
-                  <el-input v-model="form.dybxh" disabled></el-input>
+<!--                  <el-input v-model="form.dybxh" disabled></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">-->
-                  <el-input v-model="form.dybxhcar" disabled></el-input>
+<!--                  <el-input v-model="form.dybxhcar" disabled></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -523,20 +523,20 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                    v-model="form.dymc"
+<!--                    v-model="form.dymc"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                    v-model="form.dymccar"
+<!--                    v-model="form.dymccar"-->
-                    disabled
+<!--                    disabled-->
-                    clearable
+<!--                    clearable-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <span>{{ form.wssmr }}</span>
                   <!--                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->

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

@@ -317,7 +317,7 @@
                 title="查看修改前内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
@@ -423,7 +423,7 @@
             },
             itermsConditionsOpen (row) {
                 this.itermsConditionsFlag = true
-                this.itermsConditionsTitle = row
+                this.itermsConditionsTitle = row.replace(/''/g, '\'')
             },
             optionsChange (data) {
                 for  (let a = 0; a < this.options.length; a++) {

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

@@ -83,6 +83,9 @@
         <ProcessTitle>
           <template slot="title">征求意见列表</template>
         </ProcessTitle>
+        <div class="effect" style="margin-bottom: 8px">
+          <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll">导出</el-button>
+        </div>
         <el-table
                 ref="multipleTable"
                 :data="data"
@@ -135,6 +138,11 @@
                     label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
                   prop="department"
                   align="center"
@@ -458,6 +466,37 @@
         }
         this.modalshowflag2 = false
       },
+      exportAll() {
+        const arr = JSON.stringify(this.data)
+        axios({
+          method: 'post',
+          url: 'api/slrs/sar-public-idea-all/tuallStandYJCL',
+          data: {
+            json: arr
+          },
+          dataType: 'json',
+          responseType: 'blob',
+        }).then(res => {
+          const blob = new Blob([res.data]);
+          const fileName = '流程意见详情.xlsx';
+          if ('download' in document.createElement('a')) { // 非IE下载
+            const elink = document.createElement('a');
+            elink.download = fileName;
+            elink.style.display = 'none';
+            elink.href = URL.createObjectURL(blob);
+            document.body.appendChild(elink);
+            elink.click();
+            URL.revokeObjectURL(elink.href);// 释放URL 对象
+            document.body.removeChild(elink);
+            this.loading = false;
+          } else { // IE10+下载
+            navigator.msSaveBlob(blob, fileName);
+            this.loading = false;
+          }
+        }).catch(error => {
+        })
+
+      },
       cancleUserInfo2 () {
         this.modalshowflag2 = false
       },
@@ -466,6 +505,7 @@
           this.itemId = row.id
           this.modalshowflag2 = true
           this.editForm = {
+            sourceType: row.sourceType,
             chapterNumber: row.chapterNumber,
             chapterName: row.chapterName,
             oldText: row.oldText,
@@ -584,9 +624,9 @@
             if (this.data[b].state === '3' && !this.data[b].cause) {
               a++
             }
-            if(!this.data[b].sourceType){
+            // if(!this.data[b].sourceType){
-              this.data[b].sourceType = '定向'
+            //   this.data[b].sourceType = '定向'
-            }
+            // }
           }
           if (a > 0) {
             this.$message.warning('请输入不上报原因')
@@ -644,6 +684,9 @@
               if (!item.source) {
                 item.source = '1'
               }
+              if (!item.sourceType) {
+                item.sourceType = '定向'
+              }
               if (item.state) {
               } else {
                 item.state = "1";

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

@@ -155,6 +155,11 @@
                     label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
                   prop="department"
                   align="center"

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

@@ -147,6 +147,11 @@
               label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
             prop="department"
             align="center"

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

@@ -147,6 +147,11 @@
               label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
             prop="department"
             align="center"

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

@@ -147,6 +147,11 @@
               label="修改理由">
             </el-table-column>
           </el-table-column>
+          <el-table-column
+              prop="sourceType"
+              align="center"
+              label="来源">
+          </el-table-column>
           <el-table-column
             prop="department"
             align="center"

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

@@ -189,12 +189,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
               <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
@@ -229,12 +229,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>
+<!--          <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>
+<!--              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
       </el-col>
     </el-row>
   </div>

src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep2.vue

@@ -189,12 +189,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
               <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
@@ -229,12 +229,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>
+<!--          <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>
+<!--              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
       </el-col>
     </el-row>
   </div>

src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue

@@ -189,12 +189,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
-          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--              <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
               <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
@@ -226,12 +226,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
         </el-form-item>
-          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>
+<!--              <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>
+<!--              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
       </el-col>
     </el-row>
   </div>

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

@@ -276,12 +276,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>
+<!--          <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>
+<!--          <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
         </el-form-item>
@@ -323,12 +323,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable disabled></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>
+<!--          <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>
+<!--          <el-input v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
       </el-col>
     </el-row>
   </div>

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

@@ -276,12 +276,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>
+<!--          <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>
+<!--          <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
         </el-form-item>
@@ -323,12 +323,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable disabled></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>
+<!--          <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>
+<!--          <el-input v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
       </el-col>
     </el-row>
   </div>

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

@@ -183,12 +183,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
         </el-form-item>
@@ -223,12 +223,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>
+<!--          <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>
+<!--              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
       </el-col>
     </el-row>
   </div>

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

@@ -194,12 +194,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--            <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--            <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
@@ -234,12 +234,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>
+<!--            <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>
+<!--            <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
         </el-col>
       </el-row>
     </div>

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

@@ -274,12 +274,12 @@
                                 <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
                                     <el-input :disabled="disabledXX"  v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
                                 </el-form-item>
-                                <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
-                                    <el-input :disabled="disabledXX"  v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>
+<!--                                    <el-input :disabled="disabledXX"  v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-                                    <el-input :disabled="disabledXX"  v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>
+<!--                                    <el-input :disabled="disabledXX"  v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
                                     <el-input :disabled="disabledXX"  v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
                                 </el-form-item>
@@ -322,12 +322,12 @@
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
                                     <el-input :disabled="disabledXX"  v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable disabled></el-input>
                                 </el-form-item>
-                                <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-                                    <el-input :disabled="disabledXX"  v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>
+<!--                                    <el-input :disabled="disabledXX"  v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-                                    <el-input :disabled="disabledXX"  v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>
+<!--                                    <el-input :disabled="disabledXX"  v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>

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

@@ -561,7 +561,7 @@ export default {
         _formData.append('standNumSplit', files.standNumSplit)
         _formData.append('standNameSplit', files.standNameSplit)
         _formData.append('fileType', files.fileType)
-        _formData.append('file', file.raw)
+        _formData.append('importFileId', files.attId)
         this.$http.postData('importWkExcel/importData', _formData,{
           _this: this
         }, res => {

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

@@ -340,14 +340,33 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      let replaceStandInfoEO ={}
+      replaceStandInfoEO.standNumber = item.standNumber
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
+        _this: this
+      }, res => {
+        if (res.data != null) {
           let routeUrl = this.$router.resolve({
-        name: "OtherStandardDetails",
+            name: 'OtherStandardDetails',
             params: {
-          id: item.key || item.standId,
+              id: res.data.id,
               pageType:item.standType + '_STAND'
             }
-      });
+          })
-      window.open(routeUrl.href, "_blank");
+          window.open(routeUrl.href, '_blank')
+        } else {
+          this.$message.error(res.message)
+        }
+      }, e => {
+      })
+      // let routeUrl = this.$router.resolve({
+      //   name: "OtherStandardDetails",
+      //   params: {
+      //     id: item.key || item.standId,
+      //     pageType: item.standType + '_STAND'
+      //   }
+      // });
+      // window.open(routeUrl.href, "_blank");
     },
     //查询项目下的标准
     getStandData() {

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

@@ -907,14 +907,33 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      // let routeUrl = this.$router.resolve({
+      //   name: "OtherStandardDetails",
+      //   params: {
+      //     id: item.standId,
+      //     pageType: item.standType + '_STAND'
+      //   }
+      // });
+      // window.open(routeUrl.href, "_blank");
+      let replaceStandInfoEO ={}
+      replaceStandInfoEO.standNumber = item.standNumber
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
+        _this: this
+      }, res => {
+        if (res.data != null) {
           let routeUrl = this.$router.resolve({
-        name: "OtherStandardDetails",
+            name: 'OtherStandardDetails',
             params: {
-          id: item.standId,
+              id: res.data.id,
               pageType:item.standType + '_STAND'
             }
-      });
+          })
-      window.open(routeUrl.href, "_blank");
+          window.open(routeUrl.href, '_blank')
+        } else {
+          this.$message.error(res.message)
+        }
+      }, e => {
+      })
     },
     choiceZRR(type, title, id) {
       this.nodeList = [];

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

@@ -260,14 +260,33 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      let replaceStandInfoEO ={}
+      replaceStandInfoEO.standNumber = item.standNumber
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
+        _this: this
+      }, res => {
+        if (res.data != null) {
           let routeUrl = this.$router.resolve({
-        name: "OtherStandardDetails",
+            name: 'OtherStandardDetails',
             params: {
-          id: item.standId,
+              id: res.data.id,
               pageType:item.standType + '_STAND'
             }
-      });
+          })
-      window.open(routeUrl.href, "_blank");
+          window.open(routeUrl.href, '_blank')
+        } else {
+          this.$message.error(res.message)
+        }
+      }, e => {
+      })
+      // let routeUrl = this.$router.resolve({
+      //   name: "OtherStandardDetails",
+      //   params: {
+      //     id: item.standId,
+      //     pageType: item.standType + '_STAND'
+      //   }
+      // });
+      // window.open(routeUrl.href, "_blank");
     },
     //查询项目下的标准
     getStandData() {

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

@@ -112,6 +112,19 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+              prop="termsConditions"
+              min-width="200"
+              label="条款内容"
+              align="center"
+              :resizable="false"
+          >
+            <template slot-scope="scope">
+                <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
+                  {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
+                </div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="ssrq"
             width="200"
@@ -490,6 +503,13 @@
         </el-button>
       </div>
     </el-drawer>
+    <!--内容简介-->
+    <el-dialog :visible.sync="itemsTextDialogs" title="内容简介" :close-on-click-modal="false">
+      <div v-html="itemsText" class="itemsTextBox"></div>
+      <div slot="footer">
+        <el-button type="primary" size="large" @click="itemsTextDialogs = false">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -513,7 +533,9 @@ export default {
       currentPage: 1,
       pageSize: 20,
       nodeList: [],
+      itemsTextDialogs:false,
       isTransfer: false,
+      itemsText:'',
       // 调整处理人抽屉状态
       drawerModal: false,
       batchEditForm: {
@@ -662,14 +684,37 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      let replaceStandInfoEO ={}
+      replaceStandInfoEO.standNumber = item.standNumber
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
+        _this: this
+      }, res => {
+        if (res.data != null) {
           let routeUrl = this.$router.resolve({
-        name: "OtherStandardDetails",
+            name: 'OtherStandardDetails',
             params: {
-          id: item.standId,
+              id: res.data.id,
               pageType:item.standType + '_STAND'
             }
-      });
+          })
-      window.open(routeUrl.href, "_blank");
+          window.open(routeUrl.href, '_blank')
+        } else {
+          this.$message.error(res.message)
+        }
+      }, e => {
+      })
+      // let routeUrl = this.$router.resolve({
+      //   name: "OtherStandardDetails",
+      //   params: {
+      //     id: item.standId,
+      //     pageType: item.standType + '_STAND'
+      //   }
+      // });
+      // window.open(routeUrl.href, "_blank");
+    },
+    itemsTextDialog(itemsNum, text) {
+      this.itemsTextDialogs = true
+      this.itemsText = '<p>' + itemsNum + '</p>' + text.replace(/''/g, '\'')
     },
     //查询项目下的标准
     getStandData() {
@@ -764,6 +809,7 @@ export default {
                this.$set(items, "standYear", item.standYear);
                this.$set(items, "standSort", item.standSort);
                this.$set(items, "standNumber", item.standNumber);
+               this.$set(items, "termsConditions", item.termsConditions);
              }
            })
          })
@@ -777,12 +823,28 @@ export default {
           if(index > -1){
             dataListChildren.splice(index, 1)
           }
+          let idList = []
           dataListChildren.forEach(item => {
+            idList.push(item.id)
             item.workPeople = this.$store.getters.userInfo.userName
             item.workPeopleId = this.$store.getters.userInfo.userId
           })
+          this.$http.post("SarStandItems/sar-stand-items/findTermsConditions",{
+            idList: idList
+          }, {
+            _this:this
+          }, res => {
+            res.data.forEach(val => {
+              dataListChildren.forEach(item => {
+                if(item.id == val.id){
+                  item.termsConditions = val.termsConditions
+                }
+              })
+            })
+          })
           this.dataList = dataListChildren;
           this.total = this.dataList.length;
+          this.$forceUpdate()
         } else {
           let dataChildren = [];
           let dataListChildren = [];
@@ -896,10 +958,23 @@ export default {
           this.$message.warning("请填写完整的不符合项信息");
           this.comFlag = 0;
         } else {
+          this.listForm.breakdownList.forEach(item => {
+            if (item.termsConditions) {
+              item.termsConditions = ''
+            }
+          });
           this.listForm.dataList.forEach(item => {
+            // item.userId = this.$store.getters.userInfo.userId
             if (item.workPeople === "请选择责任人") {
               item.workPeople = "";
             }
+            if(item.children){
+              item.children.forEach(val => {
+                if(val.termsConditions){
+                  delete val.termsConditions
+                }
+              })
+            }
           });
           this.isSubmit = true;
           this.listForm.commentText = this.commentText;

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

@@ -378,14 +378,33 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      let replaceStandInfoEO ={}
+      replaceStandInfoEO.standNumber = item.standNumber
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
+        _this: this
+      }, res => {
+        if (res.data != null) {
           let routeUrl = this.$router.resolve({
-        name: "OtherStandardDetails",
+            name: 'OtherStandardDetails',
             params: {
-          id: item.key || item.standId,
+              id: res.data.id,
               pageType:item.standType + '_STAND'
             }
-      });
+          })
-      window.open(routeUrl.href, "_blank");
+          window.open(routeUrl.href, '_blank')
+        } else {
+          this.$message.error(res.message)
+        }
+      }, e => {
+      })
+      // let routeUrl = this.$router.resolve({
+      //   name: "OtherStandardDetails",
+      //   params: {
+      //     id: item.key || item.standId,
+      //     pageType: item.standType + '_STAND'
+      //   }
+      // });
+      // window.open(routeUrl.href, "_blank");
     },
     //查询项目下的标准
     getStandData() {

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

@@ -375,14 +375,33 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      let replaceStandInfoEO ={}
+      replaceStandInfoEO.standNumber = item.standNumber
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
+        _this: this
+      }, res => {
+        if (res.data != null) {
           let routeUrl = this.$router.resolve({
-        name: "OtherStandardDetails",
+            name: 'OtherStandardDetails',
             params: {
-          id: item.key || item.standId,
+              id: res.data.id,
               pageType:item.standType + '_STAND'
             }
-      });
+          })
-      window.open(routeUrl.href, "_blank");
+          window.open(routeUrl.href, '_blank')
+        } else {
+          this.$message.error(res.message)
+        }
+      }, e => {
+      })
+      // let routeUrl = this.$router.resolve({
+      //   name: "OtherStandardDetails",
+      //   params: {
+      //     id: item.key || item.standId,
+      //     pageType: item.standType + '_STAND'
+      //   }
+      // });
+      // window.open(routeUrl.href, "_blank");
     },
     //查询项目下的标准
     getStandData() {

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

@@ -558,6 +558,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -566,6 +567,10 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
+
     },
     //流程保存事件
     handleSave() {

src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue

@@ -289,7 +289,7 @@ export default {
   methods: {
     // 点击查看
     handlePreview(item) {
-      console.log(item)
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -298,6 +298,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {

src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue

@@ -260,14 +260,18 @@ export default {
     },
     // 点击查看
     handlePreview (item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
-        name: 'OtherStandardDetails',
+          name: "OtherStandardDetails",
           params: {
             id: item.standId,
-          pageType: 'INLAND_STAND'
+            pageType: "INLAND_STAND"
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
       }
-      })
-      window.open(routeUrl.href, '_blank')
     },
     //获取数据
     getData() {

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

@@ -401,6 +401,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -409,6 +410,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     //查询项目下的标准
     getStandData() {

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

@@ -399,6 +399,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -407,6 +408,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     //查询项目下的标准
     getStandData() {

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

@@ -401,6 +401,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -409,6 +410,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     //查询项目下的标准
     getStandData() {

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

@@ -318,14 +318,18 @@ export default {
     },
     // 点击查看
     handlePreview (item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
-        name: 'OtherStandardDetails',
+          name: "OtherStandardDetails",
           params: {
             id: item.standId,
-          pageType: 'INLAND_STAND'
+            pageType: "INLAND_STAND"
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
       }
-      })
-      window.open(routeUrl.href, '_blank')
     },
     //获取数据
     getData() {

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

@@ -344,6 +344,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -352,6 +353,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     //查询项目下的标准
     getStandData() {

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

@@ -340,6 +340,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -348,6 +349,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     //查询项目下的标准
     getStandData() {

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

@@ -250,6 +250,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -258,6 +259,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     //查询项目下的标准
     getStandData() {

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

@@ -604,6 +604,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -612,6 +613,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     //查询项目下的标准
     getStandData() {

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

@@ -359,6 +359,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -367,6 +368,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {

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

@@ -399,6 +399,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -407,6 +408,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     //查询项目下的标准
     getStandData() {

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

@@ -401,6 +401,7 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      if(item.standId){
         let routeUrl = this.$router.resolve({
           name: "OtherStandardDetails",
           params: {
@@ -409,6 +410,9 @@ export default {
           }
         });
         window.open(routeUrl.href, "_blank");
+      }else{
+        this.$message.warning('当前标准不存在，请检查');
+      }
     },
     //查询项目下的标准
     getStandData() {

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue

@@ -310,7 +310,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -330,7 +330,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' " @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -339,7 +339,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
                 <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
@@ -349,7 +349,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ssrq }}</span>
 
               </template>
@@ -360,7 +360,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.xcxssrq }}</span>
               </template>
             </el-table-column>
@@ -369,7 +369,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.zccssrq }}</span>
               </template>
             </el-table-column>
@@ -383,7 +383,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -396,7 +396,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -418,7 +418,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -434,7 +434,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
@@ -451,7 +451,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     scope.row.ssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -466,7 +466,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.xcxssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -482,7 +482,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.zccssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -503,7 +503,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{

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

@@ -484,7 +484,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -504,7 +504,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' " @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -513,7 +513,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
                 <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
@@ -523,7 +523,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ssrq }}</span>
 
               </template>
@@ -534,7 +534,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.xcxssrq }}</span>
               </template>
             </el-table-column>
@@ -543,7 +543,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.zccssrq }}</span>
               </template>
             </el-table-column>
@@ -552,7 +552,7 @@
               width="110"
               label="文本状态">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -565,7 +565,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -587,7 +587,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -603,7 +603,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
@@ -620,7 +620,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.ssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -635,7 +635,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.xcxssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -651,7 +651,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     scope.row.zccssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -667,7 +667,7 @@
               width="110"
               label="文本状态">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{

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

@@ -332,7 +332,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' " class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -352,7 +352,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' " @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -361,7 +361,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
                 <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
@@ -371,7 +371,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ssrq }}</span>
 
               </template>
@@ -382,7 +382,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.xcxssrq }}</span>
               </template>
             </el-table-column>
@@ -391,7 +391,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.zccssrq }}</span>
               </template>
             </el-table-column>
@@ -405,7 +405,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -418,7 +418,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -440,7 +440,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -456,7 +456,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
@@ -473,7 +473,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.ssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -488,7 +488,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.xcxssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -504,7 +504,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.zccssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -525,7 +525,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{

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

@@ -332,7 +332,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -352,7 +352,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -361,7 +361,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
                 <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
@@ -371,7 +371,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ssrq }}</span>
 
               </template>
@@ -382,7 +382,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.xcxssrq }}</span>
               </template>
             </el-table-column>
@@ -391,7 +391,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.zccssrq }}</span>
               </template>
             </el-table-column>
@@ -405,7 +405,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -418,7 +418,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -440,7 +440,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -456,7 +456,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
@@ -473,7 +473,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.ssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -488,7 +488,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.xcxssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -504,7 +504,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.zccssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -525,7 +525,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{

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

@@ -325,7 +325,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -345,7 +345,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -354,7 +354,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
                 <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
@@ -364,7 +364,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ssrq }}</span>
 
               </template>
@@ -375,7 +375,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.xcxssrq }}</span>
               </template>
             </el-table-column>
@@ -384,7 +384,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.zccssrq }}</span>
               </template>
             </el-table-column>
@@ -398,7 +398,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -411,7 +411,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -433,7 +433,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -449,7 +449,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
@@ -466,7 +466,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.ssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -481,7 +481,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.xcxssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -497,7 +497,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.zccssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -518,7 +518,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{

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

@@ -245,7 +245,8 @@
       <el-dialog
         title="查看比对内容"
         :visible.sync="BDmodel"
-        size="1100px">
+        size="1100px"
+        width="100%">
         <div>比对条款: {{ itemsNum }}</div>
         <div>相似度:{{ similarityDegree }}</div>
         <div style="height: 600px;overflow: auto;display: flex;">

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

@@ -223,7 +223,8 @@
       <el-dialog
         title="查看比对内容"
         :visible.sync="BDmodel"
-        size="1100px">
+        size="1100px"
+        width="100%">
         <div>比对条款: {{ itemsNum }}</div>
         <div>相似度:{{ similarityDegree }}</div>
         <div style="height: 600px;overflow: auto;display: flex;">

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

@@ -241,7 +241,8 @@
       <el-dialog
         title="查看比对内容"
         :visible.sync="BDmodel"
-        size="1100px">
+        size="1100px"
+        width="100%">
         <div>比对条款: {{ itemsNum }}</div>
         <div>相似度:{{ similarityDegree }}</div>
         <div style="height: 600px;overflow: auto;display: flex;">

src/pages/processCenter/pages/phone/bzpg/step7.vue

@@ -54,6 +54,9 @@
           :label="item"
           :value="item"
           :name="item">
+          <el-tooltip slot="label" effect="dark" :content="item" placement="bottom-start">
+            <span>{{ item }}</span>
+          </el-tooltip>
         </el-tab-pane>
       </el-tabs>
       <el-table

src/pages/processCenter/pages/phone/bzpg/step8.vue

@@ -54,6 +54,9 @@
           :label="item"
           :value="item"
           :name="item">
+          <el-tooltip slot="label" effect="dark" :content="item" placement="bottom-start">
+            <span>{{ item }}</span>
+          </el-tooltip>
         </el-tab-pane>
       </el-tabs>
       <el-table

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

@@ -159,7 +159,7 @@
               </div>
             </el-form-item>
             <el-form-item prop="fbgbjbdName" class="add-form-item form-item-disabled">
-              <span slot="label" title="发布稿（原文）" style="width: 112px">发布稿（译文）</span>
+              <span slot="label" title="发布稿（原文）" style="width: 112px">发布稿（原文）</span>
               <div v-if="fbgbjbdFileMap.length>0" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                 <span style="" @click="downloadFile('fbg',value.id)" :title="value.name">{{ value.name  }}</span>
               </div>
@@ -288,10 +288,10 @@
             <van-field label="关联模块--卡车VPPS编码" v-model="form.kccvppsbm" readonly placeholder=""/>
             <van-field label="关联模块--乘用车vpps中文名称" v-model="form.cycvppscn" readonly placeholder="" />
             <van-field label="关联模块--卡车vpps中文名称" v-model="form.kccvppscn" placeholder="" readonly />
-            <van-field label="模块结构单元变型号(卡车)" v-model="form.dybxh" readonly  placeholder=""/>
+<!--            <van-field label="模块结构单元变型号(卡车)" v-model="form.dybxh" readonly  placeholder=""/>-->
-            <van-field label="模块结构单元名称(卡车)" v-model="form.dymc" readonly placeholder="" />
+<!--            <van-field label="模块结构单元名称(卡车)" v-model="form.dymc" readonly placeholder="" />-->
-            <van-field label="模块结构单元变型号(乘用车)" v-model="form.dybxhcar" readonly  placeholder=""/>
+<!--            <van-field label="模块结构单元变型号(乘用车)" v-model="form.dybxhcar" readonly  placeholder=""/>-->
-            <van-field label="模块结构单元名称(乘用车)" v-model="form.dymccar" readonly placeholder="" />
+<!--            <van-field label="模块结构单元名称(乘用车)" v-model="form.dymccar" readonly placeholder="" />-->
             <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
               <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="" disabled>
                 <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -787,6 +787,7 @@ export default {
             this.xgdFileMap = this.assemble(processForm.xgd, processForm.xgdName);
 
             this.fbgbjbdFileMap = this.assemble(processForm.fbgbjbd, processForm.fbgbjbdName);
+            this.fbgywbdFileMap = this.assemble(processForm.fbgywbd, processForm.fbgywbdName);
             // fbgbjbdFileMap: {},
             this.bpgFileMap = this.assemble(processForm.bpg, processForm.bpgName);
             // bpgFileMap: {},

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

@@ -327,6 +327,11 @@
                 padding: 0 20px 0;
             }
         }
+      /deep/.van-dialog__content {
+        max-height: 400px;
+        padding: 10px;
+        overflow: auto;
+      }
         .fileClass {
             cursor: pointer;
         }

src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue

@@ -405,6 +405,11 @@
                 padding: 0 20px 0;
             }
         }
+        /deep/.van-dialog__content {
+          max-height: 400px;
+          padding: 10px;
+          overflow: auto;
+        }
         .fileClass {
             cursor: pointer;
         }

src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue

@@ -387,6 +387,11 @@
                 padding: 0 20px 0;
             }
         }
+      /deep/.van-dialog__content {
+        max-height: 400px;
+        padding: 10px;
+        overflow: auto;
+      }
         .fileClass {
             cursor: pointer;
         }

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

@@ -482,6 +482,11 @@
                 padding: 0 20px 0;
             }
         }
+      /deep/.van-dialog__content {
+        max-height: 400px;
+        padding: 10px;
+        overflow: auto;
+      }
         .fileClass {
             cursor: pointer;
         }

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

@@ -416,6 +416,11 @@
                 padding: 0 20px 0;
             }
         }
+      /deep/.van-dialog__content {
+        max-height: 400px;
+        padding: 10px;
+        overflow: auto;
+      }
         .fileClass {
             cursor: pointer;
         }

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

@@ -418,6 +418,11 @@
                 padding: 0 20px 0;
             }
         }
+      /deep/.van-dialog__content {
+        max-height: 400px;
+        padding: 10px;
+        overflow: auto;
+      }
         .fileClass {
             cursor: pointer;
         }

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

@@ -432,6 +432,11 @@
                 padding: 0 20px 0;
             }
         }
+      /deep/.van-dialog__content {
+        max-height: 400px;
+        padding: 10px;
+        overflow: auto;
+      }
         .fileClass {
             cursor: pointer;
         }

src/pages/processCenter/pages/phone/qbfs/common/formList.vue

@@ -189,9 +189,9 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
       </el-col>
       <el-col :span="12">
         <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
@@ -220,9 +220,9 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>
+<!--          <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
         </el-form-item>

src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue

@@ -141,12 +141,12 @@
           <el-form-item label="关联模块--卡车VPPS中文名称" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
               <el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
           </el-form-item>
-        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>
+<!--              <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
               <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
                   <el-option

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

@@ -276,12 +276,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>
+<!--            <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>
+<!--            <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
           </el-form-item>
@@ -323,12 +323,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable disabled></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>
+<!--            <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>
+<!--            <el-input v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
         </el-col>
       </el-row>
     </div>

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

@@ -150,18 +150,18 @@
           <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
               <el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
           </el-form-item>
-        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+<!--        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
-          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>
+<!--              <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>
+<!--              <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
         </el-form-item>

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

@@ -194,12 +194,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--            <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--            <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
@@ -234,12 +234,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSCNBUSS" clearable disabled></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>
+<!--            <el-input v-model="form.DYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>
+<!--            <el-input v-model="form.CYCDYMCBUSS" clearable disabled></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
         </el-col>
       </el-row>
     </div>

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

@@ -334,14 +334,33 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      let replaceStandInfoEO ={}
+      replaceStandInfoEO.standNumber = item.standNumber
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
+        _this: this
+      }, res => {
+        if (res.data != null) {
           let routeUrl = this.$router.resolve({
-        name: "OtherStandardDetails",
+            name: 'OtherStandardDetails',
             params: {
-          id: item.standId,
+              id: res.data.id,
               pageType:"INLAND_STAND"
             }
-      });
+          })
-      window.open(routeUrl.href, "_blank");
+          window.open(routeUrl.href, '_blank')
+        } else {
+          this.$message.error(res.message)
+        }
+      }, e => {
+      })
+      // let routeUrl = this.$router.resolve({
+      //   name: "OtherStandardDetails",
+      //   params: {
+      //     id: item.standId,
+      //     pageType: "INLAND_STAND"
+      //   }
+      // });
+      // window.open(routeUrl.href, "_blank");
     },
     //查询项目下的标准
     getStandData() {

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

@@ -332,14 +332,33 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
+      let replaceStandInfoEO ={}
+      replaceStandInfoEO.standNumber = item.standNumber
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
+        _this: this
+      }, res => {
+        if (res.data != null) {
           let routeUrl = this.$router.resolve({
-        name: "OtherStandardDetails",
+            name: 'OtherStandardDetails',
             params: {
-          id: item.standId,
+              id: res.data.id,
               pageType:"INLAND_STAND"
             }
-      });
+          })
-      window.open(routeUrl.href, "_blank");
+          window.open(routeUrl.href, '_blank')
+        } else {
+          this.$message.error(res.message)
+        }
+      }, e => {
+      })
+      // let routeUrl = this.$router.resolve({
+      //   name: "OtherStandardDetails",
+      //   params: {
+      //     id: item.standId,
+      //     pageType: "INLAND_STAND"
+      //   }
+      // });
+      // window.open(routeUrl.href, "_blank");
     },
     //查询项目下的标准
     getStandData() {

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -348,7 +348,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -368,7 +368,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -377,7 +377,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.issueTime }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.issueTime }}</span>
                 <span v-else>{{ scope.row.issueTime }}</span>
               </template>
             </el-table-column>
@@ -387,7 +387,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ssrq }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.ssrq }}</span>
                 <span v-else>{{ scope.row.ssrq }}</span>
 
               </template>
@@ -398,7 +398,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.xcxssrq }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.xcxssrq }}</span>
                 <span v-else>{{ scope.row.xcxssrq }}</span>
               </template>
             </el-table-column>
@@ -407,7 +407,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.zccssrq }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.zccssrq }}</span>
                 <span v-else>{{ scope.row.zccssrq }}</span>
               </template>
             </el-table-column>
@@ -421,7 +421,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -434,7 +434,7 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -456,7 +456,7 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -474,7 +474,7 @@
                 min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standEnName
                   }}</a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -490,7 +490,7 @@
               width="120"
               label="发布日期">
               <template slot-scope="scope">
-                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">
                   {{ scope.row.issueTime }}
                 </div>
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
@@ -507,7 +507,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.ssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -522,7 +522,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.xcxssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -538,7 +538,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.zccssrq
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -559,7 +559,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{

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

@@ -1769,12 +1769,15 @@ export default {
           // }
           this.sarAccessInfoSearchList = res.data.list
           this.sarAccessInfoSearchList.forEach(item => {
+            // if (null == item.standSortShow){
+            //   item.standSortShow = '';
+            // }
             if (item.standYear === null) {
-              if(item.standSortShow !== null) {
+              if (null != item.standSortShow) {
                 item.standNumber = item.standSortShow + ' ' + item.standNumber
               }
             } else {
-              if (item.standSortShow !== null) {
+              if (null != item.standSortShow) {
                 item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
               }else{
                 item.standNumber = item.standNumber + '-' + item.standYear

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -212,12 +212,12 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' "
                    class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
-                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' "
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'"
                    class="table-jump" style="color: #35720B"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
@@ -238,11 +238,11 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' "
                    @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{
                     scope.row.standName
                   }}</a>
-                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'"
                    @click="handlePreview(scope.row)" class="table-jump" style="color: #35720B">{{
                     scope.row.standName
                   }}</a>
@@ -260,12 +260,12 @@
               <!--              </template>-->
               <template slot-scope="scope">
                 <span
-                        v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                        v-if="textStatusMap[scope.row.textStatus] === '废止' "
                         style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span
-                        v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                        v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'"
                         style="color: #35720B">{{ textStatusMap[scope.row.textStatus] }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
@@ -278,10 +278,10 @@
               label="发布日期">
               <template slot-scope="scope">
                 <span
-                  v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                  v-if="textStatusMap[scope.row.textStatus] === '废止' "
                   style="color: #F56C6C">{{ scope.row.issueTime }}</span>
                 <span
-                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #35720B">{{ scope.row.issueTime }}</span>
                 <span v-else>{{ scope.row.issueTime }}</span>
               </template>
@@ -293,10 +293,10 @@
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
                 <span
-                  v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                  v-if="textStatusMap[scope.row.textStatus] === '废止'"
                   style="color: #F56C6C">{{ scope.row.SSRQ }}</span>
                 <span
-                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #35720B">{{ scope.row.SSRQ }}</span>
                 <span v-else>{{ scope.row.SSRQ }}</span>
 
@@ -309,10 +309,10 @@
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span
-                  v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                  v-if="textStatusMap[scope.row.textStatus] === '废止' "
                   style="color: #F56C6C">{{ scope.row.XCXSSRQ }}</span>
                 <span
-                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #35720B">{{ scope.row.XCXSSRQ }}</span>
                 <span v-else>{{ scope.row.XCXSSRQ }}</span>
               </template>
@@ -323,10 +323,10 @@
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span
-                  v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                  v-if="textStatusMap[scope.row.textStatus] === '废止' "
                   style="color: #F56C6C">{{ scope.row.ZCCSSRQ }}</span>
                 <span
-                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #35720B">{{ scope.row.ZCCSSRQ }}</span>
                 <span v-else>{{ scope.row.ZCCSSRQ }}</span>
               </template>
@@ -337,10 +337,10 @@
               label="代替标准号">
               <template slot-scope="scope">
                 <span
-                  v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                  v-if="textStatusMap[scope.row.textStatus] === '废止' "
                   style="color: #F56C6C">{{ scope.row.dtbzh }}</span>
                 <span
-                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #35720B">{{ scope.row.dtbzh }}</span>
                 <span v-else>{{ scope.row.dtbzh }}</span>
               </template>
@@ -658,64 +658,64 @@
                       ></el-input>
                     </el-form-item>
                   </template>
-                  <template v-else-if="field.attrField === 'DYBXH'">
+<!--                  <template v-else-if="field.attrField === 'DYBXH'">-->
-                    <el-form-item
+<!--                    <el-form-item-->
-                      prop="DYBXH"
+<!--                      prop="DYBXH"-->
-                      label-width="150px"
+<!--                      label-width="150px"-->
-                      class="add-form-item"
+<!--                      class="add-form-item"-->
-                      label="模块结构单元变型号(卡车)"
+<!--                      label="模块结构单元变型号(卡车)"-->
-                      title="模块结构单元变型号(卡车)"
+<!--                      title="模块结构单元变型号(卡车)"-->
-                    >
+<!--                    >-->
-                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
+<!--                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"-->
-                                clearable
+<!--                                clearable-->
-                                @click.native="choiceZRR4('TRUCK', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
+<!--                                @click.native="choiceZRR4('TRUCK', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
-                  <template v-else-if="field.attrField === 'DYMC'">
+<!--                  <template v-else-if="field.attrField === 'DYMC'">-->
-                    <el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
+<!--                    <el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">-->
-                      <el-input
+<!--                      <el-input-->
-                        v-if="sarStandardsInfoEO.DYBXH === '' || sarStandardsInfoEO.DYBXH === undefined"
+<!--                        v-if="sarStandardsInfoEO.DYBXH === '' || sarStandardsInfoEO.DYBXH === undefined"-->
-                        v-model="sarStandardsInfoEO.DYMC = ''"
+<!--                        v-model="sarStandardsInfoEO.DYMC = ''"-->
-                        disabled
+<!--                        disabled-->
-                        clearable
+<!--                        clearable-->
-                      ></el-input>
+<!--                      ></el-input>-->
-                      <el-input
+<!--                      <el-input-->
-                        v-else
+<!--                        v-else-->
-                        v-model="sarStandardsInfoEO.DYMC"
+<!--                        v-model="sarStandardsInfoEO.DYMC"-->
-                        disabled
+<!--                        disabled-->
-                        clearable
+<!--                        clearable-->
-                      ></el-input>
+<!--                      ></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
-                  <template v-else-if="field.attrField === 'DYBXHCAR'">
+<!--                  <template v-else-if="field.attrField === 'DYBXHCAR'">-->
-                    <el-form-item
+<!--                    <el-form-item-->
-                      prop="DYBXHCAR"
+<!--                      prop="DYBXHCAR"-->
-                      label-width="150px"
+<!--                      label-width="150px"-->
-                      class="add-form-item"
+<!--                      class="add-form-item"-->
-                      label="模块结构单元变型号(乘用车)"
+<!--                      label="模块结构单元变型号(乘用车)"-->
-                      title="模块结构单元变型号(乘用车)"
+<!--                      title="模块结构单元变型号(乘用车)"-->
-                    >
+<!--                    >-->
-                      <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
+<!--                      <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"-->
-                                clearable
+<!--                                clearable-->
-                                @click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
+<!--                                @click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
-                  <template v-else-if="field.attrField === 'DYMCCAR'">
+<!--                  <template v-else-if="field.attrField === 'DYMCCAR'">-->
-                    <el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
+<!--                    <el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">-->
-                      <el-input
+<!--                      <el-input-->
-                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
+<!--                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"-->
-                              v-model="sarStandardsInfoEO.DYMCCAR = ''"
+<!--                              v-model="sarStandardsInfoEO.DYMCCAR = ''"-->
-                              disabled
+<!--                              disabled-->
-                              clearable
+<!--                              clearable-->
-                      ></el-input>
+<!--                      ></el-input>-->
-                      <el-input
+<!--                      <el-input-->
-                              v-else
+<!--                              v-else-->
-                              v-model="sarStandardsInfoEO.DYMCCAR"
+<!--                              v-model="sarStandardsInfoEO.DYMCCAR"-->
-                              disabled
+<!--                              disabled-->
-                              clearable
+<!--                              clearable-->
-                      ></el-input>
+<!--                      ></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
                   <template v-else-if="field.attrField === 'BBFDTBZ' || field.attrField === 'BYYBJ'">
                     <custom-input
                       :config="field"
@@ -1200,12 +1200,12 @@
                 size="mini"
                 @close="handleTagClose(tag)"
                 closable>
-                  <a v-if="tag.standYear && textStatusMap[tag.textStatus] === '废止' || textStatusMap[tag.textStatus] === '被代替'"
+                  <a v-if="tag.standYear && textStatusMap[tag.textStatus] === '废止' "
                      class="table-jump" style="color: #F56C6C"
                      @click="handlePreview(tag)">{{ tag.standSortShow }} {{
                     tag.standNumber
                     }}-{{ tag.standYear }}</a>
-                  <a v-else-if="tag.standYear && textStatusMap[tag.textStatus] === '参考' "
+                  <a v-else-if="tag.standYear && textStatusMap[tag.textStatus] === '参考' || textStatusMap[tag.textStatus] === '被代替'"
                      class="table-jump" style="color: #35720B"
                      @click="handlePreview(tag)">{{ tag.standSortShow }} {{
                     tag.standNumber
@@ -1940,10 +1940,10 @@
                   </el-form-item>
 
                   <!--    模块结构单元名称     -->
-                  <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+<!--                  <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">-->
-                    <el-input v-model="advanceSearchMapping.DYMC" clearable
+<!--                    <el-input v-model="advanceSearchMapping.DYMC" clearable-->
-                              placeholder="模块结构单元名称"></el-input>
+<!--                              placeholder="模块结构单元名称"></el-input>-->
-                  </el-form-item>
+<!--                  </el-form-item>-->
 
                 </el-col>
                 <el-col :span="12">
@@ -2039,10 +2039,10 @@
                               placeholder="关联模块--卡车VPPS中文名称"></el-input>
                   </el-form-item>
 
-                  <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+<!--                  <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">-->
-                    <el-input v-model="advanceSearchMapping.DYBXH" clearable
+<!--                    <el-input v-model="advanceSearchMapping.DYBXH" clearable-->
-                              placeholder="模块结构单元变型号"></el-input>
+<!--                              placeholder="模块结构单元变型号"></el-input>-->
-                  </el-form-item>
+<!--                  </el-form-item>-->
                 </el-col>
               </el-row>
             </div>
@@ -3712,9 +3712,9 @@ export default {
                 if (field.attrField === 'KCCVPPSBM') {
                   this.defaultCheckedKeys2 = [value]
                 }
-                if (field.attrField === 'DYBXH') {
+                // if (field.attrField === 'DYBXH') {
-                  this.defaultCheckedKeys3 = [value]
+                //   this.defaultCheckedKeys3 = [value]
-                }
+                // }
                 field['value'] = value
                 // 追加用户名称和部门名称和SVPPS名称
                 // if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {

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

@@ -742,48 +742,48 @@
                       ></el-input>
                     </el-form-item>
                   </template>
-                  <template v-else-if="field.attrField === 'DYBXHBUSS'">
+<!--                  <template v-else-if="field.attrField === 'DYBXHBUSS'">-->
-                    <el-form-item
+<!--                    <el-form-item-->
-                      prop="DYBXHBUSS"
+<!--                      prop="DYBXHBUSS"-->
-                      label-width="150px"
+<!--                      label-width="150px"-->
-                      class="add-form-item"
+<!--                      class="add-form-item"-->
-                    >
+<!--                    >-->
-                      <template slot="label">模块结构单元变型号(卡车)</template>
+<!--                      <template slot="label">模块结构单元变型号(卡车)</template>-->
-                      <el-input
+<!--                      <el-input-->
-                        v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号(卡车)"
+<!--                        v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号(卡车)"-->
-                        @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', sarBussionessStandEO.dybxh)">
+<!--                        @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', sarBussionessStandEO.dybxh)">-->
-                      </el-input>
+<!--                      </el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
-                  <template v-else-if="field.attrField === 'DYMCBUSS'">
+<!--                  <template v-else-if="field.attrField === 'DYMCBUSS'">-->
-                    <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMCBUSS" class="add-form-item">
+<!--                    <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMCBUSS" class="add-form-item">-->
-                      <el-input
+<!--                      <el-input-->
-                              v-model="sarBussionessStandEO.DYMCBUSS" disabled
+<!--                              v-model="sarBussionessStandEO.DYMCBUSS" disabled-->
-                              clearable
+<!--                              clearable-->
-                      ></el-input>
+<!--                      ></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
-                  <template v-else-if="field.attrField === 'CYCDYBXHBUSS'">
+<!--                  <template v-else-if="field.attrField === 'CYCDYBXHBUSS'">-->
-                    <el-form-item
+<!--                    <el-form-item-->
-                            prop="CYCDYBXHBUSS"
+<!--                            prop="CYCDYBXHBUSS"-->
-                            label-width="150px"
+<!--                            label-width="150px"-->
-                            class="add-form-item"
+<!--                            class="add-form-item"-->
-                    >
+<!--                    >-->
-                      <template slot="label">模块结构单元变型号(乘用车)</template>
+<!--                      <template slot="label">模块结构单元变型号(乘用车)</template>-->
-                      <el-input
+<!--                      <el-input-->
-                              v-model="sarBussionessStandEO.CYCDYBXHBUSS" placeholder="选择模块结构单元变型号(乘用车)"
+<!--                              v-model="sarBussionessStandEO.CYCDYBXHBUSS" placeholder="选择模块结构单元变型号(乘用车)"-->
-                              @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', sarBussionessStandEO.dybxh)">
+<!--                              @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', sarBussionessStandEO.dybxh)">-->
-                      </el-input>
+<!--                      </el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
-                  <template v-else-if="field.attrField === 'CYCDYMCBUSS'">
+<!--                  <template v-else-if="field.attrField === 'CYCDYMCBUSS'">-->
-                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="CYCDYMCBUSS" class="add-form-item">
+<!--                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="CYCDYMCBUSS" class="add-form-item">-->
-                      <el-input
+<!--                      <el-input-->
-                        v-model="sarBussionessStandEO.CYCDYMCBUSS" disabled
+<!--                        v-model="sarBussionessStandEO.CYCDYMCBUSS" disabled-->
-                        clearable
+<!--                        clearable-->
-                      ></el-input>
+<!--                      ></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
                   <template v-else-if="field.attrField === 'VPPSCNBUSS'">
                     <el-form-item title="关联模块--中文名称" label="关联模块--中文名称" label-width="150px" prop="VPPSCNBUSS" class="add-form-item">
                       <el-input
@@ -1357,18 +1357,18 @@
                           placeholder="请输入关联模块--卡车VPPS编码"
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                          v-model="sarBussionessSearch.DYBXHBUSS"
+<!--                          v-model="sarBussionessSearch.DYBXHBUSS"-->
-                          placeholder="请输入模块结构单元变型号(卡车)"
+<!--                          placeholder="请输入模块结构单元变型号(卡车)"-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                          v-model="sarBussionessSearch.CYCDYBXHBUSS"
+<!--                          v-model="sarBussionessSearch.CYCDYBXHBUSS"-->
-                          placeholder="请输入模块结构单元变型号(乘用车)"
+<!--                          placeholder="请输入模块结构单元变型号(乘用车)"-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
               </el-col>
               <el-col :span="12">
                 <el-form-item
@@ -1410,18 +1410,18 @@
                           placeholder="请输入关联模块--卡车vpps中文名称"
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                          v-model="sarBussionessSearch.DYMCBUSS"
+<!--                          v-model="sarBussionessSearch.DYMCBUSS"-->
-                          placeholder="请输入模块结构单元名称(卡车)"
+<!--                          placeholder="请输入模块结构单元名称(卡车)"-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" class="add-form-item form-item-disabled">-->
-                  <el-input
+<!--                  <el-input-->
-                          v-model="sarBussionessSearch.CYCDYMCBUSS"
+<!--                          v-model="sarBussionessSearch.CYCDYMCBUSS"-->
-                          placeholder="请输入模块结构单元名称(乘用车)"
+<!--                          placeholder="请输入模块结构单元名称(乘用车)"-->
-                  ></el-input>
+<!--                  ></el-input>-->
-                </el-form-item>
+<!--                </el-form-item>-->
               </el-col>
             </el-row>
           </div>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -200,25 +200,25 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
                   {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
                 </a>
                 <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
                   {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
                 </a>
-                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B" class="table-jump" @click="handlePreview(scope.row)">
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #35720B" class="table-jump" @click="handlePreview(scope.row)">
                   {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
                 </a>
                 <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
                   {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
                 </a>
-                <a v-else-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)" >
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)" >
                   {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
                 </a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
                   {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
                 </a>
-                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B" class="table-jump" @click="handlePreview(scope.row)">
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #35720B" class="table-jump" @click="handlePreview(scope.row)">
                   {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
                 </a>
                 <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">
@@ -233,13 +233,13 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
-                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #35720B" @click="handlePreview(scope.row)" class="table-jump">{{
                   scope.row.standName
                   }}</a>
                 <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -254,13 +254,13 @@
               min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standEnName
                   }}</a>
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standEnName
                   }}</a>
-                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #35720B" @click="handlePreview(scope.row)" class="table-jump">{{
                   scope.row.standEnName
                   }}</a>
                 <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -278,13 +278,13 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #35720B">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -296,13 +296,13 @@
               sortable
               label="发布日期">
               <template slot-scope="scope">
-                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
-                <div v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">
+                <div v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #35720B">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else style="color: #333333">
@@ -316,13 +316,13 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     scope.row.SSRQ
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
                     scope.row.SSRQ
                   }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #35720B">{{
                     scope.row.SSRQ
                   }}</span>
                 <span v-else style="color: #333333">{{ scope.row.SSRQ }}</span>
@@ -334,13 +334,13 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     scope.row.XCXSSRQ
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
                     scope.row.XCXSSRQ
                   }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #35720B">{{
                     scope.row.XCXSSRQ
                   }}</span>
                 <span v-else style="color: #333333">{{
@@ -353,13 +353,13 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     scope.row.ZCCSSRQ
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
                     scope.row.ZCCSSRQ
                   }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #35720B">{{
                     scope.row.ZCCSSRQ
                   }}</span>
                 <span v-else style="color: #333333">{{
@@ -729,10 +729,10 @@
                               placeholder="关联模块--卡车VPPS中文名称"></el-input>
                   </el-form-item>
                   <!--    模块结构单元名称     -->
-                  <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+<!--                  <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">-->
-                    <el-input v-model="advanceSearchMapping.DYMC" clearable
+<!--                    <el-input v-model="advanceSearchMapping.DYMC" clearable-->
-                              placeholder="模块结构单元名称"></el-input>
+<!--                              placeholder="模块结构单元名称"></el-input>-->
-                  </el-form-item>
+<!--                  </el-form-item>-->
                 </el-col>
                 <el-col :span="12">
                   <!--            能源类型-->
@@ -810,10 +810,10 @@
                               placeholder="关联模块--卡车VPPS编码"></el-input>
                   </el-form-item>
                   <!-- 模块结构单元变型号 -->
-                  <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+<!--                  <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">-->
-                    <el-input v-model="advanceSearchMapping.DYBXH" clearable
+<!--                    <el-input v-model="advanceSearchMapping.DYBXH" clearable-->
-                              placeholder="模块结构单元变型号"></el-input>
+<!--                              placeholder="模块结构单元变型号"></el-input>-->
-                  </el-form-item>
+<!--                  </el-form-item>-->
                 </el-col>
               </el-row>
             </div>
@@ -1124,55 +1124,55 @@
                       ></el-input>
                     </el-form-item>
                   </template>
-                  <template v-else-if="field.attrField === 'DYBXH'">
+<!--                  <template v-else-if="field.attrField === 'DYBXH'">-->
-                    <el-form-item
+<!--                    <el-form-item-->
-                            prop="DYBXH"
+<!--                            prop="DYBXH"-->
-                            label-width="150px"
+<!--                            label-width="150px"-->
-                            class="add-form-item"
+<!--                            class="add-form-item"-->
-                    >
+<!--                    >-->
-                      <template slot="label">模块结构单元变型号(卡车)</template>
+<!--                      <template slot="label">模块结构单元变型号(卡车)</template>-->
-                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
+<!--                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"-->
-                                clearable
+<!--                                clearable-->
-                                @click.native="choiceZRR4('TRUCK', '模块结构单元(卡车)', sarStandardsInfoEO.dybxh)"></el-input>
+<!--                                @click.native="choiceZRR4('TRUCK', '模块结构单元(卡车)', sarStandardsInfoEO.dybxh)"></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
-                  <template v-else-if="field.attrField === 'DYMC'">
+<!--                  <template v-else-if="field.attrField === 'DYMC'">-->
-                    <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMC" class="add-form-item">
+<!--                    <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMC" class="add-form-item">-->
-                      <el-input
+<!--                      <el-input-->
-                        v-model="sarStandardsInfoEO.DYMC"
+<!--                        v-model="sarStandardsInfoEO.DYMC"-->
-                        disabled
+<!--                        disabled-->
-                        clearable
+<!--                        clearable-->
-                      ></el-input>
+<!--                      ></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
-                  <template v-else-if="field.attrField === 'DYBXHCAR'">
+<!--                  <template v-else-if="field.attrField === 'DYBXHCAR'">-->
-                    <el-form-item
+<!--                    <el-form-item-->
-                            prop="DYBXHCAR"
+<!--                            prop="DYBXHCAR"-->
-                            label-width="150px"
+<!--                            label-width="150px"-->
-                            class="add-form-item"
+<!--                            class="add-form-item"-->
-                    >
+<!--                    >-->
-                      <template slot="label">模块结构单元变型号(乘用车)</template>
+<!--                      <template slot="label">模块结构单元变型号(乘用车)</template>-->
-                      <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
+<!--                      <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"-->
-                                clearable
+<!--                                clearable-->
-                                @click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
+<!--                                @click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
-                  <template v-else-if="field.attrField === 'DYMCCAR'">
+<!--                  <template v-else-if="field.attrField === 'DYMCCAR'">-->
-                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="DYMCCAR" class="add-form-item">
+<!--                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="DYMCCAR" class="add-form-item">-->
-                      <el-input
+<!--                      <el-input-->
-                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
+<!--                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"-->
-                              v-model="sarStandardsInfoEO.DYMCCAR = ''"
+<!--                              v-model="sarStandardsInfoEO.DYMCCAR = ''"-->
-                              disabled
+<!--                              disabled-->
-                              clearable
+<!--                              clearable-->
-                      ></el-input>
+<!--                      ></el-input>-->
-                      <el-input
+<!--                      <el-input-->
-                              v-else
+<!--                              v-else-->
-                              v-model="sarStandardsInfoEO.DYMCCAR"
+<!--                              v-model="sarStandardsInfoEO.DYMCCAR"-->
-                              disabled
+<!--                              disabled-->
-                              clearable
+<!--                              clearable-->
-                      ></el-input>
+<!--                      ></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </template>
+<!--                  </template>-->
                   <template v-else>
                     <custom-input
                       :config="field"
@@ -1579,12 +1579,12 @@
                   size="mini"
                   @close="handleTagClose(tag)"
                   closable>
-                  <a v-if="tag.standYear && textStatusMap[tag.textStatus] === '废止' || textStatusMap[tag.textStatus] === '被代替'"
+                  <a v-if="tag.standYear && textStatusMap[tag.textStatus] === '废止'"
                      class="table-jump" style="color: #F56C6C"
                      @click="handlePreview(tag)">{{ tag.standSortShow }} {{
                     tag.standNumber
                     }}-{{ tag.standYear }}</a>
-                  <a v-else-if="tag.standYear && textStatusMap[tag.textStatus] === '参考' "
+                  <a v-else-if="tag.standYear && textStatusMap[tag.textStatus] === '参考' || textStatusMap[tag.textStatus] === '被代替' "
                      class="table-jump" style="color: #35720B"
                      @click="handlePreview(tag)">{{ tag.standSortShow }} {{
                     tag.standNumber

src/pages/regulatoryRepository/standQA/index.vue

@@ -218,7 +218,7 @@
             width="150"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' " class="table-jump" style="color: #F56C6C"
                  @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                   scope.row.standNumber
                 }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
@@ -238,7 +238,7 @@
             min-width="300"
           >
             <template slot-scope="scope">
-              <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+              <a v-if="textStatusMap[scope.row.textStatus] === '废止' " @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
               <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
@@ -247,7 +247,7 @@
             width="120"
             label="发布日期">
             <template slot-scope="scope">
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
               <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
             </template>
           </el-table-column>
@@ -257,7 +257,7 @@
             label="实施日期">
             <template slot-scope="scope">
               <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
               <span v-else>{{ scope.row.ssrq }}</span>
 
             </template>
@@ -268,7 +268,7 @@
             width="150"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
               <span v-else>{{ scope.row.xcxssrq }}</span>
             </template>
           </el-table-column>
@@ -277,7 +277,7 @@
             width="150"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
               <span v-else>{{ scope.row.zccssrq }}</span>
             </template>
           </el-table-column>
@@ -286,7 +286,7 @@
             width="110"
             label="文本状态">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
               <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -299,7 +299,7 @@
             width="150"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
+              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
                 {{scope.row.standSortShow}} {{ scope.row.standNumber }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
               <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
                 {{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
@@ -316,7 +316,7 @@
             min-width="300"
           >
             <template slot-scope="scope">
-              <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+              <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                   scope.row.standName
                 }}</a>
               <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -332,7 +332,7 @@
             width="120"
             label="发布日期">
             <template slot-scope="scope">
-              <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+              <div v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">
                 {{ formatIssueDate(scope.row.issueTime) }}
               </div>
               <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
@@ -349,7 +349,7 @@
             label="实施日期">
             <template slot-scope="scope">
               <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                   scope.row.ssrq
                 }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -364,7 +364,7 @@
             width="150"
             label="新车型实施日期">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.xcxssrq
                   }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -380,7 +380,7 @@
             width="150"
             label="在产车实施日期">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     scope.row.zccssrq
                   }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -396,7 +396,7 @@
             width="110"
             label="文本状态">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{

src/pages/regulatoryRepository/standQA/index2.vue

@@ -405,7 +405,7 @@
             width="150"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" class="table-jump" style="color: #F56C6C"
                  @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                   scope.row.standNumber
                 }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
@@ -425,7 +425,7 @@
             min-width="300"
           >
             <template slot-scope="scope">
-              <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+              <a v-if="textStatusMap[scope.row.textStatus] === '废止'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
               <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
@@ -434,7 +434,7 @@
             width="120"
             label="发布日期">
             <template slot-scope="scope">
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
               <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
             </template>
           </el-table-column>
@@ -444,7 +444,7 @@
             label="实施日期">
             <template slot-scope="scope">
               <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
               <span v-else>{{ scope.row.ssrq }}</span>
 
             </template>
@@ -455,7 +455,7 @@
             width="150"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
               <span v-else>{{ scope.row.xcxssrq }}</span>
             </template>
           </el-table-column>
@@ -464,7 +464,7 @@
             width="150"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
               <span v-else>{{ scope.row.zccssrq }}</span>
             </template>
           </el-table-column>
@@ -473,7 +473,7 @@
             width="110"
             label="文本状态">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
               <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -486,7 +486,7 @@
             width="150"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
+              <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
                 {{scope.row.standSortShow}} {{ scope.row.standNumber }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
               <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
                 {{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ?  '-' + scope.row.standYear : '' }}</a>
@@ -503,7 +503,7 @@
             min-width="300"
           >
             <template slot-scope="scope">
-              <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+              <a v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                   scope.row.standName
                 }}</a>
               <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -519,7 +519,7 @@
             width="120"
             label="发布日期">
             <template slot-scope="scope">
-              <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+              <div v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">
                 {{ formatIssueDate(scope.row.issueTime) }}
               </div>
               <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
@@ -536,7 +536,7 @@
             label="实施日期">
             <template slot-scope="scope">
               <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-              <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+              <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                   scope.row.ssrq
                 }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -551,7 +551,7 @@
             width="150"
             label="新车型实施日期">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.xcxssrq
                   }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -567,7 +567,7 @@
             width="150"
             label="在产车实施日期">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止'" style="color: #F56C6C">{{
                     scope.row.zccssrq
                   }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
@@ -583,7 +583,7 @@
             width="110"
             label="文本状态">
             <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' " style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
               <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{

src/pages/searchCenter/pages/advancedSearch.vue

@@ -341,11 +341,11 @@
                       ></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+<!--                  <el-col :span="12">-->
-                    <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+<!--                    <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">-->
-                      <el-input v-model="standForm.dybxh" placeholder="选择模块结构单元变型号" clearable></el-input>
+<!--                      <el-input v-model="standForm.dybxh" placeholder="选择模块结构单元变型号" clearable></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </el-col>
+<!--                  </el-col>-->
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
@@ -864,16 +864,16 @@
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
+<!--                  <el-col :span="12">-->
-                    <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--                    <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-                      <el-input v-model.trim="standForm.DYBXHBUSS" placeholder="选择模块结构单元变型号" clearable></el-input>
+<!--                      <el-input v-model.trim="standForm.DYBXHBUSS" placeholder="选择模块结构单元变型号" clearable></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </el-col>
+<!--                  </el-col>-->
-                  <el-col :span="12">
+<!--                  <el-col :span="12">-->
-                    <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--                    <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-                      <el-input v-model.trim="standForm.DYMCBUSS" placeholder="模块结构单元名称" clearable></el-input>
+<!--                      <el-input v-model.trim="standForm.DYMCBUSS" placeholder="模块结构单元名称" clearable></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </el-col>
+<!--                  </el-col>-->
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
@@ -1055,8 +1055,8 @@
                         width="180"
                         :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
                   <template slot-scope="scope">
-                    <div :style="selectIndex === 'BUSINESS_STAND' || selectIndex === 'INLAND_LAWS' ? (scope.row.textStatusBussName === '参考' ? 'color: #E6A23C;' :
+                    <div :style="selectIndex === 'BUSINESS_STAND' || selectIndex === 'INLAND_LAWS' ? (scope.row.textStatusBussName === '参考'|| scope.row.textStatusBussName === '被代替' ? 'color: #E6A23C;' :
-                      (scope.row.textStatusBussName === '作废' || scope.row.lawsTextStateName === '作废' || scope.row.textStatusBussName === '被代替' ? 'color: #F56C6C;' : '')) : ''">
+                      (scope.row.textStatusBussName === '作废' || scope.row.lawsTextStateName === '作废'  ? 'color: #F56C6C;' : '')) : ''">
                       {{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}
                     </div>
                   </template>

src/pages/searchCenter/pages/advancedSearchExternal.vue

@@ -341,11 +341,11 @@
                       ></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+<!--                  <el-col :span="12">-->
-                    <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+<!--                    <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">-->
-                      <el-input v-model="standForm.dybxh" placeholder="选择模块结构单元变型号" clearable></el-input>
+<!--                      <el-input v-model="standForm.dybxh" placeholder="选择模块结构单元变型号" clearable></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </el-col>
+<!--                  </el-col>-->
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
@@ -864,16 +864,16 @@
                   </el-col>
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
-                  <el-col :span="12">
+<!--                  <el-col :span="12">-->
-                    <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--                    <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-                      <el-input v-model.trim="standForm.DYBXHBUSS" placeholder="选择模块结构单元变型号" clearable></el-input>
+<!--                      <el-input v-model.trim="standForm.DYBXHBUSS" placeholder="选择模块结构单元变型号" clearable></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </el-col>
+<!--                  </el-col>-->
-                  <el-col :span="12">
+<!--                  <el-col :span="12">-->
-                    <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--                    <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-                      <el-input v-model.trim="standForm.DYMCBUSS" placeholder="模块结构单元名称" clearable></el-input>
+<!--                      <el-input v-model.trim="standForm.DYMCBUSS" placeholder="模块结构单元名称" clearable></el-input>-->
-                    </el-form-item>
+<!--                    </el-form-item>-->
-                  </el-col>
+<!--                  </el-col>-->
                 </el-row>
                 <el-row type="flex" justify="space-around" class="code-row-bg">
                   <el-col :span="12">
@@ -1055,8 +1055,8 @@
                         width="180"
                         :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
                   <template slot-scope="scope">
-                    <div :style="selectIndex === 'BUSINESS_STAND' || selectIndex === 'INLAND_LAWS' ? (scope.row.textStatusBussName === '参考' ? 'color: #E6A23C;' :
+                    <div :style="selectIndex === 'BUSINESS_STAND' || selectIndex === 'INLAND_LAWS' ? (scope.row.textStatusBussName === '参考' || scope.row.textStatusBussName === '被代替' ? 'color: #E6A23C;' :
-                      (scope.row.textStatusBussName === '作废' || scope.row.lawsTextStateName === '作废' || scope.row.textStatusBussName === '被代替' ? 'color: #F56C6C;' : '')) : ''">
+                      (scope.row.textStatusBussName === '作废' || scope.row.lawsTextStateName === '作废'  ? 'color: #F56C6C;' : '')) : ''">
                       {{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}
                     </div>
                   </template>

src/pages/searchCenter/pages/standardSearch.vue

@@ -151,8 +151,8 @@
                                                 min-width="12%">
                                             <template slot-scope="scope">
                                                 <!--                                                <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>-->
-                                                <div :class="selectIndex === 'enterprise' || selectIndex === 'laws' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
+                                                <div :class="selectIndex === 'enterprise' || selectIndex === 'laws' ? (scope.row.textStatusBussName === '参考' || scope.row.textStatusBussName === '被代替' ? 'yellowClass' :
-                                                (scope.row.textStatusBussName || scope.row.lawsTextStateName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
+                                                (scope.row.textStatusBussName || scope.row.lawsTextStateName === '作废'  ? 'redClass' : '')) : ''">
                                                     {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}</div>
                                             </template>
                                         </el-table-column>
@@ -979,11 +979,21 @@
                     if (data.list && data.list.length > 0) {
                         // 获取数值
                         let resultdata = data.list[0]['groupdata']
+                        let NYLXCLASS = resultdata['NYLXCLASS'] || {}
+                        let NYLX = resultdata['NYLX'] || {}
+                        if (Object.keys(NYLX).length > 0 && Object.keys(NYLXCLASS).length === 0) {
+                          NYLXCLASS = NYLX
+                        }
+                        resultdata['NYLXCLASS'] = NYLXCLASS
                         for (let i = 0; i < seniortype.length; i++) {
                             let nowdata = [{}]
+
                             if (typeof this.searchOptions[seniortype[i]] !== 'undefined') {
                                 nowdata = this.searchOptions[seniortype[i]].options
                             }
+                            if (typeof this.searchOptions['NYLXCLASS'] !== 'undefined' && seniortype[i] === 'NYLX') {
+                                nowdata = this.searchOptions['NYLXCLASS'].options
+                            }
                             let renameType
                             if (seniortype[i] === 'selectIndex') {
                                 for (let j = 0; j < nowdata.length; j++) {
@@ -1001,19 +1011,32 @@
                                     renameType = seniortype[i]
                                 }
                                 let resultsubdata = resultdata[renameType] || {}
-                                console.log(resultsubdata)
+                                console.log('sssss',resultsubdata)
                                 let countAll = 0
                                 if (nowdata) {
-                                    console.log(nowdata)
+                                    if (renameType === 'NYLX'){
                                         for (let ji = 0; ji < nowdata.length; ji++) {
-                                        if (resultsubdata[nowdata[ji].value] === undefined) {
+                                            if (resultsubdata[nowdata[ji].label] === undefined) {
+                                                nowdata[ji].number = 0
+                                            } else {
+                                                nowdata[ji].number = resultsubdata[nowdata[ji].label]
+                                                countAll += Number(resultsubdata[nowdata[ji].label])
+                                            }
+                                            console.log('alllllllllllllllllllllllll' + countAll)
+                                        }
+                                    }else {
+                                        for (let ji = 0; ji < nowdata.length; ji++) {
+                                            if (resultsubdata[nowdata[ji].label] === undefined) {
                                                 nowdata[ji].number = 0
                                             } else {
                                                 nowdata[ji].number = resultsubdata[nowdata[ji].value]
                                                 countAll += Number(resultsubdata[nowdata[ji].value])
                                             }
                                         }
+                                    }
                                     nowdata[0].number = countAll
+                                    console.log('aaaaa',nowdata)
+
                                 }
                             }
                         }

src/sysConfig/index.js

@@ -8,12 +8,8 @@
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.1.42'
 // const devInterfacePORT = '9999'
-// const devIp = 'localhost'
+const devIp = '39.98.140.126'
-// const devInterfacePORT = '10086'
+const devInterfacePORT = '4202'
-// const devIp = '39.98.140.126'
-// const devInterfacePORT = '4201'
-const devIp = 'localhost'
-const devInterfacePORT = '10086'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
 // 配置 idm 认证
@@ -50,8 +46,6 @@ const processPort = '17210'
 // 生产环境配置
 const prodIp = '39.98.140.126'
 const prodInterfacePORT = '4201'
-// const prodIp = 'localhost'
-// const prodInterfacePORT = '10086'
 // const prodIp = 'slrs.foton.com.cn'
 // const prodInterfacePORT = ''