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

# Conflicts: # src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
2021-12-29 16:08:46 +08:00
parent 757533548a c5a23d5057
commit 82675a1a21
337 changed files with 86811 additions and 18544 deletions
@@ -163,10 +163,12 @@
                   v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
        </el-button>
        <el-button class="common-button-default"
+                   v-btn-permission="''"
                   size="mini"
                   @click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
        </el-button>
        <el-button class="common-button-default"
+                   v-btn-permission="''"
                   size="mini"
                   @click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
        </el-button>
@@ -426,9 +428,9 @@
                <el-form-item label="标准类别" prop="standSort" label-width="150px" class="add-form-item">
                  <el-select v-model="sarStandardsInfoEO.standSort" filterable>
                    <el-option
-                        v-for="item in standSortOptions"
+                        v-for="(item, index) in standSortOptions"
                        placeholder="请选择"
-                        :key="item.value"
+                        :key="index"
                        :value="item.value"
                        :label="item.label"
                    ></el-option>
@@ -460,9 +462,9 @@
                             placeholder="请选择标准性质"
                             clearable>
                    <el-option
-                        v-for="item in standNatureOptions"
+                        v-for="(item,index) in standNatureOptions"
                        placeholder="请选择"
-                        :key="item.value"
+                        :key="index"
                        :value="item.value"
                        :label="item.label"
                    >
@@ -477,9 +479,9 @@
                             placeholder="请选择文本状态"
                             clearable>
                    <el-option
-                        v-for="opt in standStateOptions"
+                        v-for="(opt,index) in standStateOptions"
                        :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑国内标准'"
-                        :key="opt.value"
+                        :key="index"
                        :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                    >
                      {{ opt.label }}
@@ -519,7 +521,6 @@
              <template v-for="field in displayLocation.child">
                <template v-if="field.attrField === 'EOPSSRQ'">
                  <custom-eop-date-pick
-                      :key="field.attrField"
                      :config="field"
                      v-model="sarStandardsInfoEO[field.attrField]"
                      :disabled="formdisableflag"
@@ -527,7 +528,6 @@
                </template>
                <template v-else-if="field.attrField === 'SVPPS'">
                  <custom-SVPPS
-                      :key="field.attrField"
                      :config="field"
                      v-model="sarStandardsInfoEO[field.attrField]"
                      :disabled="formdisableflag"
@@ -535,7 +535,6 @@
                </template>
                <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ' || field.attrField === 'SSRQ'">
                  <custom-date-pick-group
-                      :key="field.attrField"
                      :config="field"
                      v-model="sarStandardsInfoEO[field.attrField]"
                      :disabled="formdisableflag"
@@ -543,7 +542,6 @@
                </template>
                <template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
                  <custom-date-pick-group
-                      :key="field.attrField"
                      :config="field"
                      v-model="sarStandardsInfoEO[field.attrField]"
                      :disabled="formdisableflag"
@@ -555,7 +553,6 @@
                  <template
                      v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'CBBH' || field.attrField === 'BFDTBZ'">
                    <custom-input-for-standards
-                        :key="field.attrField"
                        :config="field"
                        :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                        v-model="sarStandardsInfoEO[field.attrField]"
@@ -597,7 +594,7 @@
                    </el-form-item>
                  </template>
                  <template v-else-if="field.attrField === 'CYCVPPSCN'">
-                    <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px"
+                    <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
                                  prop="cycvppscn" class="add-form-item">
                      <el-input
                          v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
@@ -606,7 +603,7 @@
                    </el-form-item>
                  </template>
                  <template v-else-if="field.attrField === 'KCCVPPSCN'">
-                    <el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" label-width="150px" prop="kccvppscn"
+                    <el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" label-width="150px" prop="kccvppscn"
                                  class="add-form-item">
                      <el-input
                          v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
@@ -624,7 +621,6 @@
                  </template>
                  <template v-else-if="field.attrField === 'BBFDTBZ' || field.attrField === 'BYYBJ'">
                    <custom-input
-                        :key="field.attrField"
                        :config="field"
                        v-model="sarStandardsInfoEO[field.attrField]"
                        :disabled="true"
@@ -632,7 +628,6 @@
                  </template>
                  <template v-else>
                    <custom-input
-                        :key="field.attrField"
                        :config="field"
                        v-if="field.attrField !== 'BDTBZBH'"
                        v-model="sarStandardsInfoEO[field.attrField]"
@@ -643,7 +638,6 @@

                <template v-else-if="field.attrType === 'INPUT_NUM'">
                  <custom-input-num
-                      :key="field.attrField"
                      :config="field"
                      v-model="sarStandardsInfoEO[field.attrField]"
                      :disabled="formdisableflag"
@@ -652,7 +646,6 @@
                <template v-else-if="field.attrType === 'DATE_PICKER'">
                  <custom-date-pick
                      v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
-                      :key="field.attrField"
                      :config="field"
                      v-model="sarStandardsInfoEO[field.attrField]"
                      :disabled="formdisableflag"
@@ -661,7 +654,6 @@
                </template>
                <template v-else-if="field.attrType === 'FILE'">
                  <custom-file
-                      :key="field.attrField"
                      :config="field"
                      v-model="sarStandardsInfoEO[field.attrField]"
                      :disabled="formdisableflag"
@@ -670,7 +662,6 @@
                </template>
                <template v-else-if="field.attrType === 'TEXTAREA'">
                  <custom-textarea
-                      :key="field.attrField"
                      :config="field"
                      v-model="sarStandardsInfoEO[field.attrField]"
                      :disabled="formdisableflag"
@@ -679,7 +670,6 @@
                <template v-else-if="field.attrType === 'SEL_OPTION'">
                  <template>
                    <custom-select
-                        :key="field.attrField"
                        :config="field"
                        v-model="sarStandardsInfoEO[field.attrField]"
                        :disabled="formdisableflag"
@@ -695,7 +685,6 @@
                    >
                      <template slot="label">责任部门</template>
                      <el-input
-                          :key="field.attrField"
                          :config="field"
                          clearable
                          v-model="sarStandardsInfoEO['ZRBM']"
@@ -730,7 +719,7 @@
                        class="add-form-item"
                    >
                      <template slot="label">我司署名人</template>
-                      <el-input v-model="sarStandardsInfoEO['WSSMR']" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', sarStandardsInfoEO['WSSMR'])">
+                      <el-input clearable v-model="sarStandardsInfoEO['WSSMR']" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', sarStandardsInfoEO['WSSMR'])">
                      </el-input>
 <!--                      <el-input-->
 <!--                          :key="field.attrField"-->
@@ -752,7 +741,6 @@
                      <div style="display: flex;justify-content: space-between;align-items: center;">
                        <el-tooltip v-if="sarStandardsInfoEO['QCDW']" class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">
                          <el-input
-                                  :key="field.attrField"
                                  :config="field"
                                  clearable
                                  type="textarea"
@@ -764,7 +752,6 @@
                        </el-tooltip>
                        <div v-else>
                          <el-input
-                                  :key="field.attrField"
                                  :config="field"
                                  clearable
                                  v-model="sarStandardsInfoEO['QCDW']"
@@ -785,7 +772,6 @@
 <!--                  全选-->
                  <template v-else>
                    <custom-select-array
-                        :key="field.attrField"
                        :config="field"
                        v-model="sarStandardsInfoEO[field.attrField]"
                        :disabled="formdisableflag"
@@ -1006,14 +992,18 @@
                <el-formItem label="标准类别" prop="standSort" class="search-item">
                  <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
                             @keyup.enter.native="searchConfiguraStand(true)" clearable>
-                    <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value"
-                               :key="opt.value" :label="opt.label">{{ opt.label }}
+                    <el-option v-for="(opt, index) in standSortOptions" :value="opt.value === undefined ? '' :opt.value"
+                               :key="index" :label="opt.label">{{ opt.label }}
                    </el-option>
                  </el-select>
                </el-formItem>
-                <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
+                <el-formItem label="标准号" prop="standNumber" class="search-item">
                  <el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand(true)"
-                            placeholder="根据标准号/名称查找" clearable/>
+                            placeholder="根据标准号查找" clearable/>
+                </el-formItem>
+                <el-formItem label="标准名称" prop="standNumber" class="search-item">
+                  <el-input v-model="sarConfigStandSearch.standName" @keyup.enter.native="searchConfiguraStand(true)"
+                            placeholder="根据标准名称查找" clearable/>
                </el-formItem>
                <el-form-item label="" class="search-item btn-box">
                  <el-button size="mini" class="common-button-primary" type="primary"
@@ -1063,22 +1053,27 @@
              <el-table-column
                  prop="issueTime"
                  label="发布日期"
-                  sortable="custom"
                  width="120"
                  align="center">
                <template slot-scope="scope">
                  {{ formatIssueDate(scope.row.issueTime) }}
                </template>
              </el-table-column>
+<!--              <el-table-column-->
+<!--                  prop="XCXSSRQ"-->
+<!--                  label="实施日期"-->
+<!--                  sortable="custom"-->
+<!--                  width="120"-->
+<!--                  align="center">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span>{{ formatText(scope.row.XCXSSRQ) }}</span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
              <el-table-column
-                  prop="XCXSSRQ"
-                  label="实施日期"
-                  sortable="custom"
-                  width="120"
-                  align="center">
-                <template slot-scope="scope">
-                  <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
-                </template>
+                      prop="ssrq"
+                      label="实施日期"
+                      width="120"
+                      align="center">
              </el-table-column>
              <el-table-column
                  prop="textStatus"
@@ -1201,6 +1196,8 @@
                <el-form-item label="描述" prop="remarks" class="add-form-item">
                  <el-input v-model.trim="productModelAdd.remarks"
                            placeholder="请输入描述"
+                            maxlength="500"
+                            show-word-limit
                            clearable></el-input>
                </el-form-item>
              </el-col>
@@ -1492,14 +1489,14 @@
      <!--    高级筛选-->
      <el-drawer
          title="高级搜索"
-          size="700px"
+          size="710px"
          :wrapperClosable="false"
          :visible.sync="isAdvancedSearch">
        <div class="demo-drawer-content">
          <el-form :model="sarStandardsSearch"
                   :inline="true"
                   class="label-input-form table-lattice"
-                   label-width="68px"
+                   label-width="300px"
                   style="display: flex;flex-wrap: wrap">
            <ProcessTitle>
              <template slot="title">基础信息</template>
@@ -1539,11 +1536,11 @@
                    </el-select>
                  </el-form-item>
                  <!--            体系类别-->
-                  <el-form-item label="体系类别" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
+                  <el-form-item label="标准体系" class="add-form-item form-item-disabled">
+                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
+                      <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
+                                 :key="index"
                                 :label="opt.label">{{ opt.label }}
                      </el-option>
                    </el-select>
@@ -1570,7 +1567,10 @@
                  <el-form-item label="标准发布日期" title="标准发布日期" class="add-form-item form-item-disabled">
                    <el-date-picker
                        v-model="sarStandardsSearch.issueTime"
-                        type="date"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
                        value-format="yyyy-MM-dd"
                        placeholder="根据标准发布日期查找">
                    </el-date-picker>
@@ -1579,8 +1579,8 @@
                  <el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
                    <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value" :label="opt.label">{{ opt.label }}
+                      <el-option v-for="(opt, index) in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
+                                 :key="index" :label="opt.label">{{ opt.label }}
                      </el-option>
                    </el-select>
                  </el-form-item>
@@ -1605,7 +1605,10 @@
                  <el-form-item label="实施日期" class="add-form-item form-item-disabled">
                    <el-date-picker
                        v-model="advanceSearchMapping.SSRQ"
-                        type="date"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
                        value-format="yyyy-MM-dd"
                        placeholder="根据实施日期查找">
                    </el-date-picker>
@@ -1614,7 +1617,10 @@
                  <el-form-item title="在产车实施日期" label="在产车实施日期" class="add-form-item form-item-disabled">
                    <el-date-picker
                        v-model="advanceSearchMapping.ZCCSSRQ"
-                        type="date"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
                        value-format="yyyy-MM-dd"
                        placeholder="根据在产车实施日期查找">
                    </el-date-picker>
@@ -1626,7 +1632,10 @@
                    <el-date-picker
                        value-format="yyyy-MM-dd"
                        v-model="advanceSearchMapping.XCXSSRQ"
-                        type="date"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
                        placeholder="根据新车型实施日期查找">
                    </el-date-picker>
                  </el-form-item>
@@ -1643,8 +1652,8 @@
                  <el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
                    <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value" :label="opt.label">{{ opt.label }}
+                      <el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
+                                 :key="index" :label="opt.label">{{ opt.label }}
                      </el-option>
                    </el-select>
                  </el-form-item>
@@ -1652,42 +1661,75 @@
                  <el-form-item label="我司参与深度" class="add-form-item form-item-disabled">
                    <el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
+                      <el-option v-for="(opt, index) in cysdOptions" :value="opt.value === undefined ? '' :opt.value"
+                                 :key="index"
                                 :label="opt.label">{{ opt.label }}
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <!--            适用车型-->
-                  <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
-                    <el-select v-model="sarStandardsSearch.applyArctic"
-                               :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value" :label="opt.label">{{ opt.label }}
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
+                  <template>
+                    <custom-select-array
+                        style="margin-left: -14px"
+                        :config="applyArcticOptions"
+                        v-model="sarStandardsSearch['CLLX']"
+                    ></custom-select-array>
+                  </template>
+<!--                  <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">-->
+<!--                    <el-select v-model="sarStandardsSearch.applyArctic"-->
+<!--                               :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
+<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                      <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="opt.value" :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
+<!--                  </el-form-item>-->
                  <!--            适用认证-->
-                  <el-form-item label="适用认证" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
-                                 :label="opt.label">{{ opt.label }}
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
+                  <template>
+                    <custom-select-array
+                        style="margin-left: -14px"
+                        :config="syrzOptions"
+                        v-model="advanceSearchMapping['SYRZ']"
+                    ></custom-select-array>
+                  </template>
+<!--                  <el-form-item label="适用认证" class="add-form-item form-item-disabled">-->
+<!--                    <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable-->
+<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                      <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="opt.value"-->
+<!--                                 :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
+<!--                  </el-form-item>-->
                  <!--            责任工程师-->
-                  <el-form-item label="责任工程师" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
-                                 :label="opt.label">{{ opt.label }}
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
+                  <template>
+                    <el-form-item
+                        prop="ZRGCSUser"
+                        label-width="150px"
+                        class="add-form-item"
+                    >
+                      <template slot="label">责任工程师</template>
+                      <el-input v-model="advanceSearchMapping['ZRGCS']" placeholder="查询责任工程师"
+                                @click.native="choiceZRRS('zrgcs', '查询责任工程师', advanceSearchMapping['ZRGCS'])">
+                      </el-input>
+                    </el-form-item>
+                  </template>
+<!--                  <template>-->
+<!--                    <custom-select-array-->
+<!--                        :key="zrgcsOptions.options"-->
+<!--                        :config="zrgcsOptions"-->
+<!--                        v-model="advanceSearchMapping['ZRGCS']"-->
+<!--                    ></custom-select-array>-->
+<!--                  </template>-->
+<!--                  <el-form-item label="责任工程师" class="add-form-item form-item-disabled">-->
+<!--                    <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable filterable-->
+<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                      <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="opt.value"-->
+<!--                                 :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
+<!--                  </el-form-item>-->
                  <!--            关联模块--乘用车VPPS编码-->
                  <el-form-item title="关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber"
                                class="add-form-item form-item-disabled">
@@ -1696,17 +1738,17 @@
                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                  </el-form-item>
                  <!--           关联模块--乘用车vpps中文名称-->
-                  <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber"
+                  <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" prop="standNumber"
                                class="add-form-item form-item-disabled">
                    <el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
-                              placeholder="关联模块--乘用车vpps中文名称"
+                              placeholder="关联模块--乘用车VPPS中文名称"
                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                  </el-form-item>
-                  <!--关联模块--卡车VPPS编码-->
-                  <el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber"
-                                class="add-form-item form-item-disabled">
-                    <el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
-                              placeholder="关联模块--卡车VPPS编码"
+
+                  <!--    模块结构单元名称     -->
+                  <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYMC" clearable
+                              placeholder="模块结构单元名称"
                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                  </el-form-item>

@@ -1716,48 +1758,98 @@
                  <el-form-item label="起草单位" class="add-form-item form-item-disabled">
                    <el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
+                      <el-option v-for="(opt, index) in qcdwOptions" :value="opt.value === undefined ? '' :opt.value"
+                                 :key="index"
                                 :label="opt.label">{{ opt.label }}
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <!--            能源类型-->
-                  <el-form-item label="能源类型" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
-                                 :label="opt.label">{{ opt.label }}
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
+                  <template>
+                    <custom-select-array
+                        :config="nylxOptions"
+                        style="margin-left: -14px"
+                        v-model="advanceSearchMapping['NYLX']"
+                    ></custom-select-array>
+                  </template>
+<!--                  <el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
+<!--                    <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable-->
+<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                      <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="opt.value"-->
+<!--                                 :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
+<!--                  </el-form-item>-->
                  <!--            适用产品线（新增字段）-->
-                  <el-form-item :label="$t('m.applicableProductLine')" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"
-                               clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
-                                 :label="opt.label">{{ opt.label }}
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
+                  <template>
+                    <custom-select-array
+                        :config="sycpxOptions"
+                        style="margin-left: -14px"
+                        v-model="advanceSearchMapping['SYCPX']"
+                    ></custom-select-array>
+                  </template>
+<!--                  <el-form-item :label="$t('m.applicableProductLine')" class="add-form-item form-item-disabled">-->
+<!--                    <el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"-->
+<!--                               clearable-->
+<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                      <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="opt.value"-->
+<!--                                 :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
+<!--                  </el-form-item>-->
                  <!--            责任部门-->
-                  <el-form-item label="责任部门" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
-                                 :label="opt.label">{{ opt.label }}
-                      </el-option>
-                    </el-select>
+                  <template>
+                    <el-form-item
+                        prop="ZRBM"
+                        label-width="150px"
+                        class="add-form-item"
+                    >
+                      <template slot="label">责任部门</template>
+                      <el-input
+                          :config="zrbmOptions"
+                          clearable
+                          v-model="advanceSearchMapping['ZRBM']"
+                          :disabled="formdisableflag" placeholder="查询责任部门"
+                          @click.native="choiceZRBM('ZRBMId', '查询责任部门', advanceSearchMapping['ZRBM'])">
+                      </el-input>
+                    </el-form-item>
+                  </template>
+<!--                  <template>-->
+<!--                    <custom-select-array-->
+<!--                        :key="zrbmOptions.options"-->
+<!--                        :config="zrbmOptions"-->
+<!--                        v-model="advanceSearchMapping['ZRBM']"-->
+<!--                    ></custom-select-array>-->
+<!--                  </template>-->
+<!--                  <el-form-item label="责任部门" class="add-form-item form-item-disabled">-->
+<!--                    <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable filterable-->
+<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                      <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="opt.value"-->
+<!--                                 :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
+<!--                  </el-form-item>-->
+                  <!--关联模块--卡车VPPS编码-->
+                  <el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber"
+                                class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
+                              placeholder="关联模块--卡车VPPS编码"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                  </el-form-item>
                  <!--关联模块--卡车vpps中文名称-->
-                  <el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber"
+                  <el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" prop="standNumber"
                                class="add-form-item form-item-disabled">
                    <el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
-                              placeholder="关联模块--卡车vpps中文名称"
+                              placeholder="关联模块--卡车VPPS中文名称"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+
+                  <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYBXH" clearable
+                              placeholder="模块结构单元变型号"
                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                  </el-form-item>
                </el-col>
@@ -1777,21 +1869,21 @@
                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                  </el-form-item>
                  <!--            采标编号-->
-                  <el-form-item label="采标===编号" prop="nameShow" class="add-form-item form-item-disabled">
+                  <el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
                    <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                  </el-form-item>
-                  <!--            引用标准-->
-                  <el-form-item label="引用标准" class="add-form-item form-item-disabled">
-                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
-                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-                  </el-form-item>

                </el-col>
                <el-col :span="12">
                  <!--            被代替标准号-->
-                  <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
-                    <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
+<!--                  <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">-->
+<!--                    <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"-->
+<!--                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--                  </el-form-item>-->
+                  <!--            引用标准-->
+                  <el-form-item label="引用标准" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                  </el-form-item>
                  <!--            被引用标准-->
@@ -1916,8 +2008,8 @@
            @closed="QCDWmodal = false">
      <el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
        <el-option
-                v-for="item in QCDWList"
-                :key="item.value"
+                v-for="(item, index) in QCDWList"
+                :key="index"
                :label="item.label"
                :value="item.label">
        </el-option>
@@ -2137,31 +2229,58 @@ export default {
      stahndinfoList: [],
      tableFlag: '',
      // sycpxOptions: [], // 适用产品线
-      syzrOptions: [], // 适用认证
+      syzrOptions: {
+        attrName: '适用认证',
+        options:[]
+      }, // 适用认证
      // zrgcsOptions: [], // 责任工程师

      countryOptions: [],
      regionOptions: [], // 区域
      standSortOptions: [], // 标准类别下拉框
      standSystemOptions: [], // 标准体系下拉框
-      sycpxOptions: [], // 适用产品线下拉框
-      zrbmOptions: [], // 责任部门下拉框
-      zrgcsOptions: [], // 责任工程师下拉框
+      sycpxOptions: {
+        attrName: '适用产品线',
+        options:[]
+      }, // 适用产品线下拉框
+      zrbmOptions: {
+        attrName: '责任部门',
+        options:[]
+      }, // 责任部门下拉框
+      zrgcsOptions: {
+        attrName: '责任工程师',
+        options:[]
+      }, // 责任工程师下拉框
      txlbOptions: [], // 体系类别下拉框
      standSortConfigOptions: [], // 标准类别下拉框
-      applyArcticOptions: [], // 适用车型下拉框
+      applyArcticOptions: {
+        attrName: '适用车型',
+        options:[]
+      }, // 适用车型下拉框
      standStateOptions: [], // 标准状态下拉框
      standNatureOptions: [], // 标准性质下拉框
      adoptExtentOptions: [], // 采标程度下拉框
-      emergyKindOptions: [], // 能源种类下拉框
-      applyAuthOptions: [], // 适用认证下拉框
+      emergyKindOptions: {
+        attrName: '能源种类',
+        options:[]
+      }, // 能源种类下拉框
+      applyAuthOptions: {
+        attrName: '适用认证',
+        options:[]
+      }, // 适用认证下拉框
      categoryOptions: [], // 所属类别下拉框
      categoryConfigOptions: [], // 所属类别下拉框
      assemClassOptions: [], // 总成分类下拉框
      qcdwOptions: [],//起草单位下拉框
      cysdOptions: [], //我司参与深度下拉框
-      nylxOptions: [],//能源类型下拉框
-      syrzOptions: [],//适用认证下拉框
+      nylxOptions: {
+        attrName: '能源类型',
+        options:[]
+      },//能源类型下拉框
+      syrzOptions: {
+        attrName: '适用认证',
+        options:[]
+      },//适用认证下拉框
      gkglbmOptions: [],//归口管理部门下拉框


@@ -2186,6 +2305,7 @@ export default {
        standNature: '',//标准性质
        textStatus: '',//文本状态
        synopsis: '', // 内容摘要
+        CLLX: '' // 适用车型


      }, // 分页查询过程中用到的对象
@@ -2208,7 +2328,9 @@ export default {
        , CBCD: ''//采标程度
        , YYBJ: ''//引用标准
        , BYYBJ: ''//被引用标准
-        , TXLB: ''//体系类别
+        , TXLB: '',//体系类别
+        DYBXH: '',// 模块结构单元变形号
+        DYMC: '',//模块结构单元名称
      },
      // 树形结构
      // tree function
@@ -2747,7 +2869,7 @@ export default {
                this.OCRModel = false
                this.OCRSubmitLoading = false
                if (res.ok) {
-                  this.$message.success('OCR实别成功')
+                  this.$message.success('OCR识别成功')
                } else {
                }
              },
@@ -2897,8 +3019,6 @@ export default {
      this.urlChild = "sarModelTree/childByList"
    },
    popoverHideQuery(ids, attrField) {
-      console.log(ids)
-      console.log(attrField)
    },
    popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
      if (checkedData) {
@@ -3273,7 +3393,6 @@ export default {
            this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState))
            formFieldList.forEach((field) => {
              displayLocation.forEach((location) => {
-                console.log(location)
                let value = this.sarStandardsInfoEO[field.attrField]
                let valueName = ''
                if (value && field.attrType === 'DATE_PICKER') {
@@ -3396,6 +3515,7 @@ export default {
              message: "删除成功"
            })
            this.selectMenu()
+            this.getDomesticStandardTable()
          } else {
            this.$message({
              type: 'warning',
@@ -3457,7 +3577,7 @@ export default {
    // },
    // 清空搜索框
    clearAllSearch(flag) {
-      if (flag === 'sarStandardsSearch') {
+      if (flag === 'sarStandardsSearch' || flag === 'standCommonlySearch') {
        // 标准搜索
        this.sarStandardsSearch.country = ''
        this.sarStandardsSearch.standSort = ''
@@ -3474,7 +3594,7 @@ export default {
        this.sarStandardsSearch.synopsis = ''
        this.sarStandardsSearch.category = ''
        this.isAdvancedSearch = false
-      } else if (flag === 'standCommonlySearch') {
+      // } else if (flag === 'standCommonlySearch') {
        this.standCommonlySearch.standName = ''
        this.standCommonlySearch.standNumber = ''
        this.pageChange(1)
@@ -3796,7 +3916,6 @@ export default {
        // this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', paramAll, {
        //     _this: this,responseType: 'blob',
        // }, res => {
-        //   console.log(res)
        //     this.exportLoading = false
        //   let url = window.URL.createObjectURL(new Blob([res]))
        //   let link = document.createElement('a')
@@ -4082,7 +4201,6 @@ export default {
                nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
              }
              // 代替标准号
-              console.log('4007',nowstandinfo.DTBJH);
              if (nowstandinfo.DTBJH != null) {
                nowstandinfo.DTBJH = nowstandinfo.DTBJH.replace(/，/ig, ',')
              }
@@ -4155,7 +4273,12 @@ export default {
        this.sarStandardsSearch.page = page
      }
      this.standCommonlySearch.page = page
-      this.getDomesticStandardTable(this.standCommonlySearch)
+      if (this.sarStandardsSearch) {
+        this.getDomesticStandardTable(this.sarStandardsSearch)
+      } else {
+        this.getDomesticStandardTable(this.standCommonlySearch)
+      }
+
    },
    // 分页每页显示数改变后方法
    pageSizeChange(pageSize) {
@@ -4166,6 +4289,7 @@ export default {
    },
    // 分页查询国内标准
    getDomesticStandardTable(item) {
+      console.log(item)
      if (item !== '' && item !== null && item !== undefined) {
        item.pageSize = this.$store.getters.userInfo.configContent
      }
@@ -4176,6 +4300,7 @@ export default {
      }
      // this.sarStandardsSearch.menuId = this.selectSarMenu.id
      const formData = {...data}
+      console.log(formData)
      if (!item) {
        formData.menuId = this.sarStandardsSearch.menuId
      } else {
@@ -4219,6 +4344,9 @@ export default {
      }
      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
      this.SarExportSearchEo = formData
+      formData.startIssueTime = formData.issueTime?formData.issueTime[0]:null
+      formData.endIssueTime = formData.issueTime?formData.issueTime[1]:null
+      formData.issueTime = null
      this.loading = true
      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
        _this: this, loading: 'loading'
@@ -4280,6 +4408,7 @@ export default {
          }
        }
        this.configStandList = res.data.list
+        console.log(this.configStandList);
        this.configTotal = res.data.count
        this.selectConfigStand = []
      }, e => {
@@ -5429,7 +5558,6 @@ export default {
      })
    },
    choiceZRRS (type, title, id) {
-      console.log('2077',title)
      this.nodeList = []
      this.nodeList.push(id)
      this.userType = type
@@ -5437,7 +5565,6 @@ export default {
      this.modalShowRoleFlag = true
    },
    checkedRole2 (data) {
-      console.log('1712',this.drawerTitle)
      let idList = ''
      let nameList = ''
      data.forEach( item => {
@@ -5452,6 +5579,8 @@ export default {
        this.sarStandardsInfoEO['WSSMR'] = nameList
      }else if (this.drawerTitle === '选择责任工程师'){
        this.sarStandardsInfoEO['ZRGCS'] = nameList
+      }else if (this.drawerTitle === '查询责任工程师'){
+        this.advanceSearchMapping['ZRGCS'] = nameList
      }

    },
@@ -5478,16 +5607,12 @@ export default {
      this.sarStandardsInfoEO['ZRGCS'] = nameList;
    },
    choiceZRBM(type, title, id) {
-
-
      this.nodeListZRBM = []
      this.nodeListZRBM.push(id)
      this.drawerTitle = title
      this.modalshowflagZRBM = true
    },
    drawerCheckZRBM(data) {
-
-      console.log("5389", data);
      let idList = ''
      let nameList = ''
      data.forEach(item => {
@@ -5500,9 +5625,12 @@ export default {
          nameList += item.name
        // }
      })
-
-      this.sarStandardsInfoEO.ZRBMId = idList;
-      this.sarStandardsInfoEO['ZRBM'] = nameList;
+      if (this.drawerTitle === '责任部门'){
+        this.sarStandardsInfoEO.ZRBMId = idList;
+        this.sarStandardsInfoEO['ZRBM'] = nameList;
+      }else if (this.drawerTitle === '查询责任部门'){
+        this.advanceSearchMapping['ZRBM'] = nameList
+      }

    },
  },
@@ -5551,19 +5679,19 @@ export default {
      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
      this.standStateOptions = res.data.WBZTCLASS // 文本状态
      this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+      this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
+      this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
+      this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
      this.cysdOptions = res.data.WSCYSD // 我司参与深度
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+      this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
+      this.zrgcsOptions.options = res.data.ZRGCSCLASS // 责任工程师
      this.txlbOptions = res.data.TXLBCLASS // 体系类别
      this.qcdwOptions = res.data.QCDW // 起草单位
-      this.nylxOptions = res.data.NYLXCLASS // 能源类型
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.syrzOptions = res.data.SYRZCLASS // 适用认证
+      this.nylxOptions.options = res.data.NYLXCLASS // 能源类型
+      this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
+      this.zrgcsOptions.options = res.data.ZRGCSCLASS // 责任工程师
+      this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门
+      this.syrzOptions.options = res.data.SYRZCLASS // 适用认证
      this.gkglbmOptions = res.data.GKGLBM;//归口管理部门
      this.getGzzOption()
      this.setMap(this.standStateOptions)
@@ -5605,6 +5733,10 @@ export default {
  overflow-x: scroll;
 }

+/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
+  width: 280px;
+}
+
 .OCRstandardForComments {
  height: 100%;
 }
@@ -5867,7 +5999,7 @@ export default {
  .el-drawer__wrapper {
    .demo-drawer-content {
      .drawer-content {
-        //height: calc(~'100% - 52px - 56px');
+        height: calc(~'100% - 52px - 56px');
        flex: auto;
        display: flex;
        flex-direction: column;