diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
index fe12504..ddf7fdc 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
@@ -25,10 +25,10 @@
           <!--   适用市场  -->
           <a-col :md="6" :sm="8">
             <a-form-item :label="$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.applicableMarket')">
-              <j-dict-select-tag
+              <j-multi-select-tag
                 :placeholder="$t('pleaseSelect') + $t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.applicableMarket')"
                 v-model="queryParam.applicableMarket"
-                dict-code="market_state"></j-dict-select-tag>
+                dict-code="market_state"></j-multi-select-tag>
             </a-form-item>
           </a-col>
 
@@ -159,9 +159,17 @@ export default {
         list: '/assessment/lawsConformityAssessment/page',
         exportXlsUrl: '/assessment/lawsConformityAssessment/exportXls'
       },
-      needFilterTableBtn: true
+      needFilterTableBtn: true,
+      disableMixinCreated: true
     }
   },
+  created () {
+    // 标准主计划跳转进来携带标准+适用市场
+    this.$set(this.queryParam, 'applicableMarket', this.$route.query.applicableMarket)
+    this.$set(this.queryParam, 'standardName', this.$route.query.standardName)
+    this.$set(this.queryParam, 'standardNumber', this.$route.query.standardNumber)
+    this.loadData()
+  },
   methods: {
     toDetail (record) {
       const path = '/standardRegulationLibrary/foreignStandardDetailPage'
diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue
index 1dc3517..1817dff 100644
--- a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue
+++ b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue
@@ -22,7 +22,7 @@
                                         type="radio"
                                         @listChange="handleStandardNumberListChange"
                                         :select-only="true"
-                                        :disabled="disableSubmit"
+                                        :disabled="disableSubmit || isEdit"
                                         disabledSourceSearch
                                         v-decorator="['base.standardNumber', validatorRules.standardNumber]" />
                   </a-form-item>
@@ -38,6 +38,7 @@
                     <!--</a-select>-->
                     <market-regulations-list-selection type="radio"
                                                        selectOnly
+                                                       :disabled="disableSubmit || isEdit"
                                                        @listChange="handleChangeApplicableMarket"
                                                        :nameStr="model.applicableMarket_dictText"
                                                        :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.standardMasterPlan.applicableMarket')"
@@ -213,10 +214,12 @@
                 <!-- 交付物 -->
                 <a-col :span="12">
                   <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.deliverables')">
-                    <a-input :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
+                    <template v-if="data[2] && Array.isArray(data[2].processAllList)">
+                      <a v-for="item in data[2].processAllList" :key="item.id" @click="toProcessDetail(item)">{{item.prcNum}}</a>
+                    </template>
+                    <a-input v-else :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
                              :maxLength="50" disabled
                              v-decorator="['data[2].deliverableFileId']" />
-                    <!--<j-upload v-decorator="['data[2].deliverableFileId', validatorRules.deliverableFileId]" return-id multiple />-->
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -275,10 +278,10 @@
                 <!-- 交付物 -->
                 <a-col :span="12">
                   <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.deliverables')">
-                    <a-input :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
+                    <a v-if="data[3].deliverableFileId" @click="previewStandardResolutionSheet(data[3].deliverableFileId)"></a>
+                    <a-input v-else :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
                              :maxLength="50" disabled
                              v-decorator="['data[3].deliverableFileId']" />
-                    <!--<j-upload v-decorator="['data[3].deliverableFileId', validatorRules.deliverableFileId]" return-id multiple />-->
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -397,7 +400,7 @@
                   </a-form-item>
                 </a-col>
                 <!-- 交付物 -->
-                <a-col :span="12" v-show="!isShow">
+                <a-col :span="12" v-show="isAdd">
                   <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.deliverables')">
                     <a-input :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
                              :maxLength="50" disabled
@@ -406,10 +409,13 @@
                   </a-form-item>
                 </a-col>
                 <!-- 查看市场清单 -->
-                <a-col :span="12" :offset="12" v-show="isShow">
+                <a-col :span="12" :offset="12" v-show="!isAdd">
                   <a-form-item :wrapper-col="{span:22}">
                     <div style="text-align: right">
-                      <a-button type="primary" @click="handleViewMarketList">{{ $t('standardRegulationLibrary.standardMasterPlan.viewMarketList') }}</a-button>
+                      <a-button type="primary" @click="handleViewMarketList"
+                                :disabled="!model.marketStandardId">
+                        {{ $t('standardRegulationLibrary.standardMasterPlan.viewMarketList') }}
+                      </a-button>
                     </div>
                   </a-form-item>
                 </a-col>
@@ -468,7 +474,7 @@
                   </a-form-item>
                 </a-col>
                 <!-- 交付物 -->
-                <a-col :span="12" v-show="!isShow">
+                <a-col :span="12" v-show="isAdd">
                   <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.deliverables')">
                     <a-input :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
                              :maxLength="50" disabled
@@ -477,10 +483,13 @@
                   </a-form-item>
                 </a-col>
                 <!-- 查看排查结果 -->
-                <a-col :span="12" :offset="12" v-show="isShow">
+                <a-col :span="12" :offset="12" v-show="!isAdd">
                   <a-form-item :wrapper-col="{span:22}">
                     <div style="text-align: right">
-                      <a-button type="primary" @click="handleViewTroubleshootingResults">{{ $t('standardRegulationLibrary.standardMasterPlan.viewTroubleshootingResults') }}</a-button>
+                      <a-button type="primary" @click="handleViewTroubleshootingResults"
+                                :disabled="!model.standardId">
+                        {{ $t('standardRegulationLibrary.standardMasterPlan.viewTroubleshootingResults') }}
+                      </a-button>
                     </div>
                   </a-form-item>
                 </a-col>
@@ -593,12 +602,14 @@
       <a-button @click="handleCancel">{{ $t('cancel') }}</a-button>
       <a-button v-if="!disableSubmit" @click="handleSubmit" type="primary" :loading="confirmLoading">{{ $t('submit') }}</a-button>
     </div>
+    <!--    标准分解单-->
+    <standard-resolution-sheet-modal ref="standardResolutionSheetModal" />
   </a-drawer>
 </template>
 
 <script>
 import StandardSelection from '@comp/selection/StandardSelection'
-import { StandardSource, YesOrNoEnum } from '@/enums/commonEnums'
+import { Process, ProcessKey, ProcessType, StandardSource, YesOrNoEnum } from '@/enums/commonEnums'
 import UserSelection from '@comp/selection/UserSelection'
 import {
   addStandardMasterPlan,
@@ -606,10 +617,12 @@ import {
   getStandardMasterPlanById
 } from '@api/standardRegulationLibraryApi'
 import MarketRegulationsListSelection from '@comp/selection/MarketRegulationsListSelection'
+import StandardResolutionSheetModal
+  from '@views/standardRegulationLibrary/foreignStandard/detail/modules/StandardResolutionSheetModal'
 
 export default {
   name: 'StandardMasterPlanModal',
-  components: { MarketRegulationsListSelection, UserSelection, StandardSelection },
+  components: { StandardResolutionSheetModal, MarketRegulationsListSelection, UserSelection, StandardSelection },
   data () {
     return {
       StandardSource,
@@ -693,9 +706,23 @@ export default {
     // 是否查看
     isShow () {
       return this.modelType === 'view'
+    },
+    // 是否新增
+    isAdd () {
+      return this.modelType === 'add'
+    },
+    // 是否编辑
+    isEdit () {
+      return this.modelType === 'edit'
     }
   },
   methods: {
+    /**
+     * 查看标准分解单
+     */
+    previewStandardResolutionSheet (id) {
+      this.$refs.standardResolutionSheetModal.open(id)
+    },
     // 修改
     handleChangeApplicableMarket (list) {
       console.log(list[0], '选择的清单')
@@ -772,6 +799,8 @@ export default {
             params.lawsStandardMasterPlanVO.marketStandardId = this.selectApplicableMarket.id
             // 适用市场
             params.lawsStandardMasterPlanVO.applicableMarket = this.selectApplicableMarket.country
+            // 版本标识
+            params.versionFlag = this.selectApplicableMarket.versionFlag
           }
           params.lawsStandardMasterPlanSublistList = this.data.map((_, index) => {
             const result = Object.assign({}, _, values.data[index])
@@ -821,17 +850,69 @@ export default {
       const [index, field] = fieldName.split(',')
       this.data[index][field + '_dictText'] = value
     },
+    /**
+     * 跳转流程详情
+     */
+    toProcessDetail (record) {
+      // 跳转到流程详情页
+      let processKey = ''
+      switch (record.prcType + '') {
+        // 新法规导入流程
+        case ProcessType.NEW_REGULATIONS_IMPORT.value:
+          processKey = ProcessKey.NEW_REGULATIONS_IMPORT.value
+          break
+        // 标准解读流程
+        case ProcessType.STANDARD_INTERPRETATION_PROCESS.value:
+          processKey = ProcessKey.STANDARD_INTERPRETATION_PROCESS.value
+          break
+        // 法规符合性排查流程
+        case ProcessType.REGULATORY_COMPLIANCE_CHECK.value:
+          processKey = ProcessKey.REGULATORY_COMPLIANCE_CHECK.value
+          break
+        // 市场清单发布流程
+        case ProcessType.MARKET_LIST_RELEASE.value:
+          processKey = ProcessKey.MARKET_LIST_RELEASE.value
+          break
+      }
+      this.$router.push({
+        path: '/workCenter/processCenter/detail/processDetail',
+        query: {
+          processKey: processKey,
+          processDefinitionId: record.processDefinitionId,
+          processInstanceId: record.processInstanceId,
+          // 流程监控并且是已撤回，详情不查进行中的
+          source: 'monitorList',
+          prcStatus: record.prcStatus,
+          detailFrom: Process.MONITOR.value
+        }
+      })
+    },
     /**
      * 查看市场清单
      */
     handleViewMarketList () {
       console.log('查看市场清单')
+      this.$router.push({
+        path: '/standardRegulationLibrary/marketRegulationsList/marketRegulationsDetailPage',
+        query: {
+          title: this.$t('view'),
+          ids: this.model.marketStandardId
+        }
+      })
     },
     /**
      * 查看排查结果
      */
     handleViewTroubleshootingResults () {
       console.log('查看排查结果')
+      this.$router.push({
+        path: '/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/regulatoryComplianceAssessmentList',
+        query: {
+          standardName: this.model.standardName,
+          standardNumber: this.model.standardNumber,
+          applicableMarket: this.model.applicableMarket
+        }
+      })
     },
     /**
      * 信息输入-是否涉及改变