From 0861d579b50a2d9e582bcc958bc0e932a2f81544 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 24 Apr 2024 11:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=95=B0=E6=8D=AE-=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-screen/src/api/dialog.js                 |   6 +-
 .../src/components/home/countFlopOne.vue      |   2 -
 .../src/components/home/countFlopTwo.vue      |  16 ++
 .../components/home/getMaterialsDialog.vue    |   1 +
 sgzb-screen/src/components/home/leftTwo.vue   |   9 +-
 .../components/home/returnMaterialsDialog.vue | 232 ++++++++++++++++++
 6 files changed, 261 insertions(+), 5 deletions(-)
 create mode 100644 sgzb-screen/src/components/home/returnMaterialsDialog.vue

diff --git a/sgzb-screen/src/api/dialog.js b/sgzb-screen/src/api/dialog.js
index d2f91002..a1ab1572 100644
--- a/sgzb-screen/src/api/dialog.js
+++ b/sgzb-screen/src/api/dialog.js
@@ -2,15 +2,19 @@ import { POST, GET } from './index.js'
 
 const URL_TYPE_LIST = '/screen/material/returnOfMaterialsInfo/getTypeList'
 const URL_DETAILS = '/screen/base/largeScreen/home/getMaterialReqData/details'
+const URL_RETURN_DETAILS = '/screen/base/largeScreen/home/getMaterialReturnData/details'
 const URL_UNIT_LIST = '/screen/material/agreementInfo/getUnitList'
 const URL_PROJECT_LIST = '/screen/material/agreementInfo/getProjectList'
 
 // 设备类型
 export const getTypeList = params => GET(URL_TYPE_LIST, params)
 
-// 详情
+// 领料数据
 export const getDetails = data => POST(URL_DETAILS, data)
 
+// 退料数据
+export const getReturnDetails = data => POST(URL_RETURN_DETAILS, data)
+
 // 往来单位-下拉
 export const getUnitList = params => GET(URL_UNIT_LIST, params)
 
diff --git a/sgzb-screen/src/components/home/countFlopOne.vue b/sgzb-screen/src/components/home/countFlopOne.vue
index 66854ecc..7d17a954 100644
--- a/sgzb-screen/src/components/home/countFlopOne.vue
+++ b/sgzb-screen/src/components/home/countFlopOne.vue
@@ -55,10 +55,8 @@ export default {
   },
   methods: {
     handleClick(val) {
-      console.log('🚀 ~ handleClick ~ val:', val);
       const params = {
         open: true,
-        toolPutOut: true,
         maType: val
       }
       this.$refs.materialsDialog.setOpen(params);
diff --git a/sgzb-screen/src/components/home/countFlopTwo.vue b/sgzb-screen/src/components/home/countFlopTwo.vue
index af6fbd97..f0e82b4c 100644
--- a/sgzb-screen/src/components/home/countFlopTwo.vue
+++ b/sgzb-screen/src/components/home/countFlopTwo.vue
@@ -25,10 +25,17 @@
       </div>
       <div v-if="suffix" class="count-flop-unit">{{ suffix }}</div>
     </div>
+
+    <returnMaterialsDialog ref="returnMaterialsDialog"></returnMaterialsDialog>
   </div>
 </template>
 <script>
+import returnMaterialsDialog from './returnMaterialsDialog'
+
 export default {
+  components: {
+    returnMaterialsDialog
+  },
   name: 'countFlop',
   data() {
     return {
@@ -47,6 +54,15 @@ export default {
   mounted() {
     this.value = this.val.toString().split("");
   },
+  methods: {
+    handleClick(val) {
+      const params = {
+        open: true,
+        maType: val
+      }
+      this.$refs.returnMaterialsDialog.setOpen(params);
+    }
+  }
 };
 </script>
 <style scoped lang="scss">
diff --git a/sgzb-screen/src/components/home/getMaterialsDialog.vue b/sgzb-screen/src/components/home/getMaterialsDialog.vue
index 9a48fc5f..dab32c69 100644
--- a/sgzb-screen/src/components/home/getMaterialsDialog.vue
+++ b/sgzb-screen/src/components/home/getMaterialsDialog.vue
@@ -57,6 +57,7 @@
             :key="item.prop"
             :align="item.align"
             :type="item.type"
+            show-overflow-tooltip
             >
           </el-table-column>
         </el-table>
diff --git a/sgzb-screen/src/components/home/leftTwo.vue b/sgzb-screen/src/components/home/leftTwo.vue
index 0be59a0d..b77e6e1e 100644
--- a/sgzb-screen/src/components/home/leftTwo.vue
+++ b/sgzb-screen/src/components/home/leftTwo.vue
@@ -4,8 +4,10 @@
       <div class="access-rate-box-title-bg">
         <h5 class="access-rate-box-title">退料数据</h5>
       </div>
-      <CountFlopTwo :val="num" sonTitle="施工机具今日退库"></CountFlopTwo>
-      <div class="access-rate-box-top">
+      <div @click="handleClick(1)">
+        <CountFlopTwo :val="num" sonTitle="施工机具今日退库" ref="countFlopOne"></CountFlopTwo>
+      </div>
+      <div class="access-rate-box-top" @click="handleClick(2)">
         <CountFlopTwo :val="num2" sonTitle="工器具今日退料"></CountFlopTwo>
       </div>
     </div>
@@ -51,6 +53,9 @@ export default {
           this.num2 = this.formatNumber(res.data.num2)
         }
       })
+    },
+    handleClick(maType) {
+      this.$refs.countFlopOne.handleClick(maType)
     }
   }
 
diff --git a/sgzb-screen/src/components/home/returnMaterialsDialog.vue b/sgzb-screen/src/components/home/returnMaterialsDialog.vue
new file mode 100644
index 00000000..5ba1d0c5
--- /dev/null
+++ b/sgzb-screen/src/components/home/returnMaterialsDialog.vue
@@ -0,0 +1,232 @@
+<template>
+  <div>
+    <el-dialog
+      title=""
+      :visible.sync="open"
+      width="85%"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <div class="content">
+        <el-form :model="formData" ref="form" label-width="80px" :inline="false" size="small" inline>
+          <el-form-item label="退料单号" size="small" prop="materialReqNo">
+            <el-input v-model="formData.materialReqNo" placeholder="请输入退料单号" size="small" clearable filterable></el-input>
+          </el-form-item>
+          <el-form-item label="单位名称" size="small" prop="materialReqUnitValue">
+            <el-select v-model="formData.materialReqUnitValue" placeholder="请选择单位" size="small" clearable filterable @change="handleUnit">
+              <el-option
+                v-for="item in formData.materialReqUnitList"
+                :key="item.unitId"
+                :label="item.unitName"
+                :value="item.unitId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工程名称" size="small" prop="materialReqProjectValue">
+            <el-select v-model="formData.materialReqProjectValue" placeholder="请选择工程名称" size="small" clearable filterable @change="handleProject">
+              <el-option
+                v-for="item in formData.materialReqProjectList"
+                :key="item.projectId"
+                :label="item.projectName"
+                :value="item.projectId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="设备类型" size="small" prop="materialReqTypeValue">
+            <el-select v-model="formData.materialReqTypeValue" placeholder="请选择设备类型" size="small" clearable filterable @change="handleType">
+              <el-option v-for="item in formData.materialReqTypeList"
+                :key="item.typeId"
+                :label="item.typeName"
+                :value="item.typeId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="small" @click="handleSearch">查询</el-button>
+            <el-button icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column
+            v-for="item in tableColumn"
+            v-if="item.isShow"
+            :prop="item.prop"
+            :label="item.label"
+            :width="item.width"
+            :key="item.prop"
+            :align="item.align"
+            :type="item.type"
+            show-overflow-tooltip
+            >
+          </el-table-column>
+        </el-table>
+
+        <Pagination
+          v-show="total > 0"
+          :total="total"
+          :page="queryParams.pageNum"
+          :limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+        
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="open = false">关 闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '../Pagination/index.vue'
+import { getTypeList, getReturnDetails, getUnitList, getProjectList } from '../../api/dialog'
+
+export default {
+  name: 'returnMaterialsDialog',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      open: false,
+      material: false, // 领料
+      formData: {
+        materialReqNo: '',
+        materialReqUnitValue: '',
+        materialReqProjectValue: '',
+        materialReqTypeValue: '',
+        materialReqUnitList: [],
+        materialReqProjectList: [],
+        materialReqTypeList: [],
+      },
+      tableData: [],
+      tableColumn: [
+        {
+          label: '序号',
+          type: 'index',
+          width: 60,
+          align: 'center'
+        },
+        {
+          label: '退料时间',
+          prop: 'materialTime',
+          align: 'center'
+        },
+        {
+          label: '退料单号',
+          prop: 'materialCode',
+          align: 'center'
+        },
+        {
+          label: '退料单位',
+          prop: 'unitName',
+          align: 'center'
+        },
+        {
+          label: '退料工程',
+          prop: 'projectName',
+          align: 'center'
+        },
+        {
+          label: '设备类型',
+          prop: 'typeName',
+          align: 'center'
+        },
+        {
+          label: '规格型号',
+          prop: 'typeModelName',
+          align: 'center'
+        },
+        {
+          label: '退料数量',
+          prop: 'num',
+          align: 'center'
+        },
+        {
+          label: '退料状态',
+          prop: 'statusName',
+          align: 'center'
+        }
+      ],
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      maType: 1
+    };
+  },
+  created() {
+    this.getUnit()
+    this.getProject()
+    this.getType()
+    
+  },
+  methods: {
+    setOpen(params) {
+      this.open = params.open,
+      this.maType = params.maType,
+      this.tableData = []
+      setTimeout(() => {
+        this.$refs.form.resetFields()
+        this.getList()
+      }, 100)
+    },
+    getList() {
+      const params = {
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+        maType: this.maType,
+        materialCode: this.formData.materialReqNo.trim(),
+        unitId: this.formData.materialReqUnitValue,
+        projectId: this.formData.materialReqProjectValue,
+        typeId: this.formData.materialReqTypeValue
+      }
+      getReturnDetails(params).then(({data}) => {
+        this.tableData = data.rows
+        this.total = data.total
+      })
+    },
+    getUnit() {
+      getUnitList().then(res => {
+        this.formData.materialReqUnitList = res.data
+      })
+    },
+    handleUnit(val) {
+      this.formData.materialReqUnitValue = val
+    },
+    getProject() {
+      getProjectList().then(res => {
+        this.formData.materialReqProjectList = res.data
+      })
+    },
+    handleProject(val) {
+      this.formData.materialReqProjectValue = val
+    },
+    getType() {
+      getTypeList({ level: '3' }).then(res => {
+        this.formData.materialReqTypeList = res.data
+      })
+    },
+    handleType(val) {
+      this.formData.materialReqTypeValue = val
+    },
+    handleSearch() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    handleReset() {
+      this.$refs.form.resetFields()
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .content{
+    padding: 20px;
+  }
+</style>
\ No newline at end of file