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

2021-09-01 17:08:15 +08:00
parent 161ec20bc3 5d9bb87aa7
commit 240679cd35
8 changed files with 685 additions and 612 deletions
@@ -312,8 +312,13 @@ export default {
          let listJSON = JSON.parse(JSON.stringify(item.responUserList))
          this.dataList = [listJSON][0].standardInfoList
        } else {
-          let listJSONInfo = item.info
-          this.dataList = [listJSONInfo]
+          if (item.dockUserList !== undefined) {
+            let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
+            this.dataList = listJSON[0].standardInfoList
+          }else {
+            let listJSONInfo = item.info
+            this.dataList = [listJSONInfo]
+          }
        }
        this.dataList.forEach(item => {
          if (item.fileText.length !== 0) {
@@ -226,7 +226,7 @@
                  <div style="margin-top: 10px;width: 300px;">
                    <el-input v-model="roleForm.statuteMinister" style="display: none;"></el-input>
                    <el-input v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长"
-                              @click.native="choiceZRR('statuteMinister', '选择技术管理中心主任', roleForm.statuteMinister)"></el-input>
+                              @click.native="choiceZRR('statuteMinister', '选择标准法规部部长', roleForm.statuteMinister)"></el-input>
                  </div>
                </el-form-item>
              </el-card>
@@ -533,6 +533,13 @@ export default {
    },
    //项目的多选框改变
    selectListChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
      this.selectedList = data;
    },
    pageChange(page) {
@@ -592,10 +592,24 @@ export default {
    },
    //清单勾选框数据
    selectListChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
      this.selectedList = data;
    },
    //项目勾选框数据
    selectProjectChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
      this.selectProject = data;
    },
    //提交事件
@@ -372,6 +372,7 @@ export default {
  },
  data() {
    return {
+      multipleSelection:[],
      active: "1", //默认显示
      commentText: "",
      modalshowflag: false,
@@ -434,6 +435,15 @@ export default {
    };
  },
  methods: {
+    // 表格勾选
+    handleSelectionChange(val) {
+      // 单选
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      }
+      this.multipleSelection = val
+    },
    handleTabs(type) {
      this.active = type;
    },
@@ -581,10 +591,24 @@ export default {
    },
    //清单勾选框数据
    selectListChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
      this.selectedList = data;
    },
    //项目勾选框数据
    selectProjectChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
      this.selectProject = data;
    },
    //提交事件
@@ -398,7 +398,7 @@ export default {
        // 相关人员姓名
      },
      // 新增编辑弹窗里的数据
-      localProEODefault: {
+     /* localProEODefault: {
        // 项目相关人员
        userEOList: [],
        //  产品代码
@@ -460,7 +460,7 @@ export default {
        // 相关人员信息
        relatePersonShow: ""
        // 相关人员姓名
-      },
+      },*/
      //查询3类
      projectLibrarySearch: {
        // 项目名称
@@ -14,10 +14,16 @@
            <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
            <el-col :span="5" :push="2">
              <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
-                <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div>
+                <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
+                  {{ localProEO.projectName }}
+                </div>
                <div v-else></div>
-                <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div>
-                <div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div>
+                <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
+                  项目名称: <span class="valueColor">{{
+                    localProEO.projectName && localProEO.projectName.substring(0, 15) + "..."
+                  }}</span></div>
+                <div class="check-item-value" v-else>项目名称: <span class="valueColor">{{ localProEO.projectName }}</span>
+                </div>
              </el-tooltip>
            </el-col>
            <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
@@ -32,52 +38,56 @@
          <el-row style="margin-top: 10px">
            <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
            <el-col :span="5" :push="1"> 项目计划开始时间: <span
-                class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
+              class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
            <el-col :span="5" :push="2">项目计划完成时间: <span
-                class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
+              class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
          </el-row>
        </div>
      </el-card>
      <div class="action-bar">
-<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>-->
-<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除-->
-<!--        </el-button>-->
-        <el-button class="common-button-default export-button"
-                   size="mini" @click="exportStandard"
-                   v-btn-permission="''"
-                   title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
-                   icon="export"
-        >导出
-        </el-button>
-      </div>
-      <!--      <el-tabs type="border-card">-->
-      <!--        <el-tab-pane :label="localProEO.productName" class="details-panel-tabs-item">-->
+        <el-row>
+          <el-col :span="12">
+            <span style="font-size: 16px;font-weight: bold">清单版本: {{  }}</span>
+          </el-col>
+          <el-col :span="12" style="text-align: end">
+            <el-button
+              type="primary"
+              class="common-button-default export-button"
+              size="mini" @click="exportStandard"
+              v-btn-permission="''"
+              title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
+              icon="export"
+            >导出
+            </el-button>
+          </el-col>
+        </el-row>
+        </div>
      <div class="table-wrapper">
        <el-table
-            :data="dataList"
-            style="width: 100%"
-            :height="Height"
-            border
-            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          :data="dataList"
+          style="width: 100%"
+          :height="Height"
+          border
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
                 fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px',textAlign: 'center'}"
-            @selection-change="standSelectChange"
-            ref="selection"
-            :cell-style="{ textAlign: 'center' }"
+          @selection-change="standSelectChange"
+          ref="selection"
+          :cell-style="{ textAlign: 'center' }"
        >
          <el-table-column
-              type="selection"
-              width="55"
-              align="center">
+            type="selection"
+            width="55"
+            align="center">
          </el-table-column>
          <el-table-column
-              prop="standNumber"
-              label="标准号"
-              fixed="left"
-              width="260px"
+            prop="standNumber"
+            label="标准号"
+            fixed="left"
+            width="260px"
          >
            <template slot-scope="scope">
              <span v-if="scope.row.standSortShow === undefined"
-                  style="margin-left: 10px">{{
+                    style="margin-left: 10px">{{
                  scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear
                }}</span>
              <span v-else
@@ -87,22 +97,22 @@
            </template>
          </el-table-column>
          <el-table-column
-              prop="standName"
-              label="中文名称"
-              width="180px"
+            prop="standName"
+            label="中文名称"
+            width="180px"
          >
          </el-table-column>
          <el-table-column
-              prop="standEnName"
-              label="英文名称"
-              width="180px"
+            prop="standEnName"
+            label="英文名称"
+            width="180px"
          >
          </el-table-column>
          <el-table-column
-              prop="ssrq"
-              width="190px"
-              sortable
-              label="标准实施日期">
+            prop="ssrq"
+            width="190px"
+            sortable
+            label="标准实施日期">
            <template slot-scope="scope">
              <span style="margin-left: 10px">{{
                  scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-'
@@ -110,9 +120,9 @@
            </template>
          </el-table-column>
          <el-table-column
-              prop="xcxssrqgj"
-              width="190px"
-              label="新车型实施日期">
+            prop="xcxssrqgj"
+            width="190px"
+            label="新车型实施日期">
            <template slot-scope="scope">
              <span style="margin-left: 10px">{{
                  scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-'
@@ -120,10 +130,10 @@
            </template>
          </el-table-column>
          <el-table-column
-              prop="zccssrqgj"
-              sortable
-              width="190px"
-              label="在产车实施日期">
+            prop="zccssrqgj"
+            sortable
+            width="190px"
+            label="在产车实施日期">
            <template slot-scope="scope">
              <span style="margin-left: 10px">{{
                  scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-'
@@ -131,9 +141,9 @@
            </template>
          </el-table-column>
          <el-table-column
-              prop="zrbm"
-              label="责任部门"
-              width="180px"
+            prop="zrbm"
+            label="责任部门"
+            width="180px"
          >
            <template slot-scope="scope">
              <span style="margin-left: 10px">
@@ -142,45 +152,43 @@
            </template>
          </el-table-column>
          <el-table-column
-              show-overflow-tooltip
-              prop="kccvppsbm"
-              width="180px"
-              label="卡车VPPS编码">
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            width="180px"
+            label="卡车VPPS编码">
          </el-table-column>
          <el-table-column
-              show-overflow-tooltip
-              prop="cycvppscn"
-              width="180px"
-              label="卡车vpps中文名称">
+            show-overflow-tooltip
+            prop="cycvppscn"
+            width="180px"
+            label="卡车vpps中文名称">
          </el-table-column>
          <el-table-column
-              prop="cycvppsbm"
-              width="180px"
-              label="乘车VPPS编码">
+            prop="cycvppsbm"
+            width="180px"
+            label="乘车VPPS编码">
          </el-table-column>
          <el-table-column
-              prop="cycvppscn"
-              width="180px"
-              label="乘车vpps中文名称">
+            prop="cycvppscn"
+            width="180px"
+            label="乘车vpps中文名称">
          </el-table-column>
        </el-table>
        <pagination
-            style="position: relative;"
-            :page="page"
-            :total="total"
-            @pageChange="pageChangeLaws"
-            @pageSizeChange="pageSizeChangeLaws"></pagination>
+          style="position: relative;"
+          :page="page"
+          :total="total"
+          @pageChange="pageChangeLaws"
+          @pageSizeChange="pageSizeChangeLaws"></pagination>
      </div>
      <loading :loading="loading">数据获取中</loading>
-      <!--        </el-tab-pane>-->
-      <!--      </el-tabs>-->
    </div>
    <!-- 调取弹窗 -->
    <el-drawer
-        title="调取"
-        :visible.sync="detailedListModel"
-        size="900px"
-        custom-class="demo-drawer"
+      title="调取"
+      :visible.sync="detailedListModel"
+      size="900px"
+      custom-class="demo-drawer"
    >
      <div class="demo-drawer-content">
        <div style="position: absolute;bottom: 48px;top:16px;left: 0;right: 0">
@@ -245,9 +253,9 @@
                align="center"
                width="260px"
              >
-<!--                <template slot-scope="scope">-->
-<!--                  <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>-->
-<!--                </template>-->
+                <!--                <template slot-scope="scope">-->
+                <!--                  <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>-->
+                <!--                </template>-->
              </el-table-column>
              <el-table-column
                prop="detailedListState"
@@ -265,7 +273,8 @@
                align="center">
                <template slot-scope="scope">
            <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
              }}</span>
                </template>
              </el-table-column>
@@ -274,7 +283,10 @@
                label="更新时间"
                align="center">
                <template slot-scope="scope">
-                  <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
+                  <div>{{
+                      scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
+                    }}
+                  </div>
                </template>
              </el-table-column>
              <el-table-column
@@ -292,12 +304,12 @@
            </el-table>
          </div>
          <pagination
-              :page="pageNo"
-              :pageSize="pageSizeNo"
-              :total="totalNo"
-              @pageChange="pageChangeNo"
-              @pageSizeChange="pageSizeChangeNo"
-              style="position: absolute;"
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+            style="position: absolute;"
          />
        </div>
      </div>
@@ -477,7 +489,7 @@ export default {
      pageSize: this.$store.getters.userInfo.configContent,
      pageNo: 1,
      pageDo: 1,
-      pageSizeDo:  this.$store.getters.userInfo.configContent,
+      pageSizeDo: this.$store.getters.userInfo.configContent,
      standardData: [], //添加标准数据
      detailedId: '', //清单id
      totalNo: 0,
@@ -512,7 +524,7 @@ export default {
  },
  methods: {
    //搜索清单
-    searchSarAccess(){
+    searchSarAccess() {
      this.pageDo = 1
      this.pageSizeDo = this.$store.getters.userInfo.configContent;
      this.transfer()
@@ -523,7 +535,7 @@ export default {
      this.pageSizeNo = this.$store.getters.userInfo.configContent;
      this.getStand()
    },
-    clearSearchAccess(){
+    clearSearchAccess() {
      this.sarSarAccessEOSearch.carType = ''
      this.sarSarAccessEOSearch.detailedListName = ''
      this.transfer()
@@ -547,11 +559,11 @@ export default {
      this.pageNo = page
      this.getStand()
    },
-    pageChangeDo(page){
+    pageChangeDo(page) {
      this.pageDo = page
      this.transfer()
    },
-    pageSizeChangeDo(pageSize){
+    pageSizeChangeDo(pageSize) {
      this.pageDo = pageSize
      this.transfer()
    },
@@ -582,7 +594,7 @@ export default {
      });
    },
    //点击获取项目清单
-    transfer(){
+    transfer() {
      this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
        page: 1,
        pageSize: this.pageSize,
@@ -592,14 +604,14 @@ export default {
        _this: this
      }, res => {
        this.sarAccessListDatas = res.data.records;
-        this.sarAccessListDatas.forEach(item =>{
+        this.sarAccessListDatas.forEach(item => {
          // 适用车型转换
          if (item.carType !== null) {
            let k = (item.carType || "").split(',')
            for (let i in this.energyKindOptions) {
-              for (let m = 0; m< k.length; m++) {
+              for (let m = 0; m < k.length; m++) {
                if (this.energyKindOptions[i].value === k[m]) {
-                  k[m]  = this.energyKindOptions[i].label
+                  k[m] = this.energyKindOptions[i].label
                }
                item.carType = k.join(',')
              }
@@ -692,8 +704,8 @@ export default {
      })
    },
    //调取清单取消事件
-    cancelDetailed(){
-     this.detailedListModel = false;
+    cancelDetailed() {
+      this.detailedListModel = false;
    },
    //添加标准取消事件
    cancelStand() {
@@ -747,28 +759,28 @@ export default {
      }
    },
    //获取标准
-    getStandrd(data){
+    getStandrd(data) {
      this.detailedId = data.id
      this.getStand();
    },
-    getStand(data){
+    getStand(data) {
      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-        id:this.detailedId,
+        id: this.detailedId,
        ...this.standCommonlySearch,
      }, {
        _this: this
      }, res => {
-        if(res.data === null){
+        if (res.data === null) {
          this.standardData = ''
-          this.totalDo =''
+          this.totalDo = ''
          this.standModel = true;
        }
        this.standardData = res.data.records
        this.standardData.forEach(item => {
-          if(item.zccssrqgj === '-'){
+          if (item.zccssrqgj === '-') {
            item.zccssrqgj = ''
          }
-          if(item.xcxssrqgj === '-'){
+          if (item.xcxssrqgj === '-') {
            item.xcxssrq = ''
          }
        })
@@ -895,7 +907,7 @@ export default {
            ids += ',\'' + this.selectList[i].standId + '\''
          }
          const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+            'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
          window.open(exportURL, '_self')
          this.$message.success('导出信息成功')
        }
@@ -911,7 +923,7 @@ export default {
            }
          }
          const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+            'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
          window.open(exportURL, '_self')
          this.$message.success('导出信息成功')
        }
@@ -190,7 +190,7 @@
      destroy-on-close
      :wrapperClosable="false"
      class="seeHisToryDraw"
-      size="1000px"
+      size="600px"
    >
      <div class="demo-drawer-content">
        <div class="el-drawer-form" style="height: auto">