From c0813e2adc925a5495809a34357135fdb9340877 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 24 Nov 2023 20:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouseManagement/material_return.js    | 11 +++
 src/views/qualityManagement/IQC.vue           | 89 +++++++++++++++++++
 .../warehouseManagement/material_return.vue   | 83 +++++++++++++++++
 .../materials_requisition.vue                 |  6 +-
 4 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 src/api/warehouseManagement/material_return.js

diff --git a/src/api/warehouseManagement/material_return.js b/src/api/warehouseManagement/material_return.js
new file mode 100644
index 0000000..ecfe536
--- /dev/null
+++ b/src/api/warehouseManagement/material_return.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+import { downFile } from '@/utils/request'
+
+export function getmaterialreturnList(query) {
+  return request({
+    url: '/mes/wm/return/getmaterialreturn',
+    method: 'get',
+    params: query,
+  })
+}
+
diff --git a/src/views/qualityManagement/IQC.vue b/src/views/qualityManagement/IQC.vue
index e69de29..5098ceb 100644
--- a/src/views/qualityManagement/IQC.vue
+++ b/src/views/qualityManagement/IQC.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="app-container">
+    <div>
+      <el-form :model="search" inline>
+        <el-form-item label="年">
+          <el-input v-model="search.year" placeholder="输入年份"></el-input>
+        </el-form-item>
+        <el-form-item label="周">
+          <el-input v-model="search.week" placeholder="输入周"></el-input>
+        </el-form-item>
+        <el-form-item label="日期" style="float: right">
+          <el-button-group>
+            <el-button type="primary" @click="searchDate(1)">周一</el-button>
+            <el-button type="primary" @click="searchDate(2)">周二</el-button>
+            <el-button type="primary" @click="searchDate(3)">周三</el-button>
+            <el-button type="primary" @click="searchDate(4)">周四</el-button>
+            <el-button type="primary" @click="searchDate(5)">周五</el-button>
+            <el-button type="primary" @click="searchDate(6)">周六</el-button>
+            <el-button type="primary" @click="searchDate(7)">周日</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <pagination
+      :total="pagination.total"
+      :page.sync="pagination.pageNum"
+      :limit.sync="pagination.pageSize"
+      @pagination="getMaterialRequisitionList"
+    />
+    <vxe-table :data="MaterialRequisitionList" stripe>
+      <vxe-column type="seq" width="60"></vxe-column>
+      <vxe-column field="year" title="年"></vxe-column>
+      <vxe-column field="week" title="周"></vxe-column>
+      <vxe-column field="date" title="日"></vxe-column>
+      <vxe-column field="id" title="流水号"></vxe-column>
+      <vxe-column field="workblankpartnumber" title="毛坯零件号"></vxe-column>
+      <vxe-column field="requirenum" title="需要的数量"></vxe-column>
+      <vxe-column title="状态" fixed="right">
+        <template>
+          <vxe-button type="text" status="primary" content="未领料"></vxe-button>
+        </template>
+      </vxe-column>
+    </vxe-table>
+  </div>
+</template>
+
+<script>
+import { getMRlist } from '@/api/warehouseManagement/materials_requisition.js'
+export default {
+  name: 'materials_requisition',
+  data() {
+    return {
+      search: {
+        year: new Date().getFullYear(),
+        week: 1,
+        date: 0,
+      },
+      pagination: {
+        pageNum: 1,
+        pageSize: 10,
+        total: 0,
+      },
+      MaterialRequisitionList: [], //领料单list
+    }
+  },
+  mounted() {
+    this.getMaterialRequisitionList()
+  },
+  methods: {
+    //todo  获取领料单
+    getMaterialRequisitionList() {
+      const query = { ...this.search, ...this.pagination }
+      getMRlist(query).then((res) => {
+        if (res.code == 200) {
+          this.MaterialRequisitionList = res.data.item1
+          this.search.total = res.data.item2
+        }
+      })
+    },
+    searchDate(item) {
+      this.search.date = item
+      this.getMaterialRequisitionList()
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/warehouseManagement/material_return.vue b/src/views/warehouseManagement/material_return.vue
index e69de29..63ec84a 100644
--- a/src/views/warehouseManagement/material_return.vue
+++ b/src/views/warehouseManagement/material_return.vue
@@ -0,0 +1,83 @@
+<template>
+  <div class="app-container">
+    <div>
+      <el-form :model="search" inline>
+        <el-form-item label="年">
+          <el-input v-model="search.year" placeholder="输入年份"></el-input>
+        </el-form-item>
+        <el-form-item label="周">
+          <el-input v-model="search.week" placeholder="输入周"></el-input>
+        </el-form-item>
+        <el-form-item label="日期" style="float: right">
+          <el-button-group>
+            <el-button type="primary" @click="searchDate(1)">周一</el-button>
+            <el-button type="primary" @click="searchDate(2)">周二</el-button>
+            <el-button type="primary" @click="searchDate(3)">周三</el-button>
+            <el-button type="primary" @click="searchDate(4)">周四</el-button>
+            <el-button type="primary" @click="searchDate(5)">周五</el-button>
+            <el-button type="primary" @click="searchDate(6)">周六</el-button>
+            <el-button type="primary" @click="searchDate(7)">周日</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <pagination
+      :total="pagination.total"
+      :page.sync="pagination.pageNum"
+      :limit.sync="pagination.pageSize"
+      @pagination="getMaterialReturnList"
+    />
+    <vxe-table :data="MaterialReturnList" stripe>
+      <vxe-column type="seq" width="60"></vxe-column>
+      <vxe-column field="year" title="年"></vxe-column>
+      <vxe-column field="week" title="周"></vxe-column>
+      <vxe-column field="date" title="日"></vxe-column>
+      <vxe-column field="id" title="流水号"></vxe-column>
+      <vxe-column field="workblankpartnumber" title="毛坯零件号"></vxe-column>
+    </vxe-table>
+  </div>
+</template>
+
+<script>
+import { getmaterialreturnList } from '@/api/warehouseManagement/material_return.js'
+export default {
+  name: 'material_return',
+  data() {
+    return {
+      search: {
+        year: new Date().getFullYear(),
+        week: 1,
+        date: 0,
+      },
+      pagination: {
+        pageNum: 1,
+        pageSize: 10,
+        total: 0,
+      },
+      MaterialReturnList: [], //领料单list
+    }
+  },
+  mounted() {
+    this.getMaterialReturnList()
+  },
+  methods: {
+    //todo  获取领料单
+    getMaterialReturnList() {
+      const query = { ...this.search, ...this.pagination }
+      getMRlist(query).then((res) => {
+        if (res.code == 200) {
+          this.MaterialReturnList = res.data.item1
+          this.search.total = res.data.item2
+        }
+      })
+    },
+    searchDate(item) {
+      this.search.date = item
+      this.getMaterialReturnList()
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/warehouseManagement/materials_requisition.vue b/src/views/warehouseManagement/materials_requisition.vue
index 71aa42e..5098ceb 100644
--- a/src/views/warehouseManagement/materials_requisition.vue
+++ b/src/views/warehouseManagement/materials_requisition.vue
@@ -23,7 +23,6 @@
     </div>
 
     <pagination
-      
       :total="pagination.total"
       :page.sync="pagination.pageNum"
       :limit.sync="pagination.pageSize"
@@ -37,6 +36,11 @@
       <vxe-column field="id" title="流水号"></vxe-column>
       <vxe-column field="workblankpartnumber" title="毛坯零件号"></vxe-column>
       <vxe-column field="requirenum" title="需要的数量"></vxe-column>
+      <vxe-column title="状态" fixed="right">
+        <template>
+          <vxe-button type="text" status="primary" content="未领料"></vxe-button>
+        </template>
+      </vxe-column>
     </vxe-table>
   </div>
 </template>