From e4f254819986d634982a4167437293affb6d152c Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Thu, 21 Aug 2025 18:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/views/design/billofQuantities/index.vue   | 70 ++++++++++++-------
 .../formalitiesAreConsolidated/index.vue      |  4 +-
 .../materialIssue/word/index.vue              | 21 +++---
 .../materialReceive/word/index.vue            |  8 +--
 .../materials/materialsInventory/index.vue    |  1 +
 .../usageMaterials/purchase/index.vue         |  2 +-
 .../usageMaterials/purchase/indexSon.vue      |  2 +-
 src/views/progress/plan/index.vue             |  4 +-
 9 files changed, 67 insertions(+), 47 deletions(-)

diff --git a/.env.development b/.env.development
index b59befd..8849f99 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.213:8899'
 
 # 无人机接口地址
 
diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue
index d359bf0..79241ba 100644
--- a/src/views/design/billofQuantities/index.vue
+++ b/src/views/design/billofQuantities/index.vue
@@ -7,8 +7,7 @@
           <el-form :model="state.queryForm" :inline="true">
             <el-form-item label="版本号" prop="versions">
               <el-select v-model="state.queryForm.versions" placeholder="选择版本号">
-                <el-option v-for="item in state.options" :key="item.versions" :label="item.versions"
-                  :value="item.versions" />
+                <el-option v-for="item in state.options" :key="item.versions" :label="item.versions" :value="item.versions" />
               </el-select>
             </el-form-item>
             <el-form-item label="表名" prop="sheet">
@@ -25,13 +24,23 @@
             <el-form-item>
               <el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" :show-file-list="false">
                 <template #trigger>
-                  <el-button v-if="Object.keys(state.versionsData).length === 0 || state.versionsData.status == 'cancel' ||state.versionsData.status == 'back'" type="primary">导入excel</el-button>
+                  <el-button
+                    v-if="
+                      Object.keys(state.versionsData).length === 0 || state.versionsData.status == 'cancel' || state.versionsData.status == 'back'
+                    "
+                    type="primary"
+                    >导入excel</el-button
+                  >
                 </template>
               </el-upload>
-              <el-button v-if="state.versionsData.status == 'draft'" type="primary" con="edit"
-                    @click="clickApprovalSheet()">审核</el-button>
-                  <el-button v-if="state.versionsData.status == 'waiting' || state.versionsData.status == 'finish'"
-                    icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
+              <el-button v-if="state.versionsData.status == 'draft'" type="primary" con="edit" @click="clickApprovalSheet()">审核</el-button>
+              <el-button
+                v-if="state.versionsData.status == 'waiting' || state.versionsData.status == 'finish'"
+                icon="view"
+                @click="lookApprovalFlow()"
+                type="warning"
+                >查看流程</el-button
+              >
             </el-form-item>
           </el-form>
         </el-card>
@@ -39,36 +48,47 @@
           <el-form :model="state.queryForm" :inline="true">
             <el-form-item label="版本号" prop="versions">
               <el-select v-model="state.queryForm.versions" placeholder="选择版本号" @change="handleChangeVersion">
-                <el-option v-for="item in state.options" :key="item.versions" :label="item.versions"
-                  :value="item.versions" />
+                <el-option v-for="item in state.options" :key="item.versions" :label="item.versions" :value="item.versions" />
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" :show-file-list="false" style="margin-right: 10px;">
+              <el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" :show-file-list="false" style="margin-right: 10px">
                 <template #trigger>
                   <el-button type="primary">导入excel</el-button>
                 </template>
               </el-upload>
-              <el-button v-if="state.versionsData.status == 'draft'" type="primary" con="edit"
-                @click="clickApprovalSheet()">审核</el-button>
-              <el-button v-if="state.versionsData.status == 'waiting' || state.versionsData.status == 'finish'"
-                icon="view" @click="lookApprovalFlow()" type="warning">查看流程</el-button>
+              <el-button v-if="state.versionsData.status == 'draft'" type="primary" con="edit" @click="clickApprovalSheet()">审核</el-button>
+              <el-button
+                v-if="state.versionsData.status == 'waiting' || state.versionsData.status == 'finish'"
+                icon="view"
+                @click="lookApprovalFlow()"
+                type="warning"
+                >查看流程</el-button
+              >
             </el-form-item>
           </el-form>
         </el-card>
-        <el-table v-if="index < 3" :ref="(el) => (tableRef[index] = el)" :data="state.tableData"
-          v-loading="state.loading.list" stripe :row-class-name="state.tableData.length === 0 ? 'table-null' : ''"
-          style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" lazy border
-          :default-expand-all="true">
+        <el-table
+          v-if="index < 3"
+          :ref="(el) => (tableRef[index] = el)"
+          :data="state.tableData"
+          v-loading="state.loading.list"
+          stripe
+          :row-class-name="state.tableData.length === 0 ? 'table-null' : ''"
+          style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
+          row-key="id"
+          lazy
+          border
+          :default-expand-all="true"
+        >
           <el-table-column prop="num" label="编号" />
           <el-table-column prop="name" label="工程或费用名称" />
-          <el-table-column prop="unit" label="单位" />
           <el-table-column prop="specification" label="规格" />
+          <el-table-column prop="unit" label="单位" />
           <el-table-column prop="quantity" label="数量" />
           <el-table-column prop="remark" label="备注" />
         </el-table>
-        <el-table v-if="index == 3" :data="state.tableData"
-          style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
+        <el-table v-if="index == 3" :data="state.tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
           <el-table-column prop="num" label="编号" />
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="specification" label="规格" />
@@ -126,7 +146,7 @@ const state = reactive({
 });
 // tab切换
 const handleTabChange = (tab) => {
-  console.log('tab',tab);
+  console.log('tab', tab);
   state.tableData = [];
   state.options = [];
   state.sheets = [];
@@ -164,7 +184,7 @@ async function getVersionNums(isSheet = true) {
         // if (state.work_order_type == 3) {
         state.versionsData = state.options[0] || [];
         console.log('state.versionsData', state.versionsData);
-          // console.log('state.versionsData', state.versionsData);
+        // console.log('state.versionsData', state.versionsData);
         // }
         // 等待表名加载完成
         console.log(isSheet, state.sheets.length);
@@ -308,7 +328,7 @@ function handleArr(arr, flag, table) {
 function clickApprovalSheet(row) {
   proxy.$tab.closePage(proxy.$route);
   proxy.$router.push({
-    path: `/approval/billofQuantities/indexEdit`+state.work_order_type,
+    path: `/approval/billofQuantities/indexEdit` + state.work_order_type,
     query: {
       id: state.queryForm.versions,
       type: 'update'
@@ -318,7 +338,7 @@ function clickApprovalSheet(row) {
 // 审核流程
 function lookApprovalFlow(row) {
   proxy.$router.push({
-    path: `/approval/billofQuantities/indexEdit`+state.work_order_type,
+    path: `/approval/billofQuantities/indexEdit` + state.work_order_type,
     query: {
       id: state.queryForm.versions,
       type: 'view'
diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue
index 0b05cc5..ebeda55 100644
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@@ -31,9 +31,9 @@
                 placeholder="请选择实际完成时间"
               />
             </el-form-item>
-            <el-form-item label="手续材料" prop="formalitiesUrl">
+            <!-- <el-form-item label="手续材料" prop="formalitiesUrl">
               <el-input v-model="queryParams.formalitiesUrl" placeholder="请输入手续材料" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
diff --git a/src/views/materials/materialsEquipment/materialIssue/word/index.vue b/src/views/materials/materialsEquipment/materialIssue/word/index.vue
index c560a8c..4cfb5d9 100644
--- a/src/views/materials/materialsEquipment/materialIssue/word/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/word/index.vue
@@ -25,7 +25,7 @@
           <table style="width: 100%" border="1" cellspacing="1">
             <thead>
               <tr>
-                <th  colspan="2">设备材料名称</th>
+                <th colspan="2">设备材料名称</th>
                 <td class="th-bg" colspan="2">{{ formData.materialName }}</td>
                 <th colspan="2">规格及数量</th>
                 <td class="th-bg" colspan="2">见下表</td>
@@ -79,7 +79,7 @@
             <tbody>
               <tr>
                 <td colspan="7">
-                  <div style="margin-bottom: 10px;">缺陷情况:</div>
+                  <div style="margin-bottom: 10px">缺陷情况:</div>
                   {{ formData.defectDescription }}
                 </td>
               </tr>
@@ -90,10 +90,10 @@
                 <td colspan="8">
                   <span>是否附带以下随机资料</span>
                   <div class="file_detail">
-                    <span>(1) 合格证 {{ formData.certCountFile ? formData.certCountFile.length : 0 }} 份</span>
-                    <span>(2) 出厂报告 {{ formData.reportCountFileId ? formData.reportCountFileId.length : 0 }} 份</span>
-                    <span>(3) 技术资料文件 {{ formData.techDocCountFileId ? formData.techDocCountFileId.length : 0 }} 份</span>
-                    <span>(4) 厂家资质文件 {{ formData.licenseCountFileId ? formData.licenseCountFileId.length : 0 }} 份</span>
+                    <span>(1) 合格证 {{ formData.certCount ? formData.certCount : 0 }} 份</span>
+                    <span>(2) 出厂报告 {{ formData.reportCount ? formData.reportCount : 0 }} 份</span>
+                    <span>(3) 技术资料文件 {{ formData.techDocCount ? formData.techDocCount : 0 }} 份</span>
+                    <span>(4) 厂家资质文件 {{ formData.licenseCount ? formData.licenseCount : 0 }} 份</span>
                   </div>
                 </td>
               </tr>
@@ -248,11 +248,10 @@ defineExpose({
     }
   }
 }
-.file_detail{
-
-  >span{
-   width: 40%;
-   display: inline-block;
+.file_detail {
+  > span {
+    width: 40%;
+    display: inline-block;
   }
 }
 table {
diff --git a/src/views/materials/materialsEquipment/materialReceive/word/index.vue b/src/views/materials/materialsEquipment/materialReceive/word/index.vue
index 01c096a..d717d19 100644
--- a/src/views/materials/materialsEquipment/materialReceive/word/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/word/index.vue
@@ -81,10 +81,10 @@
                 <td colspan="8">
                   <span>是否附带以下随机资料</span>
                   <div class="file_detail">
-                    <span>(1) 合格证 {{ formData.certCountFile ? formData.certCountFile.length : 0 }} 份</span>
-                    <span>(2) 出厂报告 {{ formData.reportCountFileId ? formData.reportCountFile.length : 0 }} 份</span>
-                    <span>(3) 技术资料文件 {{ formData.techDocCountFileId ? formData.techDocCountFile.length : 0 }} 份</span>
-                    <span>(4) 厂家资质文件 {{ formData.licenseCountFileId ? formData.licenseCountFile.length : 0 }} 份</span>
+                    <span>(1) 合格证 {{ formData.certCount ? formData.certCount : 0 }} 份</span>
+                    <span>(2) 出厂报告 {{ formData.reportCount ? formData.reportCount : 0 }} 份</span>
+                    <span>(3) 技术资料文件 {{ formData.techDocCount ? formData.techDocCount : 0 }} 份</span>
+                    <span>(4) 厂家资质文件 {{ formData.licenseCount ? formData.licenseCount : 0 }} 份</span>
                   </div>
                 </td>
               </tr>
diff --git a/src/views/materials/materialsInventory/index.vue b/src/views/materials/materialsInventory/index.vue
index b6adb46..dc7b9ec 100644
--- a/src/views/materials/materialsInventory/index.vue
+++ b/src/views/materials/materialsInventory/index.vue
@@ -56,6 +56,7 @@
         </el-table-column>
         <el-table-column label="出库登记" align="center">
           <el-table-column label="交接单位" align="center" prop="recipient" />
+          <el-table-column label="使用部位" align="center" prop="usePart" />
           <el-table-column label="数量" align="center" prop="number">
             <template #default="scope">
               <span v-if="scope.row.outPut === '1'">{{ scope.row.number }}</span>
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
index 2d078e1..f5df9ee 100644
--- a/src/views/materials/usageMaterials/purchase/index.vue
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -88,7 +88,7 @@
       </el-table>
 
       <!-- 分页 -->
-      <div class="flex items-center justify-between p-4 border-t">
+      <div class="flex items-center justify-between p-4 border-t" v-if="total > 0">
         <div class="text-gray-500 text-sm">
           共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
         </div>
diff --git a/src/views/materials/usageMaterials/purchase/indexSon.vue b/src/views/materials/usageMaterials/purchase/indexSon.vue
index 8951a79..75915de 100644
--- a/src/views/materials/usageMaterials/purchase/indexSon.vue
+++ b/src/views/materials/usageMaterials/purchase/indexSon.vue
@@ -166,7 +166,7 @@
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-      <div class="flex flex-wrap items-center justify-between p-4 border-t gap-4">
+      <div class="flex flex-wrap items-center justify-between p-4 border-t gap-4" v-if="total > 0">
         <div class="text-gray-500 text-sm">
           共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
         </div>
diff --git a/src/views/progress/plan/index.vue b/src/views/progress/plan/index.vue
index b11c20d..2f22b3f 100644
--- a/src/views/progress/plan/index.vue
+++ b/src/views/progress/plan/index.vue
@@ -18,9 +18,9 @@
                 <el-option v-for="item in matrixOptions" :key="item.id" :label="item.matrixName" :value="item.id" />
               </el-select> -->
             </el-form-item>
-            <el-form-item>
+            <!-- <el-form-item>
               <el-button type="primary" icon="Download" @click="handleQuery">导出周报</el-button>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
         </el-card>
       </div>