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

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

@@ -181,13 +181,24 @@
               <el-col :span="12">
                 <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
                   <el-select :disabled="disabledXX"  :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
-                    <el-option
+                    <template v-if="form.standInData === '0'">
-                      v-for="item in standStateOptions"
+                      <el-option
-                      placeholder="请选择"
+                        v-for="item in standStateOptions0"
-                      :key="item.value"
+                        placeholder="请选择"
-                      :value="item.value"
+                        :key="item.value"
-                      :label="item.label"
+                        :value="item.value"
-                    ></el-option>
+                        :label="item.label"
+                      ></el-option>
+                    </template>
+                    <template v-else>
+                      <el-option
+                        v-for="item in standStateOptions1"
+                        placeholder="请选择"
+                        :key="item.value"
+                        :value="item.value"
+                        :label="item.label"
+                      ></el-option>
+                    </template>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="verifySarStandard && form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
@@ -1731,7 +1742,8 @@ export default {
       countryOptions: [],//国家地区
       standSortOptions: [], // 标准类别
       standNatureOptions: [], // 标准性质
-      standStateOptions: [], // 文本状态
+      standStateOptions0: [], // 文本状态 - 国内
+      standStateOptions1: [], // 文本状态 - 海外
       standSystemOptions: [], // 标准体系
       busVppsOptions: [], // 车系体系架构
       busVppsChildOptions: [], // 车系体系架构子集合
@@ -3482,7 +3494,8 @@ export default {
           standOptions.push(item)
         }
       })
-      this.standStateOptions = standOptions // 文本状态
+      this.standStateOptions0 = standOptions // 文本状态
+      this.standStateOptions1 = res.data.WBZTCLASS
       this.standSystemOptions = res.data.BZTXCLASS // 标准体系
       this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
       this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
@@ -3497,7 +3510,8 @@ export default {
       this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
       this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
-      this.setMap(this.standStateOptions)
+      this.setMap(this.standStateOptions0)
+      this.setMap(this.standStateOptions1)
       this.bpnId = this.$route.query.bpnId
       if (this.bpnId !== undefined) {
         this.getTaskId()

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -178,58 +178,113 @@
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
             <el-table-column
               type="selection"
-              width="55"
+              fixed="left"
-              align="center">
+              width="60"
-            </el-table-column>
+            >
-            <el-table-column
-              prop="standNumber"
-              label="标准编号">
-            </el-table-column>
-            <el-table-column
-              prop="standName"
-              label="标准名称">
-            </el-table-column>
-            <el-table-column
-              v-if="sarProject.position === '1' && !itemType"
-              prop="lastVersionNumber"
-              label="上一版本标准编号">
-            </el-table-column>
-            <el-table-column
-              v-if="sarProject.position === '2'"
-              prop="correspondDomesticStandard"
-              label="对应国行标">
             </el-table-column>
             <el-table-column
+              sortable="custom"
+              show-overflow-tooltip
               prop="specificItem"
-              label="具体章条">
+              width="90"
+              label="条款号"
+            >
             </el-table-column>
             <el-table-column
-                    prop="carModel"
+              show-overflow-tooltip
-                    align="center"
+              prop="itemName"
-                    label="解读内容">
+              min-width="300"
-              <el-table-column
+              label="条款名称"
-                      show-overflow-tooltip
+            >
-                      v-if="itemType"
+            </el-table-column>
-                      prop="coreTechnicalRequirement"
+            <el-table-column
-                      label="核心技术要求(简述、请勿抄写标准)">
+              prop="termsConditions"
-              </el-table-column>
+              min-width="200"
-              <el-table-column
+              label="条款内容"
-                      show-overflow-tooltip
+              :resizable="false"
-                      v-if="sarProject.position === '1' && !itemType"
+            >
-                      prop="comparedWithPrevious"
+              <template slot-scope="scope">
-                      label="相对于上一版本变化点">
+                <!--              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
-              </el-table-column>
+                <!--                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
-              <el-table-column
+                <!--              </div>-->
-                      show-overflow-tooltip
+                <el-tooltip placement="top">
-                      v-if="sarProject.position === '2'"
+                  <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>
-                      prop="comparedDomesticStandard"
+                  <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
-                      label="相对于国行标差异点">
+                    {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
-              </el-table-column>
+                  </div>
-              <el-table-column
+                </el-tooltip>
-                      show-overflow-tooltip
+              </template>
-                      prop="complianceState"
+            </el-table-column>
-                      label="合规性分析">
+            <el-table-column
-              </el-table-column>
+              prop="readContent"
+              width="170"
+              label="核心技术要求/变化点"
+              show-overflow-tooltip
+            >
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="comparedWithPrevious"
+              label="基于上一版本差异"
+              width="170">
+            </el-table-column>
+            <el-table-column
+              prop="xccssrq"
+              label="新车型实施日期(文本)"
+              width="180">
+            </el-table-column>
+            <el-table-column
+              prop="zccssrq"
+              label="在产车实施日期(文本)"
+              width="170">
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="applyArctic"
+              label="适用车型"
+              width="90"
+            >
+              <template slot-scope="scope">
+                {{JSON.parse(scope.row.applyArctic).join(',')}}
+              </template>
+            </el-table-column>
+            <!--          <el-table-column-->
+            <!--              prop="responsibleUnit"-->
+            <!--              label="责任部门">-->
+            <!--          </el-table-column>-->
+            <el-table-column
+              prop="dutyEngineer"
+              label="责任工程师"
+              width="100">
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              label="符合性状态"
+              width="100">
+              <template slot-scope="scope">
+                {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="complianceState"
+              label="合规性分析"
+              width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="50" fixed="right">
+              <template slot-scope="scope">
+                <div @click.stop>
+                  <el-dropdown trigger="click" @command="handleCommand">
+                    <i class="iconfont">&#xe61e;</i>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '查看']">查看
+                      </el-dropdown-item>
+                      <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>-->
+                      <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>-->
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </div>
+              </template>
             </el-table-column>
           </el-table>
           <pagination
@@ -253,6 +308,120 @@
         <el-button type="primary" size="mini" @click="riskDegreeModal = false">关闭</el-button>
       </span>
     </el-dialog>
+    <!--分解单-查看 （标准拆分-属性）-->
+    <el-drawer
+      :wrapperClosable="false"
+      size="800px"
+      title="查看属性信息"
+      :visible.sync="showItemInfoModal"
+    >
+      <div class="see-drawer-content">
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsNum">{{
+              standShowItemEO.itemsNum
+            }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="条款名称">条款名称</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsName">{{
+              standShowItemEO.itemsName
+            }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="内容简介">条款内容</label>
+          <span class="see-drawer-val" style="font-size: 12px"
+                :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
+              standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
+            }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="核心技术要求">核心技术要求</label>
+          <span class="see-drawer-val" style="font-size: 12px"
+                :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
+            {{
+              standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
+            }}</span>
+        </div>
+      
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
+          <span class="see-drawer-val" style="font-size: 12px"
+                :title="standShowItemEO.xcxssrq">{{
+              standShowItemEO.xccssrq
+            }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="在产车实施日期">在产车实施日期</label>
+          <span class="see-drawer-val" style="font-size: 12px"
+                :title="standShowItemEO.zccssrq">{{
+              standShowItemEO.zccssrq
+            }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{
+              standShowItemEO.applyArctic
+            }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="责任部门">责任部门</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.responsibleUnit">{{
+              standShowItemEO.responsibleUnit
+            }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="责任工程师">责任工程师</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.dutyEngineer">
+            {{ standShowItemEO.dutyEngineer }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="基于上一版本差异">基于上一版本差异</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
+            {{ standShowItemEO.comparedWithPrevious }}</span>
+        </div>
+      
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
+              {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
+          </span>
+      
+        </div>
+      
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
+            {{ standShowItemEO.complianceState }}</span>
+        </div>
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="FO">FO</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
+        <!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
+        <!--              standShowItemEO.dutyEngineerShow-->
+        <!--            }}</span>-->
+        <!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
+        <!--        </div>-->
+      
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
+        <!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
+        <!--        </div>-->
+        <!--        <div class="see-drawer-div">-->
+        <!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
+        <!--          <span class="see-drawer-val"-->
+        <!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
+        <!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
+        <!--            }}</span>-->
+        <!--        </div>-->
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -296,9 +465,61 @@
         sarProStateListDatas: [], // 符合性项目列表数据
         sarProStateTableHeight: null,
         standId: '', // 符合性项目id
+        showItemInfoModal: false,
+        standShowItemEO: {},
       }
     },
     methods: {
+      // ...
+      handleCommand(command) {
+        switch (command[1]) {
+          case '查看':
+            this.handlePreview(command[0])
+            break
+        }
+      },
+      // 分解单-查看
+      handlePreview(item) {
+        this.standShowItemEO = item
+        this.showItemInfoModal = true
+        let fileList = []
+        item.defaultFileList = []
+
+
+        if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
+          this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
+        }
+        this.standShowItemEO.responsibleUnit = this.standShowItemEO.responsibleUnitShow
+        // 请求文件信息
+        if (item.relevanceFile != null && item.relevanceFile !== '') {
+          let paramefile = item.relevanceFile
+          if (paramefile.charAt(paramefile.length - 1) === ',') {
+            paramefile = paramefile.substring(0, paramefile.length - 1)
+          }
+          this.$http.get('att/attFile/getMultiFileInfos', {
+            fileIds: paramefile
+          }, {
+            _this: this
+          }, res => {
+            fileList = res.data
+            if (fileList != null && fileList.length > 0) {
+              for (let i = 0; i < fileList.length; i++) {
+                let obj = {name: '', response: {}}
+                obj.name = fileList[i].oldFileName
+                obj.response.data = fileList[i]
+                item.defaultFileList.push(obj)
+              }
+            }
+            this.standShowItemEO = JSON.parse(JSON.stringify(item))
+            if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
+              this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
+            }
+            // let selectNode = this.getTreeNameByid(this.standShowItemEO.responsibleUnit)
+            this.standShowItemEO.orgName = this.standShowItemEO.responsibleUnitShow
+          }, e => {
+          })
+        }
+      },
       risSubmit () {
         this.$http.postData('sarStandardComplianceAssessResult/sar-interpretation-national-standard/updateById', {
           standNumber: this.editData.standNumber,

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -1387,7 +1387,7 @@ export default {
     },
     //获取产品线数据
     getProductData() {
-      this.$http.get("sarStandProjectLibrary/queryProjectManager", {
+      this.$http.get("sarStandProjectLibrary/queryProjectManagerXL", {
         current: 1,
         PageSize:100,
       }, {