Merge branch 'develop' into 'test'

Develop See merge request !114
2021-09-01 08:23:43 +00:00
parent 33fd2d7f32 1df56128e8
commit 29335c3506
9 changed files with 712 additions and 645 deletions
@@ -113,7 +113,8 @@
                    <el-button
                      size="mini"
                      type="danger"
-                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                      @click="cancelWarning(scope.$index, scope.row)">取消预警
+                    </el-button>
                  </template>
                </el-table-column>
              </el-table>
@@ -183,7 +184,8 @@
                    <el-button
                      size="mini"
                      type="danger"
-                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                      @click="cancelWarning(scope.$index, scope.row)">取消预警
+                    </el-button>
                  </template>
                </el-table-column>
              </el-table>
@@ -255,7 +257,8 @@
                    <el-button
                      size="mini"
                      type="danger"
-                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                      @click="cancelWarning(scope.$index, scope.row)">取消预警
+                    </el-button>
                  </template>
                </el-table-column>
              </el-table>
@@ -327,7 +330,8 @@
                    <el-button
                      size="mini"
                      type="danger"
-                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                      @click="cancelWarning(scope.$index, scope.row)">取消预警
+                    </el-button>
                  </template>
                </el-table-column>
              </el-table>
@@ -544,7 +548,9 @@ export default {
              break
          }
        }
-        for (const loading in this.loading) { this.loading[loading] = false }
+        for (const loading in this.loading) {
+          this.loading[loading] = false
+        }
      }, e => {
      });
    },
@@ -580,7 +586,9 @@ export default {
              break
          }
        }
-         for(const loading in this.loading) {this.loading[loading] = false}
+        for (const loading in this.loading) {
+          this.loading[loading] = false
+        }
      }, e => {
      });
    },
@@ -800,7 +808,9 @@ export default {
    // this.queryNewTypeByPage();
    // this.queryProductionVehicleByPage();
    // 四个预警同时查询,loading全部打开
-    for (const loading in this.loading) { this.loading[loading] = true }
+    for (const loading in this.loading) {
+      this.loading[loading] = true
+    }
    this.getEarlyDate();

  }
@@ -963,6 +973,7 @@ export default {
          /deep/ .el-input__inner {
            width: 155px;
          }
+
          .choose-time-area {
            /deep/ .el-input__inner {
              width: 220px;
@@ -1017,9 +1017,12 @@
                    <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
                </el-table-column>
                <el-table-column
-                        prop="standStateShow"
-                        label="标准状态"
+                        prop="textStatus"
+                        label="文本状态"
                        width="130">
+                  <template slot-scope="scope">
+                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                  </template>
                </el-table-column>
            </el-table>
            <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -1020,9 +1020,12 @@
          <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
        </el-table-column>
        <el-table-column
-                prop="standStateShow"
-                label="标准状态"
+                prop="textStatus"
+                label="文本状态"
                width="130">
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
        </el-table-column>
      </el-table>
      <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -1061,6 +1064,8 @@ export default {
  },
  data () {
    return {
+      textStatus:'',//文本状态
+      textStatusMap: {}, // 文本状态id与name对应
      countryArr:'',
      activeName:'1',
      // 当前流程类型(1待办/2已办)
@@ -1765,6 +1770,12 @@ export default {
        }
      })
    },
+// 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
  },
  created(){
    this.getData()
@@ -1794,6 +1805,7 @@ export default {
      this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
      this.treeStatus = true
      this.key++
+      this.setMap(this.standStateOptions);
    })
    this.busVsFunc()
    this.modelFunc()
@@ -311,10 +311,15 @@ export default {
        if (item.responUserList !== undefined) {
          let listJSON = JSON.parse(JSON.stringify(item.responUserList))
          this.dataList = [listJSON][0].standardInfoList
+        } else {
+          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) {
            this.fileTextList = item.fileText
@@ -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;
    },
    //提交事件
@@ -113,22 +113,22 @@
            </template>
          </el-table-column>
          <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
            width="190px"
            align="center"
            label="新车型实施日期">
            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
            </template>
          </el-table-column>
          <el-table-column
-            prop="zccssrq"
+            prop="zccssrqgj"
            align="center"
            sortable
            width="190px"
            label="在产车实施日期">
            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
            </template>
          </el-table-column>
          <el-table-column
@@ -344,7 +344,7 @@
                align="center"
                label="新车型实施日期">
                <template slot-scope="scope">
-                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
+                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
                </template>
              </el-table-column>
              <el-table-column
@@ -353,7 +353,7 @@
                align="center"
                label="在产车实施日期">
                <template slot-scope="scope">
-                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
+                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
                </template>
              </el-table-column>
              <el-table-column
@@ -445,10 +445,32 @@ export default {
      taskIds: this.$route.query.taskIds,
      pId: this.$route.query.prcId,
      standMap: new Map(),
-      textStatusMap: {}// 文本状态id与name对应
+      textStatusMap: {},// 文本状态id与name对应
    };
  },
+  mounted() {
+    this.processTable();
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+      this.setMap(res.data.WBZTCLASS);// 文本状态
+      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+      this.showLocalProductData(this.getLocalPro);
+    }, e => {
+    });
+  },
  methods: {
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
    processTable() {
      this.$http.get("lawss/activiti/get_list_by_instance", {
        prcNum: this.$route.query.prcNum,
@@ -659,35 +681,13 @@ export default {
        this.total = res.data.total;
      });
    },
-    // 将文本状态的id与name对应
-    setMap(data) {
-      data.forEach(item => {
-        this.$set(this.textStatusMap, item.value, item.label);
-      });
-    },
  },
  computed: {
    listNoDataText() {
      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
    }
  },
-  mounted() {
-    this.processTable();
-    this.getData();
-    // 查询各下拉框数据
-    this.$http.get("sys/dictype/getDicTypeListCode", "", {
-      _this: this,
-      loading: "loading"
-    }, res => {
-      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
-      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
-      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
-      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
-      this.setMap(this.standStateOptions);
-      this.showLocalProductData(this.getLocalPro);
-    }, e => {
-    });
-  }
+
 };
 </script>

@@ -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>
@@ -39,19 +45,23 @@
        </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"
+        <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>
-      <!--      <el-tabs type="border-card">-->
-      <!--        <el-tab-pane :label="localProEO.productName" class="details-panel-tabs-item">-->
      <div class="table-wrapper">
        <el-table
          :data="dataList"
@@ -172,8 +182,6 @@
          @pageSizeChange="pageSizeChangeLaws"></pagination>
      </div>
      <loading :loading="loading">数据获取中</loading>
-      <!--        </el-tab-pane>-->
-      <!--      </el-tabs>-->
    </div>
    <!-- 调取弹窗 -->
    <el-drawer
@@ -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
@@ -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">