合并

.env.development

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 
 # 无人机接口地址
 

src/api/materials/materialsInventory/types.ts

@@ -82,7 +82,10 @@ export interface MaterialsInventoryForm extends BaseEntity {
    * 主键id
    */
   id?: string | number;
-
+  /**
+   * 使用部位
+   */
+  usePart?: string;
   /**
    * 材料id
    */

src/views/materials/materials/component/MaterialsInventoryAddDialog.vue

@@ -24,13 +24,16 @@
       <el-form-item label="处理方式" prop="disposition">
         <el-input v-model="form.disposition" placeholder="请输入处理方式" />
       </el-form-item>
+      <el-form-item v-if="form.outPut === '1'" label="使用部位" prop="usePart">
+        <el-input v-model="form.usePart" placeholder="请输入使用部位" />
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="form.remark" placeholder="请输入备注" />
       </el-form-item>
-      <el-form-item label="操作时间" prop="outPutTime">
+      <!-- <el-form-item label="操作时间" prop="outPutTime">
         <el-date-picker clearable v-model="form.outPutTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择操作时间">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="材料出入证明" prop="path">
         <file-upload v-model="form.path" :limit="1" :file-size="50" :file-type="['pdf']" />
       </el-form-item>

src/views/materials/usageMaterials/material/index.vue

@@ -75,20 +75,7 @@
       </el-table>
 
       <!-- 分页 -->
-      <div class="flex items-center justify-between p-4 border-t">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="fetchData" />
-        <div class="text-gray-500 text-sm">
-          共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
-        </div>
-        <el-pagination
-          v-model:current-page="currentPage"
-          v-model:page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
-          :total="total"
-          layout="prev, pager, next, jumper, sizes"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        ></el-pagination>
-      </div>
     </div>
     <!-- 新增/编辑对话框 -->
     <el-dialog
@@ -210,7 +197,12 @@ const saveLoading = ref(false);
 const deleteLoading = ref(false);
 const currentRow = ref(null);
 const submitLoading = ref(false);
-
+const queryParams = reactive({
+  pageSize: 10,
+  pageNum: 1,
+  findType: 2,
+  projectId: currentProject.value?.id
+});
 // 表单数据
 const formData = reactive({
   id: '',
@@ -272,11 +264,7 @@ const tableRowClassName = ({ row, rowIndex }) => {
 const fetchData = async () => {
   loading.value = true;
   try {
-    const res = await useMaterialsQueryList({
+    const res = await useMaterialsQueryList(queryParams);
-      projectId: currentProject.value?.id,
-      findType: 2
-    });
-
     tableData.value = res.rows;
     total.value = res.total;
     loading.value = false;

src/views/materials/usageMaterials/material/indexSon.vue

@@ -168,9 +168,14 @@
       </el-table>
       <!-- 分页 -->
       <div class="flex flex-wrap items-center justify-between p-4 border-t gap-4">
-        <div class="text-gray-500 text-sm">
+        <pagination
-          共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
+          v-show="total > 0"
-        </div>
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="materialsUsageDetails1"
+        />
+
         <el-dialog
           v-model="dialogVisible2"
           :title="dialogType2 === 'addSon' ? '新增采购信息' : '编辑采购信息'"
@@ -480,6 +485,12 @@ const resetForm = () => {
   form.id = '';
 };
 
+const queryParams = reactive({
+  pageSize: 10,
+  pageNum: 1,
+  physicalsupplyId: routeParams.value.id
+});
+
 const handleEdit2 = (row) => {
   dialogType2.value = 'editSon';
   currentRow2.value = row;
@@ -573,9 +584,10 @@ const handleSubmit = async () => {
 };
 const materialsUsageDetails1 = () => {
   loading.value = true;
-  materialsUsageDetails({ physicalsupplyId: routeParams.value.id })
+  materialsUsageDetails(queryParams)
     .then((res) => {
       tableData.value = res.rows;
+      total.value = res.total;
     })
     .catch(() => {
       loading.value = false;

src/views/materials/usageMaterials/purchase/index.vue

@@ -88,20 +88,7 @@
       </el-table>
 
       <!-- 分页 -->
-      <div class="flex items-center justify-between p-4 border-t" v-if="total > 0">
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="fetchData" />
-        <div class="text-gray-500 text-sm">
-          共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
-        </div>
-        <el-pagination
-          v-model:current-page="currentPage"
-          v-model:page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
-          :total="total"
-          layout="prev, pager, next, jumper, sizes"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        ></el-pagination>
-      </div>
     </div>
     <!-- 新增/编辑对话框 -->
     <el-dialog
@@ -264,6 +251,13 @@ const formRules = reactive({
   findType: [{ required: true, message: '请选择类型', trigger: 'change' }]
 });
 
+const queryParams = reactive({
+  pageSize: 10,
+  pageNum: 1,
+  findType: 1,
+  projectId: currentProject.value?.id
+});
+
 // 格式化日期
 const formatDate = (dateString) => {
   if (!dateString) return '-';
@@ -289,10 +283,7 @@ const tableRowClassName = ({ row, rowIndex }) => {
 const fetchData = async () => {
   loading.value = true;
   try {
-    const res = await useMaterialsQueryList({
+    const res = await useMaterialsQueryList(queryParams);
-      projectId: currentProject.value?.id,
-      findType: 1
-    });
 
     tableData.value = res.rows;
     total.value = res.total;

src/views/materials/usageMaterials/purchase/indexSon.vue

@@ -166,21 +166,13 @@
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-      <div class="flex flex-wrap items-center justify-between p-4 border-t gap-4" v-if="total > 0">
+      <pagination
-        <div class="text-gray-500 text-sm">
+        v-show="total > 0"
-          共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
-        </div>
-        <el-pagination
-          v-model:current-page="currentPage"
-          v-model:page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
         :total="total"
-          layout="prev, pager, next, jumper, sizes"
+        v-model:page="queryParams.pageNum"
-          @size-change="handleSizeChange"
+        v-model:limit="queryParams.pageSize"
-          @current-change="handleCurrentChange"
+        @pagination="materialsUsageDetails1"
-          small
+      />
-        ></el-pagination>
-      </div>
     </div>
     <!-- 删除确认对话框 -->
     <el-dialog v-model="deleteDialogVisible2" title="确认删除" width="300px" :show-close="false">
@@ -503,7 +495,11 @@ const resetForm = () => {
   form.findType = 1;
   form.id = '';
 };
-
+const queryParams = reactive({
+  pageSize: 10,
+  pageNum: 1,
+  physicalsupplyId: routeParams.value.id
+});
 const handleEdit2 = (row) => {
   dialogType2.value = 'editSon';
   currentRow2.value = row;
@@ -596,8 +592,9 @@ const handleSubmit = async () => {
   }
 };
 const materialsUsageDetails1 = () => {
-  materialsUsageDetails({ physicalsupplyId: routeParams.value.id }).then((res) => {
+  materialsUsageDetails(queryParams).then((res) => {
     tableData.value = res.rows;
+    total.value = res.total;
   });
 };
 // 格式化日期