fix:修复了承建单位不显示问题

xiehao
Commit b6a0e3cb authored May 28, 2024 by xiehao
Showing with 74 additions and 121 deletions
src/views/projectInfoManage/index.vue
--- a/src/views/projectInfoManage/index.vue
+++ b/src/views/projectInfoManage/index.vue
@@ -5,52 +5,28 @@
        <div class="search_menu_item_container">
          <div class="search_menu_item">
            <span class="search_title">组织单位</span>
-            <!-- <el-input
+            <el-select v-model="searchParams.let1" placeholder="请选择" class="search_item" filterable>
-              v-no-backslash
-              v-model="searchParams.let1"
-              maxlength="100"
-              placeholder="请输入内容"
-              class="search_item"
-            ></el-input> -->
-            <el-select
-              v-model="searchParams.let1"
-              placeholder="请选择"
-              class="search_item"
-              filterable
-            >
              <el-option
                  v-for="item in sysOrgOptions"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
-              ></el-option>
+              />
            </el-select>
          </div>
          <div class="search_menu_item">
            <span class="search_title">业务部门</span>
-            <!-- <el-input
+            <el-select filterable v-model="searchParams.let2" placeholder="请选择" class="search_item">
-              v-no-backslash
-              v-model="searchParams.let2"
-              maxlength="100"
-              placeholder="请输入内容"
-              class="search_item"
-            ></el-input> -->
-            <el-select
-              filterable
-              v-model="searchParams.let2"
-              placeholder="请选择"
-              class="search_item"
-            >
              <el-option
                  v-for="item in sysDeptOptions"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
-              ></el-option>
+              />
            </el-select>
          </div>
          <div class="search_menu_item">
-            <span class="search_title">项目名称</span>
+            <span class="search_title">系统名称</span>
            <el-input
                v-no-backslash
                v-model="searchParams.let3"
@@ -100,10 +76,8 @@
            size="medium"
            icon="el-icon-document-add"
            @click="operation('add', null)"
-          >新建项目</el-button
+        >新建项目
-        >
+        </el-button>
-        <!-- <el-button type="primary" size="medium" icon="el-icon-document-add" @click="operation('add', null)">续建项目</el-button> -->
-        <!-- <el-button type="primary" size="medium" icon="el-icon-delete">删除</el-button> -->
      </div>
      <el-table
          :height="tableHeight"
@@ -178,7 +152,7 @@
          </template>
        </el-table-column>
        <el-table-column prop="projAmount" label="项目金额" align="right">
-          <template slot-scope="scope">
+          <template v-slot="scope">
            <span style="font-weight: bold">{{ scope.row.projAmount | formatMoney }}</span>
          </template>
        </el-table-column>
@@ -204,7 +178,8 @@
                  size="mini"
                  @click="operation('edit', scope.row)"
                  :disabled="scope.row.state == 1"
-                >编辑</el-button
+              >编辑
+              </el-button
              >
              <el-button
                  class="shanChu_btn"
@@ -212,7 +187,8 @@
                  size="mini"
                  @click="operation('delete', scope.row)"
                  :disabled="scope.row.state == 1"
-                >删除</el-button
+              >删除
+              </el-button
              >
            </div>
          </template>
@@ -365,14 +341,7 @@
        <div class="search_menu_item_container">
          <div class="search_menu_item" style="width: auto">
            <span class="search_title">组织单位</span>
-            <!-- <el-input
+            <el-select filterable v-model="searchParams2.let1" placeholder="请选择" class="search_item">
-              v-no-backslash
-              v-model="searchParams2.let1"
-              maxlength="100"
-              placeholder="请输入内容"
-              class="search_item"
-            ></el-input> -->
-            <el-select v-model="searchParams2.let1" placeholder="请选择">
              <el-option
                  v-for="item in sysOrgOptions"
                  :key="item.value"
@@ -383,19 +352,7 @@
          </div>
          <div class="search_menu_item" style="width: auto">
            <span class="search_title">业务部门</span>
-            <!-- <el-input
+            <el-select filterable v-model="searchParams2.let2" placeholder="请选择" class="search_item">
-              v-no-backslash
-              v-model="searchParams2.let2"
-              maxlength="100"
-              placeholder="请输入内容"
-              class="search_item"
-            ></el-input> -->
-            <el-select
-                filterable
-                v-model="searchParams2.let2"
-                placeholder="请选择"
-                class="search_item"
-                >
              <el-option
                  v-for="item in sysDeptOptions"
                  :key="item.value"
@@ -405,7 +362,7 @@
            </el-select>
          </div>
          <div class="search_menu_item" style="width: auto">
-            <span class="search_title">项目名称</span>
+            <span class="search_title">系统名称</span>
            <el-input
                v-no-backslash
                v-model="searchParams2.let3"
@@ -416,11 +373,7 @@
          </div>
          <div class="search_menu_item" style="width: auto">
            <span class="search_title">建设类型</span>
-            <el-select
+            <el-select v-model="searchParams2.let4" placeholder="请选择" class="search_item">
-              v-model="searchParams2.let4"
-              placeholder="请选择"
-              class="search_item"
-            >
              <el-option
                  v-for="item in jianSheLeiXingSelect"
                  :key="item.value"
@@ -487,22 +440,17 @@
            <span v-else>自建</span>
          </template>
        </el-table-column>
-        <el-table-column
+        <el-table-column prop="buildOrg" label="承建单位" align="center">
-          prop="buildOrg"
+          <template v-slot="scope">
-          label="承建单位"
+            <span>{{ scope.row.buildOrg | orgNameFilter(that) }}</span>
-          align="center"
+          </template>
-        ></el-table-column>
+        </el-table-column>
        <el-table-column
            prop="projectManager"
            label="项目经理"
            align="center"
        ></el-table-column>
        <el-table-column
-          prop="createMan"
-          label="创建人"
-          align="center"
-        ></el-table-column>
-        <el-table-column
            prop="createTime"
            label="创建时间"
            align="center"
@@ -542,47 +490,28 @@
        <div class="search_menu_item_container">
          <div class="search_menu_item" style="width: auto">
            <span class="search_title">组织单位</span>
-            <!-- <el-input
+            <el-select filterable v-model="searchParams3.let1" placeholder="请选择" class="search_item">
-              v-no-backslash
-              v-model="searchParams3.let1"
-              maxlength="100"
-              placeholder="请输入内容"
-              class="search_item"
-            ></el-input> -->
-                <el-select v-model="searchParams3.let1" placeholder="请选择">
              <el-option
                  v-for="item in sysOrgOptions"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
-                    ></el-option>
+              />
            </el-select>
          </div>
          <div class="search_menu_item" style="width: auto">
            <span class="search_title">业务部门</span>
-            <!-- <el-input
+            <el-select filterable v-model="searchParams2.let2" placeholder="请选择" class="search_item">
-              v-no-backslash
-              v-model="searchParams3.let2"
-              maxlength="100"
-              placeholder="请输入内容"
-              class="search_item"
-            ></el-input> -->
-                <el-select
-                    filterable
-                    v-model="searchParams2.let2"
-                    placeholder="请选择"
-                    class="search_item"
-                    >
              <el-option
                  v-for="item in sysDeptOptions"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
-                    ></el-option>
+              />
            </el-select>
          </div>
          <div class="search_menu_item" style="width: auto">
-            <span class="search_title">系统名称</span>
+            <span class="search_title">项目名称</span>
            <el-input
                v-no-backslash
                v-model="searchParams.let3"
@@ -677,21 +606,16 @@
            <span v-else>是</span>
          </template>
        </el-table-column>
-        <el-table-column
+        <el-table-column prop="buildOrg" label="承建单位" align="center">
-          prop="buildOrg"
+          <template v-slot="scope">
-          label="承建单位"
+            <span>{{ scope.row.buildOrg | orgNameFilter(that) }}</span>
-          align="center"
+          </template>
-        ></el-table-column>
+        </el-table-column>
-        <el-table-column
+        <!--<el-table-column-->
-          prop="projectManager"
+        <!--    prop="projectManager"-->
-          label="项目经理"
+        <!--    label="项目经理"-->
-          align="center"
+        <!--    align="center"-->
-        ></el-table-column>
+        <!--&gt;</el-table-column>-->
-        <el-table-column
-          prop="createMan"
-          label="创建人"
-          align="center"
-        ></el-table-column>
        <el-table-column
            prop="createTime"
            label="创建时间"
@@ -764,12 +688,13 @@ import {
  getOrgOption,
  deleteProjectInfoManageTable
 } from '@/api/index.js'
-import { MessageBox, Message } from 'element-ui'
+import {MessageBox, Message} from 'element-ui'
 import $ from 'jquery'
-import { getDictTypeOptions } from '@/utils'
+import {getDictTypeOptions} from '@/utils'
 export default {
  name: 'projectInfoManage',
-  components: { ProjectDetail },
+  components: {ProjectDetail},
  data() {
    return {
      add_dialog2: false,
@@ -785,10 +710,10 @@ export default {
        let7: null,
      },
      rules: {
-        let1: [{ required: true, message: '请选择关联系统', trigger: 'blur' }],
+        let1: [{required: true, message: '请选择关联系统', trigger: 'blur'}],
-        let2: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
+        let2: [{required: true, message: '请输入项目名称', trigger: 'blur'}],
        let3: [
-          { required: true, message: '请选择是否续建', trigger: 'change' },
+          {required: true, message: '请选择是否续建', trigger: 'change'},
        ],
      },
      add_dialog: false,
@@ -902,7 +827,7 @@ export default {
        })
      })
      getDeptOption().then(res => {
-        if(res.code === 200) {
+        if (res.code === 200) {
          this.sysDeptOptions = res.data.map(v => {
            return {
              label: v.orgName,
@@ -912,7 +837,7 @@ export default {
        }
      })
      getOrgOption().then(res => {
-        if(res.code === 200) {
+        if (res.code === 200) {
          this.sysOrgOptions = res.data.map(v => {
            return {
              label: v.orgName,
@@ -1098,6 +1023,8 @@ export default {
        },
      ]
      this.ruleForm.let2 = row.prjName
+      this.ruleForm.let6 = row.projAmount
+      this.ruleForm.let7 = row.projectInitiationTime
      this.ruleForm.let3 = row.prjPlanClass
      if (row.prjPlanClass == 2) {
        this.selectRow3 = [
@@ -1298,7 +1225,7 @@ export default {
          const requestParams =
              this.is_add_edit == 'add'
                  ? params
-              : { ...params, prjId: this.prjId }
+                  : {...params, prjId: this.prjId}
          if (this.is_add_edit == 'add') {
            addProjectManageTable(requestParams).then((res) => {
              if (res.code == 200) {
@@ -1524,16 +1451,19 @@ export default {
 .confirmClass {
  background-color: #0d867f !important;
 }
 .el-message-box__content {
  padding: 60px 15px 60px 15px;
 }
 </style>
 <style scoped lang="scss">
 @import '@/styles/elementui.scss';
 .prjName {
  color: $color-primary;
  cursor: pointer;
 }
 .version_btn {
  display: flex;
  align-items: center;
@@ -1548,6 +1478,7 @@ export default {
  cursor: pointer;
  margin-left: 15px;
 }
 .cancel_version_btn {
  display: flex;
  align-items: center;
@@ -1562,6 +1493,7 @@ export default {
  cursor: pointer;
  margin-left: 15px;
 }
 .projectInfoManage {
  width: 100%;
  height: 100%;
@@ -1570,52 +1502,63 @@ export default {
  justify-content: flex-start;
  align-items: center;
 }
 .el-button--primary {
  background: rgba(13, 134, 127, 0.1);
  color: #0d867f;
  border: 0;
 }
 /deep/ .el-input-group__append {
  background-color: #0d867f;
  color: #fff;
  cursor: pointer;
 }
 .search_btn {
  width: 100%;
  display: flex;
  margin-top: 14px;
  margin-bottom: 14px;
 }
 .search_menu {
  display: flex;
  justify-content: space-between;
  margin-bottom: 14px;
 }
 .search_menu_item_container {
  display: flex;
  align-items: center;
 }
 .shanChu_btn {
  color: #dd6a15;
  background-color: #f8ebe2;
 }
 .search_menu_btn_container {
  display: flex;
  align-items: center;
 }
 .search_menu_item {
  display: flex;
  align-items: center;
  width: 344px;
 }
 .search_title {
  /* width: 20%; */
  flex-shrink: 0;
  margin-right: 15px;
 }
 .search_item {
  width: 60%;
 }
 .query_btn {
  display: flex;
  align-items: center;
@@ -1630,6 +1573,7 @@ export default {
  margin-right: 10px;
  cursor: pointer;
 }
 .reset_btn {
  display: flex;
  align-items: center;
@@ -1643,34 +1587,43 @@ export default {
  color: #666;
  cursor: pointer;
 }
 .btn_icon {
  margin-right: 10px;
 }
 .table_container {
  width: 97%;
  height: calc(100% - 40px);
  margin-top: 20px;
 }
 .el-pagination {
  margin-top: 30px;
 }
 /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
  background-color: #0d867f;
 }
 /deep/ .el-dialog__header {
  background-color: #0d867f;
  text-align: left;
 }
 /deep/ .el-dialog__title {
  color: #fff;
 }
 /deep/ .el-dialog__close {
  color: #fff;
 }
 .greenButton {
  background-color: #0d867f;
  color: #fff;
 }
 .el-form-item {
  display: flex;
  align-items: center;