fix:选择系统后重置筛选条件

xiehao
Commit 6b3cf932 authored May 29, 2024 by xiehao
Showing with 58 additions and 48 deletions
src/api/index.js
src/views/archi-asset-manage/index.vue
src/views/batchPlanManagement/Add.vue
src/views/batchPlanManagement/ApprovalDialog.vue
src/views/batchPlanManagement/index.vue
src/views/dictionaryManagement/index.vue
src/views/systemInfoManage/SystemInfoDetail.vue
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -711,6 +711,15 @@ export function addBatchPlan(params) {
 export function editBatchPlan(params) {
  return post(EADC_ARRCHITECTURE + '/bat-plan-info/upd', params)
 }
+// 审批批次计划
+export function approveBatchPlan(params) {
+  return post(EADC_ARRCHITECTURE + '/bat-plan-info/ae', params)
+}
+// 提交批次计划
+export function postBatchPlan(params) {
+  return post(EADC_ARRCHITECTURE + '/bat-plan-info/pt', params)
+}
 // 导出重复建设风险报告
 export function exportRiskReport(params) {
  return download(EADC_ARRCHITECTURE + '/prel-des-rvw/exportRiskReport', params)

--- a/src/views/archi-asset-manage/index.vue
+++ b/src/views/archi-asset-manage/index.vue
@@ -8,15 +8,13 @@
              size="medium"
              @click="operation('open_add_dialog1', null)"
          >选择系统
-          </el-button
+          </el-button>
-          >
          <el-button
              type="primary"
              size="medium"
              @click="operation('open_add_dialog2', null)"
          >选择项目
-          </el-button
+          </el-button>
-          >
          <div
              style="margin-left: 20px; margin-right: 20px"
              v-if="showSelectTitle.title"
@@ -33,8 +31,7 @@
            size="medium"
            @click="operation('open_add_dialog4', null)"
        >维护资产要素
-        </el-button
+        </el-button>
-        >
      </div>
    </el-card>
    <div class="archiAssetsManageContainer">
@@ -858,25 +855,25 @@
 <script>
 import ChooseSvg from '@/views/busi-assets-list/ChooseSvg.vue'
 import {
-  querysystemInfoManageTable,
-  queryProjectInfoManageTable,
-  getDianXingAnLiSelectData,
-  queryZiChanJiaGouZuJianLeiXing,
-  getArchiViewManage,
-  getTotalZiChanJiaGouTable,
-  queryZuJianLeiXingBelongForm,
-  deleteSystemTable,
  addSystemTable,
-  editSystemTable,
  archiIntelligenceSearchTreeNew,
-  systemArchiSaveFactor,
+  deleteSystemTable,
-  getQryByTree,
+  editSystemTable,
+  getArchiViewManage,
  getDeptOption,
+  getDianXingAnLiSelectData,
  getOrgOption,
  getPreArc,
+  getQryByTree,
+  getTotalZiChanJiaGouTable,
+  queryProjectInfoManageTable,
+  querysystemInfoManageTable,
+  queryZiChanJiaGouZuJianLeiXing,
+  queryZuJianLeiXingBelongForm,
+  systemArchiSaveFactor,
 } from '@/api/index.js'
 import $ from 'jquery'
-import {MessageBox, Message} from 'element-ui'
+import {Message, MessageBox} from 'element-ui'
 import {getDictTypeOptions} from '@/utils'
 import {archiEleColor} from '@/config/index.js'

--- a/src/views/batchPlanManagement/Add.vue
+++ b/src/views/batchPlanManagement/Add.vue
@@ -26,7 +26,8 @@
 <script>
 import Form from '@/components/Form.vue'
-import { addBatchPlan, editBatchPlan } from '@/api'
+import {addBatchPlan, editBatchPlan} from '@/api'
 export default {
  props: {
    title: {
@@ -39,7 +40,8 @@ export default {
    },
    rowData: {
      type: Object,
-      default: () => {},
+      default: () => {
+      },
    },
  },
  data() {
@@ -56,17 +58,17 @@ export default {
          prop: 'batName', // 字段名
          element: 'el-input', // 指定elementui组件
          placeholder: '请输入内容', // elementui组件属性
-          rules: [{ required: true, trigger: 'blur', message: '不能为空' }],
+          rules: [{required: true, trigger: 'blur', message: '不能为空'}],
          readonly: this.title == '详情' ? true : false,
        },
-        {
+        // {
-          label: '创建人', // label文字
+        //   label: '创建人', // label文字
-          prop: 'createMan', // 字段名
+        //   prop: 'createMan', // 字段名
-          element: 'el-input', // 指定elementui组件
+        //   element: 'el-input', // 指定elementui组件
-          initValue: '', // 字段初始值
+        //   initValue: '', // 字段初始值
-          // placeholder: '请输入内容', // elementui组件属性
+        //   // placeholder: '请输入内容', // elementui组件属性
-          readonly: true,
+        //   readonly: true,
-        },
+        // },
        {
          label: '创建时间', // label文字
          prop: 'createTime', // 字段名
@@ -124,7 +126,8 @@ export default {
      }
    },
  },
-  mounted() {},
+  mounted() {
+  },
  methods: {
    handleSubmit() {
      this.$refs['addForm'].onValidate(() => {
@@ -141,12 +144,14 @@ export default {
          state: 1,
        }
        typeApi(params).then((res) => {
-          if (res.code === 200) {
          loading.close()
+          if (res.code === 200) {
            this.$message.success('保存成功')
            this.showDialog = false
            this.handleClose()
            this.$emit('querySearch')
+          } else {
+            this.$message.error(res.msg)
          }
        })
      })

--- a/src/views/batchPlanManagement/ApprovalDialog.vue
+++ b/src/views/batchPlanManagement/ApprovalDialog.vue
@@ -30,7 +30,7 @@
 <script>
 import Form from '@/components/Form.vue'
-import { editBatchPlan } from '@/api/index.js'
+import {approveBatchPlan, editBatchPlan} from '@/api/index.js'
 export default {
  props: {
    title: {
@@ -92,9 +92,9 @@ export default {
          ...formInfo,
          state: this.radio,
        }
-        editBatchPlan(params).then((res) => {
+        approveBatchPlan(params).then((res) => {
-          if (res.code === 200) {
          loading.close()
+          if (res.code === 200) {
            this.$message.success('保存成功')
            this.showDialog = false
            this.handleClose()

--- a/src/views/batchPlanManagement/index.vue
+++ b/src/views/batchPlanManagement/index.vue
@@ -56,7 +56,7 @@ import TableConfig from '@/components/TableConfig.vue'
 import Add from './Add.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBatchPlan } from '@/api/index.js'
+import {editBatchPlan, postBatchPlan} from '@/api/index.js'
 import { batchPlanManagement } from '@/api/interface'
 import { approvalStatusOptions } from '@/utils/dictionary'
 export default {
@@ -120,7 +120,7 @@ export default {
          options: approvalStatusOptions,
        },
        { label: '备注', width: '100px', prop: 'remark' },
-        { label: '创建人', prop: 'createMan' },
+        // { label: '创建人', prop: 'createMan' },
        { label: '创建时间', prop: 'createTime', width: '120px' },
        {
          label: '操作',
@@ -214,13 +214,12 @@ export default {
        confirmButtonText: '确认',
        cancelButtonText: '取消',
        type: 'warning',
-      })
+      }).then(() => {
-        .then(() => {
        const params = {
          ...row,
          state: 2,
        }
-          editBatchPlan(params).then((res) => {
+        postBatchPlan(params).then((res) => {
          if (res.code === 200) {
            this.$message.success('提交成功')
            this.$refs.searchTable.queryData()
@@ -228,8 +227,9 @@ export default {
            this.$message.error(res.msg)
          }
        })
+      }).catch(() => {
+        this.$message.info('已取消提交')
      })
-        .catch(() => {})
    },
    fnDel(row) {
      this.$confirm('是否确认删除?', '提示', {
@@ -247,7 +247,7 @@ export default {
              this.$message.success('删除成功')
              this.$refs.searchTable.queryData()
            } else {
-              this.$message.error('删除失败')
+              this.$message.error(res.msg)
            }
          })
        })

--- a/src/views/dictionaryManagement/index.vue
+++ b/src/views/dictionaryManagement/index.vue
@@ -70,16 +70,16 @@ export default {
        columns() {
            return [
                { label: '序号', type: 'index', width: '80px' },
-                { label: '字典名称', prop: 'name', width: '150px',},
+                { label: '字典名称', prop: 'name', minWidth: '150px',},
-                { label: '字典标识', prop: 'typeValue', width: '150px',},
+                { label: '字典标识', prop: 'typeValue', minWidth: '150px',},
-                { label: '描述', prop: 'remark', width: '150px' },
+                { label: '描述', prop: 'remark', minWidth: '150px' },
                { label: '排序', prop: 'sort', width: '80px' },
                { label: '启用状态', prop: 'delFlag', width: '120px', collectionType: 'delFlag',
                    options: delFlag, },
                { label: '创建日期', prop: 'createTime', width: '120px' },
-                { label: '创建人', prop: 'createMan',  },
+                // { label: '创建人', prop: 'createMan',  },
-                { label: '最终修改时间', prop: 'lastUpdateTime',  },
+                // { label: '最终修改时间', prop: 'lastUpdateTime',  },
-                { label: '最终修改人', prop: 'lastUpdateMan',  },
+                // { label: '最终修改人', prop: 'lastUpdateMan',  },
                {
                label: '操作',
                type: 'operation',

--- a/src/views/systemInfoManage/SystemInfoDetail.vue
+++ b/src/views/systemInfoManage/SystemInfoDetail.vue
@@ -192,7 +192,6 @@ export default {
  mounted() {},
  methods: {
    codeToName(code, options) {
-      console.log(code, options)
      const obj = this[options]?.find((v) => v.value == code) || {}
      return obj.label
    },