修改回显bug

src/api/contract/index.ts

@@ -42,3 +42,44 @@ export const updatePrice = (query: any): AxiosPromise<any> => {
     data: query
   });
 };
+//查询分标策划
+export const getPlanningList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning/list',
+    method: 'get',
+    params: query
+  });
+};
+
+//新增分标策划
+export const segmentedIndicatorPlanning = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning',
+    method: 'post',
+    data: query
+  });
+};
+//编辑分标策划
+export const updatePlanning = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning',
+    method: 'put',
+    data: query
+  });
+};
+//编辑分标策划
+export const delPlanning = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning/' + query.ids,
+    method: 'delete'
+  });
+};
+
+export const importExcelFile = (params: any, data: any): AxiosPromise => {
+  return request({
+    url: '/tender/billofquantitiesLimitList/importExcelFile',
+    method: 'post',
+    params,
+    data
+  });
+};

src/views/contract/division/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="p-2">
-    <el-tabs type="border-card" @tab-change="handleTabChange">
+    <el-tabs type="border-card" @tab-change="handleTabChange" v-model="activeTab">
-      <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item.label">
+      <el-tab-pane v-for="(item, index) in tabList" :key="item.index" :label="item.label" :name="item.value">
         <el-card shadow="always">
           <el-form :model="queryForm" :inline="true" ref="queryFormRef">
             <el-form-item label="名称" prop="versions">
@@ -13,22 +13,34 @@
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" plain :icon="Plus" @click="openDialog">新增</el-button>
+              <el-button type="primary" plain :icon="Plus" @click="openDialog" v-hasPermi="['tender:segmentedIndicatorPlanning:add']">新增</el-button>
             </el-form-item>
           </el-form>
         </el-card>
-        <el-table :data="tableData" row-key="id" border>
+        <el-table :data="tableData" row-key="id" border v-loading="loading">
-          <el-table-column prop="num" label="编号" />
+          <el-table-column prop="id" label="编号" />
           <el-table-column prop="name" label="名称" />
-          <el-table-column prop="specification" label="规格" />
+          <el-table-column prop="content" label="内容" />
-          <el-table-column prop="unit" label="单位" />
+          <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center">
-          <el-table-column prop="quantity" label="数量" />
+            <template #default="scope">
-          <el-table-column prop="remark" label="备注" />
+              <el-date-picker v-model="scope.row.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="选择时间" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="price" label="操作" align="center">
+            <template #default="scope">
+              <el-button type="primary" size="small" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+                >修改</el-button
+              >
+              <el-button type="danger" size="small" @click="delHandle(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
         </el-table>
         <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
       </el-tab-pane>
     </el-tabs>
-    <el-dialog title="新增" v-model="dialogVisible" width="70%" draggable>
+    <el-dialog title="新增" v-model="dialogVisible" width="75%" draggable>
       <el-row>
         <el-col :span="11">
           <el-form :model="form" :rules="rules" ref="formRef" label-width="80px">
@@ -40,14 +52,6 @@
             </el-form-item>
           </el-form>
         </el-col>
-        <el-col :span="2"></el-col>
-        <el-col :span="11">
-          <div class="Region flex gap-2">
-            <el-tag type="primary">Tag 1</el-tag>
-            <el-tag type="primary">Tag 1</el-tag>
-            <el-tag type="primary">Tag 1</el-tag>
-          </div>
-        </el-col>
       </el-row>
       <el-row style="margin-top: 20px">
         <el-col :span="24">
@@ -66,13 +70,40 @@
               </el-form-item>
             </el-form>
           </el-card>
-          <el-table :data="treeData" v-loading="treeLoading" row-key="id" border lazy default-expand-all @selection-change="handleSelection">
+          <el-table
+            :data="treeData"
+            ref="treeTableRef"
+            v-loading="treeLoading"
+            row-key="id"
+            border
+            lazy
+            default-expand-all
+            @selection-change="handleSelection"
+          >
             <el-table-column type="selection" width="55" />
             <el-table-column prop="num" label="编号" />
             <el-table-column prop="name" label="工程或费用名称" />
             <el-table-column prop="unit" label="单位" />
             <el-table-column prop="quantity" label="数量" />
-            <el-table-column prop="remark" label="单价" align="center" />
+            <el-table-column prop="selectNum" label="选择数量" align="center">
+              <template #default="scope">
+                <el-input-number
+                  :model-value="scope.row.selectNum"
+                  @change="
+                    (val) => {
+                      scope.row.selectNum = val;
+                      handleNumberChange(scope.row);
+                    }
+                  "
+                  :precision="2"
+                  :step="1"
+                  :controls="false"
+                  :max="Math.floor(scope.row.quantity)"
+                  v-if="scope.row.quantity && scope.row.quantity != 0"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitPrice" label="单价" align="center" />
             <el-table-column prop="price" label="总价" align="center">
               <template #default="scope">
                 {{ scope.row.price }}
@@ -94,14 +125,15 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { getDicts } from '@/api/system/dict/data';
 import { Plus } from '@element-plus/icons-vue';
 import { FormInstance } from 'element-plus';
-import { treeList, sheetList } from '@/api/contract/index';
+import { treeList, sheetList, segmentedIndicatorPlanning, getPlanningList, updatePlanning, delPlanning } from '@/api/contract/index';
+
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
-
 const tabList = ref<any[]>([]);
 const tableData = ref<any[]>([]);
 const queryFormRef = ref();
 const formRef = ref();
+const activeTab = ref();
 const queryParams = ref({
   pageNum: 1,
   pageSize: 10
@@ -120,22 +152,51 @@ const rules = ref({
   name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
   content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
 });
+const loading = ref(false);
 
 //字典获取数据
 const getTabsList = async () => {
   const res = await getDicts('subcontracting_type');
   if (res.code == 200) {
+    activeTab.value = res.data[0].dictValue;
     tabList.value = res.data.map((item: any) => {
       return {
         label: item.dictLabel,
         value: item.dictValue
       };
     });
+    getList();
   }
 };
 //获取表格数据
-const getList = () => {};
+const getList = async () => {
-const handleTabChange = () => {};
+  try {
+    loading.value = true;
+    const params = {
+      projectId: currentProject.value?.id,
+      ...queryParams.value,
+      ...queryForm.value,
+      dictName: activeTab.value
+    };
+    const res = await getPlanningList(params);
+    if (res.code == 200) {
+      tableData.value = res.rows;
+      total.value = res.total;
+    }
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '获取数据失败',
+      type: 'error'
+    });
+  } finally {
+    loading.value = false;
+  }
+};
+const handleTabChange = (tabs: any) => {
+  activeTab.value = tabs;
+  getList();
+};
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -144,7 +205,8 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value?.resetFields();
+  queryForm.value.content = '';
+  queryForm.value.name = '';
   handleQuery();
 };
 
@@ -168,9 +230,7 @@ const sheets = ref<any[]>([]);
 const treeTableRef = ref();
 const isExpandAll = ref(false);
 const treeLoading = ref(false);
-const treeProps = reactive({
+const selectionData = ref<any>([]);
-  checkStrictly: false
-});
 //获取表名
 const getSheetName = async () => {
   try {
@@ -201,8 +261,34 @@ const getSheetName = async () => {
   }
 };
 const handleSelection = (selection: any) => {
-  console.log(selection);
+  selectionData.value = selection;
 };
+const handleNumberChange = (row: any) => {
+  const selectedIds = selectionData.value.map((item) => item.id);
+  restoreSelections(treeData.value, selectedIds);
+};
+const restoreSelections = (data, selectedIds) => {
+  const traverse = (nodes) => {
+    nodes.forEach((node) => {
+      if (selectedIds.includes(node.id)) {
+        nextTick(() => {
+          treeTableRef.value.toggleRowSelection(node, true);
+        });
+      }
+      if (node.children && node.children.length > 0) {
+        traverse(node.children);
+      }
+    });
+  };
+  traverse(data);
+};
+watch(
+  () => selectionData.value,
+  (newVal, oldVal) => {
+    console.log(newVal, 55555555555555555);
+  }
+);
+
 //选择表名
 const changeSheet = () => {
   getTreeList();
@@ -224,7 +310,10 @@ const getTreeList = async () => {
     };
     const res = await treeList(params);
     if (res.code == 200) {
-      treeData.value = res.data ?? [];
+      res.data.forEach((item: any) => {
+        item.selectNum = '';
+      });
+      treeData.value = res.data;
     }
   } catch (error) {
     console.log(error);
@@ -239,14 +328,102 @@ const getTreeList = async () => {
 
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
-  await formEl.validate((valid, fields) => {
+  await formEl.validate(async (valid, fields) => {
     if (valid) {
-      console.log('submit!');
+      try {
+        if (selectionData.value.length == 0) {
+          ElMessage({
+            message: '请选择项目材料',
+            type: 'warning'
+          });
+          return;
+        }
+
+        if (selectionData.value.some((item) => item.selectNum == '' || item.selectNum == null)) {
+          ElMessage.error('存在未填写数量的工程或费用名称，请检查');
+          return;
+        }
+        const limitListBos = selectionData.value.map((item: any) => {
+          return {
+            limitListId: item.id,
+            num: item.selectNum
+          };
+        });
+        const params = {
+          projectId: currentProject.value?.id,
+          ...form.value,
+          dictName: activeTab.value,
+          limitListBos
+        };
+        const res = await segmentedIndicatorPlanning(params);
+        if (res.code == 200) {
+          ElMessage({
+            message: '新增成功',
+            type: 'success'
+          });
+          closeDialog();
+          getList();
+        }
+      } catch (error) {
+        console.log(error);
+        ElMessage({
+          message: '新增失败',
+          type: 'error'
+        });
+      }
     } else {
       console.log('error submit!', fields);
     }
   });
 };
+//确定修改
+const handleSave = (row: any) => {
+  try {
+    if (!row.plannedBiddingTime) {
+      ElMessage({
+        message: '请输入计划招标时间',
+        type: 'warning'
+      });
+      return;
+    }
+    updatePlanning(row).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '修改成功',
+          type: 'success'
+        });
+        getList();
+      }
+    });
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '修改失败',
+      type: 'error'
+    });
+  }
+};
+//删除
+const delHandle = (row: any) => {
+  try {
+    const params = { ids: row.id };
+    delPlanning(params).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success'
+        });
+        getList();
+      }
+    });
+  } catch (error) {
+    console.log(error);
+    ElMessage({
+      message: '删除失败',
+      type: 'error'
+    });
+  }
+};
 
 onMounted(() => {
   getTabsList();

src/views/contract/limitPrice/index.vue

@@ -20,26 +20,26 @@
             <el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
           </el-form-item>
           <el-form-item>
-            <el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" :show-file-list="false">
+            <el-upload
+              ref="uploadRef"
+              class="upload-demo"
+              :http-request="importExcel"
+              :show-file-list="false"
+              v-hasPermi="['tender:billofquantitiesLimitList:importExcelFile']"
+            >
               <template #trigger>
                 <el-button type="primary">导入excel</el-button>
               </template>
             </el-upload>
           </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:billofquantitiesLimitList:export']">导出excel</el-button>
+          </el-form-item>
         </el-form>
       </el-card>
     </transition>
     <el-card shadow="never" class="mb8">
-      <el-table
+      <el-table ref="tableRef" v-loading="loading" :data="tableData" row-key="id" border lazy default-expand-all>
-        ref="tableRef"
-        v-loading="loading"
-        :data="tableData"
-        row-key="id"
-        border
-        lazy
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-        default-expand-all
-      >
         <el-table-column prop="num" label="编号" />
         <el-table-column prop="name" label="工程或费用名称" />
         <el-table-column prop="unit" label="单位" />
@@ -63,8 +63,13 @@
         </el-table-column>
         <el-table-column prop="price" label="操作" align="center">
           <template #default="scope">
-            <el-button type="primary" size="small" @click="handleSave(scope.row)" v-if="scope.row.quantity && scope.row.quantity != 0"
+            <el-button
-              >确定</el-button
+              type="primary"
+              size="small"
+              @click="handleSave(scope.row)"
+              v-if="scope.row.quantity && scope.row.quantity != 0"
+              v-hasPermi="['tender:billofquantitiesLimitList:edit']"
+              >修改</el-button
             >
           </template>
         </el-table-column>
@@ -75,7 +80,7 @@
 
 <script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
-import { listBillofquantitiesLimitList, obtainAllVersionNumbers, sheetList, updatePrice } from '@/api/contract/index';
+import { listBillofquantitiesLimitList, obtainAllVersionNumbers, sheetList, updatePrice, importExcelFile } from '@/api/contract/index';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const userStore = useUserStoreHook();
@@ -180,6 +185,7 @@ const getTableData = async () => {
       type: 'error'
     });
     tableData.value = [];
+    loading.value = false;
   } finally {
     loading.value = false;
   }
@@ -221,31 +227,25 @@ const toggleExpandAll = (isExpand: boolean) => {
 };
 //导入
 const importExcel = (options: any): any => {
-  console.log(options);
+  let formData = new FormData();
-  // let formData = new FormData();
+  formData.append('file', options.file);
-  // formData.append('file', options.file);
+  loading.value = true;
-  // state.loading.list = true;
+  importExcelFile({ projectId: currentProject.value?.id }, formData)
-  // importExcelFile({ workOrderType: state.work_order_type, projectId: currentProject.value?.id }, formData)
+    .then((res) => {
-  //   .then((res) => {
+      const { code } = res;
-  //     const { code } = res;
+      if (code == 200) {
-  //     if (code == 200) {
+        proxy.$modal.msgSuccess(res.msg || '导入成功');
-  //       proxy.$modal.msgSuccess(res.msg || '导入成功');
+        getTableData();
-  //       // 更新列表
+      } else {
-  //       if (state.work_order_type == 3) {
+        proxy.$modal.msgError(res.msg || '导入失败');
-  //         getVersionNums(false);
+      }
-  //       } else {
+    })
-  //         getVersionNums();
+    .catch((err) => {
-  //       }
+      proxy.$modal.msgError(err.msg || '导入失败');
-  //     } else {
+    })
-  //       proxy.$modal.msgError(res.msg || '导入失败');
+    .finally(() => {
-  //     }
+      loading.value = false;
-  //   })
+    });
-  //   .catch((err) => {
-  //     proxy.$modal.msgError(err.msg || '导入失败');
-  //   })
-  //   .finally(() => {
-  //     state.loading.list = false;
-  //   });
 };
 //监听项目id刷新数据
 const listeningProject = watch(
@@ -254,7 +254,16 @@ const listeningProject = watch(
     getVersionNums();
   }
 );
-
+const handleExport = () => {
+  proxy?.download(
+    '/tender/billofquantitiesLimitList/export',
+    {
+      projectId: currentProject.value?.id,
+      sheet: queryForm.value.sheet
+    },
+    `限价一览表${queryForm.value.sheet}.xlsx`
+  );
+};
 onUnmounted(() => {
   listeningProject();
 });