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

src/components/CustomFormComponents/InputForStandardsForEnterprise.vue

@@ -138,7 +138,7 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
         <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>

src/components/navMenu/index.vue

@@ -135,11 +135,11 @@ export default {
             // // //   title: '本地产品/项目库',
             // // //   path: '/localProductsOrProjectLibrary'
             // // // },
-            /*{
+            {
               title: '企业标准库',
               path: '/enterpriseStandardDatabase',
-              menuId: '01ed8f752748227777b3572d56ee9ab5'
+              menuId: '7feeb73929c25a6f1fd67952704ec02b'
-            },*/
+            },
             // {
             //   title: '企标制修订计划',
             //   path: '/enterBSysRevPlanManaLib',

src/pages/details/otherBussStandardDetails/index.vue

@@ -3,52 +3,11 @@
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
     <!--title 标题-->
     <div class="details-header">
-      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情</span>
+      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
     </div>
     <!--主体内容-->
     <div class="details-content">
       <div class="details-content-modular basic-information">
-        <div class="modular-header">
-          <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>
-          </div>
-          <div class="modular-header-btn">
-            <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
-            <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
-            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
-          </div>
-        </div>
-        <div class="basic-information-content">
-          <p style="color: #C42626;"><label>企标编号：</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
-          <p><label>中文名称：</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
-          <p><label>英文名称：</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
-          <p>
-            <label
-              title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
-            >标准状态<i class="el-icon-warning-outline"></i>：</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
-          </p>
-          <p><label>发布日期：</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-          <p><label>标准实施日期：</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
-          <p><label>代替企标编号：</label>
-            <span v-if="sarStandardsInfoEO.replaceStandNum != null && sarStandardsInfoEO.replaceStandNum !== '' && sarStandardsInfoEO.replaceStandNum.split(',').length > 0">
-            <span v-for="(item, index) in sarStandardsInfoEO.replaceStandNum.split(',')" :key="index">
-              <a @click="showReplaceLawsInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
-            </span>
-            </span>
-            <span v-else>
-            {{'-' }}
-            </span>
-          </p>
-          <p><label>被代替企标编号：</label>
-            <span v-if="sarStandardsInfoEO.replacedStandNum != null && sarStandardsInfoEO.replacedStandNum !== '' && sarStandardsInfoEO.replacedStandNum.split(',').length > 0">
-            <span v-for="(item, index) in sarStandardsInfoEO.replacedStandNum.split(',')" :key="index">
-              <a @click="showReplaceLawsInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
-            </span>
-            </span>
-            <span v-else>
-            {{'-' }}
-            </span>
-          </p>
-        </div>
       </div>
       <div
         class="details-content-modular clearfix"
@@ -56,10 +15,36 @@
         :key="index"
         v-if="item.isShowImp === '0'"
       >
-        <div class="modular-header">
+        <div class="modular-header" v-if="item.label !== '基础信息'">
-          <div class="modular-header-title"><i class="icon-modular-title" /><span>{{ item.label }}</span></div>
+          <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
+        </div>
+        <div class="modular-header" v-if="item.label === '基础信息'">
+          <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
+          <!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>-->
+          <!--              </div>-->
+          <div class="modular-header-btn">
+            <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
+            <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
+            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
+          </div>
         </div>
         <div class="modular-content">
+          <template v-if = "item.label === '基础信息'">
+            <div class="details-content-modular basic-information" style="margin-bottom: 0">
+              <div class="basic-information-content">
+              <p style="color: #C42626;"><label style=" margin-right: 164px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
+              <p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
+              <p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
+              <p>
+                <label style=" margin-right: 132px;"
+                        title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
+                >文本状态<i class="el-icon-warning-outline"></i></label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
+              </p>
+              <p><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
+              <p><label style=" margin-right: 115px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
+            </div>
+            </div>
+          </template>
           <template
             v-for="(child, childIndex) in item.child"
             v-if="child.isShowImp === '0'"
@@ -2032,8 +2017,8 @@ export default {
     })
     Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
       const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
-      const relatedPlansRes = await this.queryRelatedPlans()
+      // const relatedPlansRes = await this.queryRelatedPlans()
-      const relatedPlans = relatedPlansRes.list
+      // const relatedPlans = relatedPlansRes.list
       formFieldList.forEach((field) => {
         displayLocation.forEach((location) => {
           location.isShowImp = '0'
@@ -2114,7 +2099,7 @@ export default {
   /deep/.details-content{
     /*padding: 0 67px;*/
     .details-content-modular{
-      margin-bottom: 20px;
+      /*margin-bottom: 20px;*/
       .modular-header{
         display: flex;
         align-items: center;
@@ -2186,8 +2171,8 @@ export default {
       }
       .basic-information-content{
         color: #333333;
-        font-size: 18px;
+        font-size: 16px;
-        font-weight: 400;
+        /*font-weight: 400;*/
         .standard-text{
           height: 50px;
           line-height: 50px;
@@ -2281,7 +2266,7 @@ export default {
       }
     }
     .basic-information{
-      border-top: 2px dashed #D1D1D1;
+      /*border-top: 2px dashed #D1D1D1;*/
       border-bottom: 2px dashed #D1D1D1;
       .modular-header{
         height: 60px;
@@ -2291,6 +2276,7 @@ export default {
         & > p{
           min-height: 55px;
           line-height: 55px;
+          border-bottom: 1px solid #E5E5E5;
         }
       }
     }

src/pages/details/otherStandardDetails/index.vue

@@ -44,7 +44,7 @@
               <div class="basic-information-content">
                 <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
                 <p style="color: #C42626;">
-                  <label style=" margin-right: 150px;">标准号</label>
+                  <label style=" margin-right: 164px;">标准号</label>
                   <span v-if="sarStandardsInfoEO.standYear">{{
                       sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
                     }}</span>
@@ -70,7 +70,7 @@
                     sarStandardsInfoEO.issueTime || '-'
                   }}</span></p>
                 <p>
-                  <label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{
+                  <label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
                     sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
                   }}</span>
                 </p>
@@ -3023,8 +3023,8 @@ export default {
 
       .basic-information-content {
         color: #333333;
-        font-size: 18px;
+        font-size: 16px;
-        font-weight: 400;
+        /*font-weight: 400;*/
 
         .standard-text {
           height: 50px;
@@ -3147,8 +3147,8 @@ export default {
 
       .basic-information-content {
         color: #333333;
-        font-size: 18px;
+        font-size: 16px;
-        font-weight: 400;
+        /*font-weight: 400;*/
 
         .standard-text {
           height: 50px;

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

@@ -1360,11 +1360,12 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-               if(res.message === '修改成功'){
+                this.$message.success('修改成功')
-                  this.$router.push({
+                this.$router.push({
-                        name: 'AccessStandardsAndRegulations'
+                  name: 'AccessStandardsAndRegulations'
-                      })
+                })
-                }
+              } else {
+                this.$message.error('已存在此国家/地区清单，修改失败')
               }
             }, e => {
             })

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -1304,6 +1304,7 @@ export default {
             }, res => {
               if (res.ok) {
                 this.isNext = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })

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

@@ -18,7 +18,6 @@
                   :data="treeList"
                   highlight-current
                   @node-click="treeClick"
-                  :filter-node-method="filterNode"
                   default-expand-all
                   :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
@@ -180,22 +179,25 @@
                   <el-input v-model="sarBussionessSearch.numberName" clearable placeholder="根据标准号/名称查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"/>
                 </el-formItem>
                 <el-form-item class="search-item btn-box">
-                  <el-button
+                    <el-button
-                    :loading="searching"
+                            :loading="searching"
-                    icon="el-icon-search"
+                            type="primary"
-                    type="primary"
+                            size="mini"
-                    class="common-button-primary"
+                            class="common-button-primary"
-                    round
+                            v-btn-permission=""
-                    @click="getBussionStandTableBtn(sarBussionessSearch)"
+                            @click="getBussionStandTableBtn(sarBussionessSearch)">
-                    :title="goSearch">
+                        查询
-                  </el-button>
+                    </el-button>
-                  <el-button
+                    <el-button
-                    class="common-button-default"
+                            size="mini"
-                    icon="el-icon-refresh-left"
+                            class="common-button-default"
-                    round
+                            v-btn-permission=""
-                    @click="clearAllSearch('sarBussionessSearch')"
+                            @click="clearAllSearch('sarBussionessSearch')">清空
-                  ></el-button>
+                    </el-button>
-<!--                  <el-button type="primary" class="common-button-primary" round  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>-->
+                    <el-button size="mini" type="primary" class="common-button-primary"
+                               v-btn-permission="" @click="selectMoreBtn"><i
+                            class="iconfont">&#xe7a5;</i>高级检索
+                    </el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -312,18 +314,6 @@
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="standStatusShow"
-            label="标准状态"
-            width="110"
-          >
-            <template slot="header" slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定" placement="bottom">
-                <span>标准状态 <i class="el-icon-warning-outline"></i></span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
           <el-table-column
             prop="issueTime"
             label="发布日期"
@@ -345,41 +335,13 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="主起草人"
+                    show-overflow-tooltip
-            width="100"
+                    sortable
-          >
+                    prop="standStatusShow"
-            <template slot-scope="scope">
+                    label="文本状态"
-              {{ getQCRName(scope.row) }}
+                    width="110"
-            </template>
+            >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="attrInfoMap.ZRBMName"
-            label="起草部门">
-          </el-table-column>
-
-          <el-table-column
-            show-overflow-tooltip
-            prop="attrInfoMap.SVPPSName"
-            label="SVPPS"
-            width="120"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="replaceStandNum"
-            label="代替企标编号"
-            width="210"
-          >
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="replacedStandNum"
-            label="被代替标准编号"
-            width="210"
-          >
-          </el-table-column>
-
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
@@ -431,93 +393,92 @@
             :rules="sarBussionessStandRules"
             class="label-input-form"
           >
-<!--            <el-form-item label="企标类别" prop="standSort" label-width="150px" class="add-form-item">-->
+
-<!--              <el-select v-model="sarBussionessStandEO.standSort" filterable>-->
-<!--                <el-option-->
-<!--                  v-for="item in standSortOptions"-->
-<!--                  placeholder="请选择"-->
-<!--                  :key="item.value"-->
-<!--                  :value="item.value"-->
-<!--                  :label="item.label"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-            <el-form-item
-              label="企标编号"
-              prop="standCode"
-              label-width="150px"
-              class="add-form-item form-item-disabled"
-            >
-              <el-input
-                v-model="sarBussionessStandEO.standCode"
-                :maxlength="100"
-                placeholder="请输入企标编号"
-                clearable
-                readonly
-                disabled
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="中文名称" prop="standName" label-width="150px" class="add-form-item">
-              <el-input v-model="sarBussionessStandEO.standName"
-                        placeholder="请输入标准名称"
-                        clearable></el-input>
-            </el-form-item>
-            <el-form-item label="英文名称" prop="standEnName" label-width="150px" class="add-form-item">
-              <el-input v-model="sarBussionessStandEO.standEnName"
-                        placeholder="请输入标准英文名称"
-                        clearable></el-input>
-            </el-form-item>
-            <el-form-item title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定" prop="standStatus" label-width="150px" class="add-form-item">
-              <template slot="label">标准状态<i class="el-icon-warning-outline"></i></template>
-              <el-select
-                v-model="sarBussionessStandEO.standStatus"
-                placeholder="请选择标准状态"
-                clearable>
-                <el-option
-                  v-for="opt in standStateOptions"
-                  :key="opt.value"
-                  :value="opt.value === undefined ? '' :opt.value"
-                  :label="opt.label"
-                  :disabled="opt.value !== 'AY9L9FMSEW' && opt.value !== standStatus"
-                >
-                  {{ opt.label }}
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="发布日期" prop="issueTime" label-width="150px" class="add-form-item">
-              <el-datePicker v-model="sarBussionessStandEO.issueTime"
-                             :editable="false"
-                             placeholder="请选择发布日期"></el-datePicker>
-            </el-form-item>
-            <el-form-item label="标准实施日期" prop="putTime" label-width="150px" class="add-form-item">
-              <el-datePicker v-model="sarBussionessStandEO.putTime"
-                             :editable="false"
-                             placeholder="请选择实施日期"
-                             clearable
-              ></el-datePicker>
-            </el-form-item>
-            <custom-input-for-standards
-              :config="{
-                attrName: '代替企标编号',
-                attrField: 'replaceStandNum',
-              }"
-              v-model="sarBussionessStandEO.replaceStandNum"
-              :disabled="formdisableflag"
-            ></custom-input-for-standards>
 <!--            <custom-input-for-standards-->
 <!--              :config="{-->
-<!--                attrName: '被代替企标编号',-->
+<!--                attrName: '代替企标编号',-->
-<!--                attrField: 'replacedStandNum',-->
+<!--                attrField: 'replaceStandNum',-->
 <!--              }"-->
-<!--              v-model="sarBussionessStandEO.replacedStandNum"-->
+<!--              v-model="sarBussionessStandEO.replaceStandNum"-->
 <!--              :disabled="formdisableflag"-->
 <!--            ></custom-input-for-standards>-->
             <!--      动态数据-->
             <template v-for="(displayLocation, index) in dynamicFormField">
-              <el-col :span="24" v-if="displayLocation.label !== '关联信息'" :key="index">
+              <el-col :span="24" :key="index">
-                <div class="divider-line">{{ displayLocation.label }}</div>
+                  <div class="divider-line">{{ displayLocation.label }}</div>
               </el-col>
-              <template v-for="field in displayLocation.child">
+                <template v-if="displayLocation.label === '基础信息'" >
+                    <el-form-item label="企标类别" prop="standSort" label-width="150px" class="add-form-item">
+                        <el-select v-model="sarBussionessStandEO.standSort" filterable>
+                            <el-option
+                                    v-for="item in standSortOptions"
+                                    placeholder="请选择"
+                                    :key="item.value"
+                                    :value="item.value"
+                                    :label="item.label"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item
+                            label="企标编号"
+                            prop="standCode"
+                            label-width="150px"
+                            class="add-form-item form-item-disabled"
+                    >
+                        <el-input
+                                v-model="sarBussionessStandEO.standCode"
+                                :maxlength="100"
+                                placeholder="请输入企标编号"
+                                clearable
+                                readonly
+                                disabled
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="标准年份" prop="standYear" label-width="150px" class="add-form-item">
+                        <el-input v-model="sarBussionessStandEO.standYear"
+                                  placeholder="请输入标准年份"
+                                  value-format="yyyy-MM-dd"
+                                  clearable></el-input>
+                    </el-form-item>
+                    <el-form-item label="企标名称" prop="standName" label-width="150px" class="add-form-item">
+                        <el-input v-model="sarBussionessStandEO.standName"
+                                  placeholder="请输入企标名称"
+                                  clearable></el-input>
+                    </el-form-item>
+                    <el-form-item label="企标英文名称" prop="standEnName" label-width="150px" class="add-form-item">
+                        <el-input v-model="sarBussionessStandEO.standEnName"
+                                  placeholder="请输入企标英文名称"
+                                  clearable></el-input>
+                    </el-form-item>
+                    <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
+                                  prop="textStatus" label-width="150px" class="add-form-item">
+                        <template slot="label">文本状态</template>
+                        <el-select v-model="sarBussionessStandEO.textStatusBuss"
+                                   placeholder="请选择文本状态"
+                                   clearable>
+                            <el-option
+                                    v-for="opt in standStateOptions"
+                                    :key="opt.value"
+                                    :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
+                            >
+                                {{ opt.label }}
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="发布日期" prop="issueTime" label-width="150px" class="add-form-item">
+                        <el-datePicker v-model="sarBussionessStandEO.issueTime"
+                                       :editable="false"
+                                       placeholder="请选择发布日期"></el-datePicker>
+                    </el-form-item>
+                    <el-form-item label="标准实施日期" prop="putTime" label-width="150px" class="add-form-item">
+                        <el-datePicker v-model="sarBussionessStandEO.putTime"
+                                       :editable="false"
+                                       placeholder="请选择实施日期"
+                                       clearable
+                        ></el-datePicker>
+                    </el-form-item>
+                </template>
+                <template v-for="field in displayLocation.child">
                 <template v-if="field.attrField === 'SVPPS'">
                   <custom-SVPPS
                     :key="field.attrField"
@@ -526,7 +487,7 @@
                     :disabled="formdisableflag"
                   ></custom-SVPPS>
                 </template>
-                <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'XGJH'">
+                <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'XGJLBUSS' && field.attrField !== 'XGJH'">
                   <template v-if="field.attrField === 'GFXYYWJ'">
                     <custom-input-for-standards
                       :key="field.attrField"
@@ -535,18 +496,79 @@
                       :disabled="formdisableflag"
                     ></custom-input-for-standards>
                   </template>
-                  <template v-else>
+                  <template v-else-if="field.attrField === 'FSRQBUSS'">
                     <custom-input
                       :key="field.attrField"
                       :config="field"
                       v-model="sarBussionessStandEO[field.attrField]"
-                      :disabled="formdisableflag"
+                      :disabled="true"
                     ></custom-input>
                   </template>
+                    <template v-else-if="field.attrField === 'TXLBBUSS'">
+                        <el-form-item
+                                prop="TXLBBUSS"
+                                label-width="150px"
+                                class="add-form-item"
+                        >
+                            <template slot="label">体系类别</template>
+                            <el-input v-model="sarBussionessStandEO.TXLBBUSS" placeholder="选择体系类别" @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'VPPSBMBUSS'">
+                        <el-form-item
+                                prop="VPPSBMBUSS"
+                                label-width="150px"
+                                class="add-form-item"
+                        >
+                            <template slot="label">关联模块--VPPS编码</template>
+                            <el-input v-model="sarBussionessStandEO.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS)"></el-input>
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'VPPSCNBUSS'">
+                        <el-form-item title="关联模块--中文名称" label="关联模块--中文名称" label-width="150px" prop="VPPSCNBUSS" class="add-form-item">
+                            <el-input
+                                    v-model="sarBussionessStandEO.VPPSCNBUSS" disabled
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'DTQBBHBUSS'">
+                        <custom-input-for-standards
+                                :key="field.attrField"
+                                :config="field"
+                                :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
+                                v-model="sarBussionessStandEO[field.attrField]"
+                                :disabled="formdisableflag"
+                                @popoverHide="popoverHideQuery"
+                        ></custom-input-for-standards>
+                    </template>
+                    <template v-else-if="field.attrField === 'BDTQBBHBUSS'">
+                        <custom-input
+                                :key="field.attrField"
+                                :config="field"
+                                v-model="sarBussionessStandEO[field.attrField]"
+                                :disabled="true"
+                        ></custom-input>
+                    </template>
+                    <template v-else-if="field.attrField === 'XCSJBUSS'">
+                        <custom-input
+                                :key="field.attrField"
+                                :config="field"
+                                v-model="sarBussionessStandEO[field.attrField]"
+                                :disabled="true"
+                        ></custom-input>
+                    </template>
+                    <template v-else>
+                        <custom-input
+                                :key="field.attrField"
+                                :config="field"
+                                v-model="sarBussionessStandEO[field.attrField]"
+                                :disabled="formdisableflag"
+                        ></custom-input>
+                    </template>
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PICKER'">
                   <custom-date-pick
-                    v-if="field.attrField !== 'FZRQ'"
                     :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
@@ -850,13 +872,13 @@
       </el-dialog>
     </div>
     <!--高级查询-->
-    <AdvancedQuery
+<!--    <AdvancedQuery-->
-      :isAdvancedSearch.sync="isAdvancedSearch"
+<!--      :isAdvancedSearch.sync="isAdvancedSearch"-->
-      :twoOptions="twoOptions"
+<!--      :twoOptions="twoOptions"-->
-      :threeOptions="threeOptions"
+<!--      :threeOptions="threeOptions"-->
-      @twoSelectChange="twoSelectChange"
+<!--      @twoSelectChange="twoSelectChange"-->
-      @getDomesticStandardTableBtn="(advancedSearch) => getBussionStandTableBtn(sarBussionessSearch, advancedSearch)"
+<!--      @getDomesticStandardTableBtn="(advancedSearch) => getBussionStandTableBtn(sarBussionessSearch, advancedSearch)"-->
-    ></AdvancedQuery>
+<!--    ></AdvancedQuery>-->
     <!--企标编号生成组件-->
     <GenerationNumber
       :is-show.sync="isShow"
@@ -942,6 +964,27 @@
                       @click="closeModal">取消</el-button>
           </div>
       </el-drawer>
+      <!-- 组件树-->
+      <tree-select-new
+              :multiple=false
+              :lazy=false
+              :modalShowFlag="modalShowFlag1"
+              :drawerTitle="drawerTitle1"
+              width = "500"
+              :data="standSystemOptions"
+              :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
+              :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+      <tree-select-new
+              width = "500"
+              :lazy=true
+              :multiple=true
+              :check-strictly=true
+              :modalShowFlag="modalShowFlag2"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :urlChild="urlChild"
+              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
   </div>
 </template>
 
@@ -956,6 +999,9 @@ import CustomInputForStandards from '@/components/CustomFormComponents/InputForS
 import customSelectArray from '@/components/CustomFormComponents/SelectArray'
 import CustomOrg from '@/components/CustomFormComponents/OrgTree'
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
+import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+
 import {mapGetters} from 'vuex'
 export default {
   name: 'EnterpriseStandardDatabase',
@@ -969,7 +1015,9 @@ export default {
     CustomInputForStandards,
     customSelectArray,
     CustomOrg,
-    CustomSVPPS
+    CustomSVPPS,
+    TreeSelect,
+    TreeSelectNew
   },
   props: {
   },
@@ -979,6 +1027,14 @@ export default {
         label: 'menuName',
       children: 'children'
       },
+        defaultProps: {
+            children: 'children',
+            label: 'menuName'
+        },
+        nodeKey: 'id',
+        nodeKeyCode: 'code',
+        nodeKeyModel: 'model',
+        defaultCheckedKeys: [],
         productModal: false, // 模态框是否打开
         modalType: '',
         productTitle: '', // 模态框标题
@@ -1073,7 +1129,6 @@ export default {
       formFieldListData: {},
       formFieldList: [],
       allSelectOptions: {},
-      countryOptions: [],
       configPage: 1,
       configPageNow: 1,
       loading: false,
@@ -1110,12 +1165,16 @@ export default {
       // 组织机构
       bussionessStandNodes: [],
       sarBussionessStandEO: {
+        TXLBBUSS:'',
+        VPPSBMBUSS:'',
+        VPPSCNBUSS:'',
         regionShow: '亚洲',
         region: '2T8PFTSYE7',
         issueUnit: '', // 发布部门
         assemClass: '',
         id: '',
         standType: 'INLAND', // 标准分类
+        textStatusBuss:'',
         country: 'CN',
         standSort: '',
         applyArctic: '',
@@ -1344,10 +1403,7 @@ export default {
         certPutTimeList: []
       }, // 标准新增过程中用到的对象
       energyKindOptions: [], // 能源种类下拉框
-      applyAuthOptions: [], // 适用认证下拉框
       applyCountryOptions: [], // 国家/地区下拉框
-      regionOptions: [], // 国家/地区下拉框
-      applyArcticOptions: [], // 适用车型下拉框
       formdisableflag: false,
       defaultAddFormFieldRules: {
         // standSort: [
@@ -1446,10 +1502,8 @@ export default {
       exportName: '',
       countRootId: 0,
       parentNode: [],
-      searching: false,
       deleteMenuModal: false,
       goSearch: '',
-      tableFlag: '',
       SarExportSearchEo: {},
       sarBussionessSearch: {
         orgName: '', // 部门名称
@@ -1502,13 +1556,53 @@ export default {
         standSort: '',
         replaceStandNum: ''
       }, // 分页查询过程中用到的对象
-      standSortOptions: [], // 企标类别下拉框
       standGeneraOptions: [], // 企标大类下拉框
       standSubclassOptions: [], // 企标细类下拉框-所有数据
       standSubclassSelectOptions: [], // 企业细类下拉框-选中大类后 所有数据
-      standStateOptions: [], // 标准状态下拉框
-      standNatureOptions: [], // 标准性质下拉框
       searchNodes: [], // 高级检索中责任部门
+        defaultCheckedKeys1: [],
+        defaultCheckedKeys2: [],
+        defaultCheckedKeys3: [],
+        defaultCodeProps: {
+            children: 'children',
+            label: 'code'
+        },
+        defaultModelProps: {
+            children: 'children',
+            label: 'model'
+        },
+        busVppsOptions: [], // 车系体系架构
+        modelOptions: [], // 模块体系架构
+        searching: false,
+        stahndinfoList: [],
+        tableFlag: '',
+        // sycpxOptions: [], // 适用产品线
+        syzrOptions: [], // 适用认证
+        // zrgcsOptions: [], // 责任工程师
+
+        countryOptions: [],
+        regionOptions: [], // 区域
+        standSortOptions: [], // 标准类别下拉框
+        standSystemOptions: [], // 标准体系下拉框
+        sycpxOptions: [], // 适用产品线下拉框
+        zrbmOptions: [], // 责任部门下拉框
+        zrgcsOptions: [], // 责任工程师下拉框
+        txlbOptions: [], // 体系类别下拉框
+        standSortConfigOptions: [], // 标准类别下拉框
+        applyArcticOptions: [], // 适用车型下拉框
+        standStateOptions: [], // 标准状态下拉框
+        standNatureOptions: [], // 标准性质下拉框
+        adoptExtentOptions: [], // 采标程度下拉框
+        emergyKindOptions: [], // 能源种类下拉框
+        applyAuthOptions: [], // 适用认证下拉框
+        categoryOptions: [], // 所属类别下拉框
+        categoryConfigOptions: [], // 所属类别下拉框
+        assemClassOptions: [], // 总成分类下拉框
+        qcdwOptions:[],//起草单位下拉框
+        cysdOptions:[], //我司参与深度下拉框
+        nylxOptions:[],//能源类型下拉框
+        syrzOptions:[],//适用认证下拉框
+        gkglbmOptions:[],//归口管理部门下拉框
       drawerTitle: '',
       addOrUPdateFlag: 1, // 新增：1， 修改：2
       modalshowflag: false,
@@ -1556,10 +1650,69 @@ export default {
       isShow: false,
       standStatus: '',
       qcbm: '',
-      qcbmName: ''
+      qcbmName: '',
+      drawerTitle1:'',
+      modalShowFlag1: false,
+      modalShowFlag2: false, // drawer开关
+      modalShowFlag3: false, // drawer开关
+      modalShowFlag4: false, // drawer开关
+      url:'',
+      urlChild:'',
     }
   },
   methods: {
+      dateFormatter () {
+          //默认返回yyyy-MM-dd HH-mm-ss
+          const d = new Date();
+          const year = d.getFullYear();//得到年
+          const month = (d.getMonth()+1)<10 ? '0'+(d.getMonth()+1) : (d.getMonth()+1);//得到月
+          const day = d.getDate()<10 ? '0'+d.getDate() : d.getDate();//得到日
+          const hour = d.getHours()<10 ? '0'+d.getHours() : d.getHours();//得到时
+          const minute = d.getMinutes()<10 ? '0'+d.getMinutes() : d.getMinutes();//得到分
+          const second = d.getSeconds()<10 ? '0'+d.getSeconds() : d.getSeconds();//得到秒
+          return [year, month, day].join('-') + " " + [hour, minute, second].join(':');//格式为：YY-MM-DD hh:mm:ss（当前时间）
+      },
+      popoverHideQuery(ids,attrField){
+          console.log(ids)
+          console.log("-----------------------------")
+          console.log(attrField)
+      },
+      popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+          if(checkedData) {
+              if(checkedData.length > 0){
+                  this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                  this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+              }else {
+                  this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
+                  this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
+              }
+          }
+          this.modalShowFlag2 = false
+          this.$forceUpdate()
+      },
+      popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+          if(checkedData) {
+              if(checkedData.length > 0){
+                  this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
+              }else {
+                  this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
+              }
+          }
+          this.modalShowFlag1 = false
+          this.$forceUpdate()
+      },
+      choiceZRR2 (type, title, id) {
+          this.drawerTitle = title
+          this.modalShowFlag2 = true
+          this.url = ''
+          this.urlChild = ''
+          this.url="sarVppsTree/list"
+          this.urlChild="sarVppsTree/childByList"
+      },
+      choiceZRR1 (type, title, id) {
+          this.drawerTitle1 = title
+          this.modalShowFlag1 = true
+      },
       closeModal () {
           this.productModal = false
           this.closeDrawer()
@@ -2153,88 +2306,88 @@ export default {
     },
     // 点击查看
     handlePreview (item) {
-      const mj = item.attrInfoMap.QBMJ
+      // const mj = item.attrInfoMap.QBMJ
-      if (mj === 'GXNX7D6H59') {
+      // if (mj === 'GXNX7D6H59') {
-        // C1所有人都可查看
+      //   // C1所有人都可查看
-        let routeUrl = this.$router.resolve({
+      //   let routeUrl = this.$router.resolve({
-          name: 'OtherBussStandardDetails',
+      //     name: 'OtherBussStandardDetails',
-          params: {
+      //     params: {
-            id: item.id,
+      //       id: item.id,
-            pageType: 'BUSINESS_STAND'
+      //       pageType: 'BUSINESS_STAND'
-          }
+      //     }
-        })
+      //   })
-        window.open(routeUrl.href, '_blank')
+      //   window.open(routeUrl.href, '_blank')
-      } else if (mj === 'JLAPYG7YCT') {
+      // } else if (mj === 'JLAPYG7YCT') {
-        // C2只能让起草部门人员即填写中的相关部门/涉及会签部门人员可看
+      //   // C2只能让起草部门人员即填写中的相关部门/涉及会签部门人员可看
-        // （起草部门、相关部门、会签部门，部门下所有人员）
+      //   // （起草部门、相关部门、会签部门，部门下所有人员）
-        const attrInfoMap = item.attrInfoMap || {}
+      //   const attrInfoMap = item.attrInfoMap || {}
-        const xgbm = attrInfoMap.XGBM || '' // 相关部门
+      //   const xgbm = attrInfoMap.XGBM || '' // 相关部门
-        const qcbm = attrInfoMap.ZRBM || '' // 起草部门
+      //   const qcbm = attrInfoMap.ZRBM || '' // 起草部门
-        const xghqbm = attrInfoMap.XHQBM || '' // 相关会签部门
+      //   const xghqbm = attrInfoMap.XHQBM || '' // 相关会签部门
-        const bm = [xgbm, qcbm, xghqbm].join(',') // 全部部门 字符串拼接
+      //   const bm = [xgbm, qcbm, xghqbm].join(',') // 全部部门 字符串拼接
-        const currentUserInfo = this.userInfo
+      //   const currentUserInfo = this.userInfo
-        const currentBm = [currentUserInfo.orgId, currentUserInfo.pOrgId] // 当前用户的部门和科室
+      //   const currentBm = [currentUserInfo.orgId, currentUserInfo.pOrgId] // 当前用户的部门和科室
-        const inBm = currentBm.some(item => {
+      //   const inBm = currentBm.some(item => {
-          return bm.indexOf(item) > -1
+      //     return bm.indexOf(item) > -1
-        })
+      //   })
-        // 如果当前用户的部门和科室不在全部部门里  就不允许查看
+      //   // 如果当前用户的部门和科室不在全部部门里  就不允许查看
-        if (!inBm) {
+      //   if (!inBm) {
-          this.$message.warning('当前用户无权限查看此详情')
+      //     this.$message.warning('当前用户无权限查看此详情')
-          return false
+      //     return false
-        }
-        let routeUrl = this.$router.resolve({
-          name: 'OtherBussStandardDetails',
-          params: {
-            id: item.id,
-            pageType: 'BUSINESS_STAND'
-          }
-        })
-        window.open(routeUrl.href, '_blank')
-      } else if (mj === 'ACF675Z88W') {
-        // C3采取单独授权查看（当前实现只能主起草人、其他起草人看即可，后续的授权4月份开发）
-        const attrInfoMap = item.attrInfoMap || {}
-        const zyqcr = attrInfoMap.ZYQCR || '' // 主要起草人
-        const qtqcr = attrInfoMap.QTQCR || '' // 主要起草人
-        const qcr = [zyqcr, qtqcr].join(',') // 全部起草人 字符串拼接
-        const userInfo = this.userInfo
-        const currentId = userInfo.userId // 当前用户的id
-        // 如果当前用户的部门和科室不在全部部门里  就不允许查看
-        if (!(qcr.indexOf(currentId) > -1)) {
-          // this.$message.warning('当前用户无权限查看此详情')
-          this.$http.get('lawss/sarBussionessStand/selectPerson', {
-            qbid: item.id
-          }, {
-            _this: this
-          }, res => {
-            if (res.data === "1") {
-              // 为1有权限
-              let routeUrl = this.$router.resolve({
-                name: 'OtherBussStandardDetails',
-                params: {
-                  id: item.id,
-                  pageType: 'BUSINESS_STAND'
-                }
-              })
-              window.open(routeUrl.href, '_blank')
-            } else {
-              this.$message.warning('当前用户无权限查看此详情')
-              return false
-            }
-          }, e => {
-            return false
-
-          })
-
-        }
-      }
-      // let routeUrl = this.$router.resolve({
-      //   name: 'OtherBussStandardDetails',
-      //   params: {
-      //     id: item.id,
-      //     pageType: 'BUSINESS_STAND'
       //   }
-      // })
+      //   let routeUrl = this.$router.resolve({
-      // window.open(routeUrl.href, '_blank')
+      //     name: 'OtherBussStandardDetails',
+      //     params: {
+      //       id: item.id,
+      //       pageType: 'BUSINESS_STAND'
+      //     }
+      //   })
+      //   window.open(routeUrl.href, '_blank')
+      // } else if (mj === 'ACF675Z88W') {
+      //   // C3采取单独授权查看（当前实现只能主起草人、其他起草人看即可，后续的授权4月份开发）
+      //   const attrInfoMap = item.attrInfoMap || {}
+      //   const zyqcr = attrInfoMap.ZYQCR || '' // 主要起草人
+      //   const qtqcr = attrInfoMap.QTQCR || '' // 主要起草人
+      //   const qcr = [zyqcr, qtqcr].join(',') // 全部起草人 字符串拼接
+      //   const userInfo = this.userInfo
+      //   const currentId = userInfo.userId // 当前用户的id
+      //   // 如果当前用户的部门和科室不在全部部门里  就不允许查看
+      //   if (!(qcr.indexOf(currentId) > -1)) {
+      //     // this.$message.warning('当前用户无权限查看此详情')
+      //     this.$http.get('lawss/sarBussionessStand/selectPerson', {
+      //       qbid: item.id
+      //     }, {
+      //       _this: this
+      //     }, res => {
+      //       if (res.data === "1") {
+      //         // 为1有权限
+      //         let routeUrl = this.$router.resolve({
+      //           name: 'OtherBussStandardDetails',
+      //           params: {
+      //             id: item.id,
+      //             pageType: 'BUSINESS_STAND'
+      //           }
+      //         })
+      //         window.open(routeUrl.href, '_blank')
+      //       } else {
+      //         this.$message.warning('当前用户无权限查看此详情')
+      //         return false
+      //       }
+      //     }, e => {
+      //       return false
+      //
+      //     })
+      //
+      //   }
+      // }
+      let routeUrl = this.$router.resolve({
+        name: 'OtherBussStandardDetails',
+        params: {
+          id: item.id,
+          pageType: 'BUSINESS_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
     },
     // 编辑
     selectStandardPro (item, state) {
@@ -2272,6 +2425,7 @@ export default {
           this.loading = false
         })
         this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
+        this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter()
         this.standStatus = JSON.parse(JSON.stringify(this.sarBussionessStandEO.standStatus))
         let subClass = item.standSubclass
         this.sarBussionessStandEO.standSubclass = subClass
@@ -3445,7 +3599,16 @@ export default {
   watch: {
       filterText(val) {
           this.$refs.tree.filter(val);
-      }
+      },
+      'sarBussionessStandEO.issueTime': {
+          handler: function() {
+              if(this.sarBussionessStandEO.issueTime !== undefined && this.sarBussionessStandEO.issueTime !== null && this.sarBussionessStandEO.issueTime !== ''){
+                  let date = new Date(this.$moment(this.sarBussionessStandEO.issueTime).format('YYYY-MM-DD'))
+                  const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
+                  this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
+              }
+          },
+      },
   },
   computed: {
     // 是否拥有拖拽权限
@@ -3475,14 +3638,27 @@ export default {
       this.countryOptions = res.data.COUNTRY
       this.applyCountryOptions = res.data.COUNTRY
       this.regionOptions = res.data.REGION // 区域
-      this.applyArcticOptions = res.data.PRODUCTTYPE // 根据需求文档，产品类别对应标准属性中的“适用车型”
       this.standStateOptions = res.data.BUSSSTATE
-      this.standSortOptions = res.data.BUSSSTANDCLASS
       this.energyKindOptions = res.data.ENERGYTYPES
-      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
       this.standGeneraOptions = res.data.BUSSBIGCLASS
       this.standSubclassOptions = res.data.BUSSFINECLASS
-      this.applyAuthOptions = res.data.PROVETYPE
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+        this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+        this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+        this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+        this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+        this.cysdOptions = res.data.WSCYSD // 我司参与深度
+        this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+        this.txlbOptions = res.data.TXLBCLASS // 体系类别
+        this.qcdwOptions = res.data.QCDW // 起草单位
+        this.nylxOptions = res.data.NYLXCLASS // 能源类型
+        this.syrzOptions = res.data.SYRZCLASS // 适用认证
+        this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+        this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+        this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+        this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       // this.classifyCodeOptions = res.data.STANDCLASSIFY
     }, e => {
     })

src/router/index.js

@@ -1288,7 +1288,7 @@ const routes = [
         meta: {
           requireAuth: true,
           title: '企业标准库',
-          menuId: '3YVZP8R4TC',
+          menuId: '7feeb73929c25a6f1fd67952704ec02b',
           parentPath: '/enterpriseStandardDatabase'
         }
       },