合并

src/api/contract/index.ts

@@ -74,7 +74,7 @@ export const delPlanning = (query: any): AxiosPromise<any> => {
     method: 'delete'
   });
 };
-
+//导出分标
 export const importExcelFile = (params: any, data: any): AxiosPromise => {
   return request({
     url: '/tender/billofquantitiesLimitList/importExcelFile',
@@ -83,3 +83,11 @@ export const importExcelFile = (params: any, data: any): AxiosPromise => {
     data
   });
 };
+//获取详情
+export const getDetailsList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/segmentedIndicatorPlanning/getMore',
+    method: 'get',
+    params: query
+  });
+};

src/views/contract/division/index.vue

@@ -18,7 +18,11 @@
           </el-form>
         </el-card>
         <el-table :data="tableData" row-key="id" border v-loading="loading">
-          <el-table-column prop="id" label="编号" />
+          <el-table-column label="序号" width="80" align="center">
+            <template #default="scope">
+              {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+            </template>
+          </el-table-column>
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="content" label="内容" />
           <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center">
@@ -28,6 +32,9 @@
           </el-table-column>
           <el-table-column prop="price" label="操作" align="center">
             <template #default="scope">
+              <el-button type="warning" size="small" @click="handleDetail(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
+                >详情</el-button
+              >
               <el-button type="primary" size="small" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
                 >修改</el-button
               >
@@ -84,7 +91,7 @@
             <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="quantity" label="数量" /> -->
             <el-table-column prop="selectNum" label="选择数量" align="center">
               <template #default="scope">
                 <el-input-number
@@ -104,11 +111,11 @@
               </template>
             </el-table-column>
             <el-table-column prop="unitPrice" label="单价" align="center" />
-            <el-table-column prop="price" label="总价" align="center">
+            <!-- <el-table-column prop="price" label="总价" align="center">
               <template #default="scope">
                 {{ scope.row.price }}
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </el-col>
       </el-row>
@@ -117,6 +124,20 @@
         <el-button type="primary" @click="submitForm(formRef)">确定</el-button>
       </template>
     </el-dialog>
+    <el-dialog title="详情" v-model="detailDialog" width="75%" draggable>
+      <el-table :data="detailData" v-loading="detailLoading" row-key="id" border lazy default-expand-all>
+        <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="unitPrice" label="单价" align="center" />
+        <el-table-column prop="price" label="总价" align="center">
+          <template #default="scope">
+            {{ scope.row.price }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -125,7 +146,7 @@ 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, segmentedIndicatorPlanning, getPlanningList, updatePlanning, delPlanning } from '@/api/contract/index';
+import { treeList, sheetList, segmentedIndicatorPlanning, getPlanningList, updatePlanning, delPlanning, getDetailsList } from '@/api/contract/index';
 
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
@@ -148,6 +169,7 @@ const form = ref({
   name: '',
   content: ''
 });
+
 const rules = ref({
   name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
   content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
@@ -265,8 +287,13 @@ const handleSelection = (selection: any) => {
 };
 const handleNumberChange = (row: any) => {
   const selectedIds = selectionData.value.map((item) => item.id);
+  nextTick(() => {
+    treeTableRef.value.toggleRowSelection(row, true);
+  });
   restoreSelections(treeData.value, selectedIds);
 };
+
+//寻找节点选择
 const restoreSelections = (data, selectedIds) => {
   const traverse = (nodes) => {
     nodes.forEach((node) => {
@@ -338,12 +365,12 @@ const submitForm = async (formEl: FormInstance | undefined) => {
           });
           return;
         }
-
-        if (selectionData.value.some((item) => item.selectNum == '' || item.selectNum == null)) {
+        const newSelectionData = selectionData.value.filter((item) => item.quantity != '' && item.quantity != null);
+        if (newSelectionData.some((item) => item.selectNum == '' || item.selectNum == null)) {
           ElMessage.error('存在未填写数量的工程或费用名称，请检查');
           return;
         }
-        const limitListBos = selectionData.value.map((item: any) => {
+        const limitListBos = newSelectionData.map((item: any) => {
           return {
             limitListId: item.id,
             num: item.selectNum
@@ -366,10 +393,6 @@ const submitForm = async (formEl: FormInstance | undefined) => {
         }
       } catch (error) {
         console.log(error);
-        ElMessage({
-          message: '新增失败',
-          type: 'error'
-        });
       }
     } else {
       console.log('error submit!', fields);
@@ -424,6 +447,22 @@ const delHandle = (row: any) => {
     });
   }
 };
+const detailDialog = ref();
+const detailData = ref([]);
+const detailLoading = ref(false);
+
+//详情
+const handleDetail = (row: any) => {
+  detailDialog.value = true;
+  getDetails(row);
+};
+const getDetails = (row: any) => {
+  getDetailsList({ id: row.id }).then((res) => {
+    if (res.code == 200) {
+      detailData.value = res.data;
+    }
+  });
+};
 
 onMounted(() => {
   getTabsList();

src/views/contract/limitPrice/index.vue

@@ -69,7 +69,7 @@
               @click="handleSave(scope.row)"
               v-if="scope.row.quantity && scope.row.quantity != 0"
               v-hasPermi="['tender:billofquantitiesLimitList:edit']"
-              >修改</el-button
+              >确定</el-button
             >
           </template>
         </el-table-column>