From 8ce9df6eb609c596744d372eefd420ca4224bfce Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Wed, 22 Jan 2025 16:08:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=AE=A2=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E2=80=9C=E4=BA=A7=E5=93=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E2=80=9D=E5=92=8C=E2=80=9C=E9=94=80=E5=94=AE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E2=80=9D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/wm/productsalse.js                | 16 +++++
 src/views/mes/md/client/components/item.vue   | 63 +++++++++++++++++
 .../mes/md/client/components/salesRecord.vue  | 67 +++++++++++++++++++
 src/views/mes/md/client/index.vue             | 27 +++++++-
 src/views/mes/md/vendor/components/item.vue   |  7 +-
 src/views/mes/md/vendor/index.vue             |  8 ++-
 6 files changed, 181 insertions(+), 7 deletions(-)
 create mode 100644 src/views/mes/md/client/components/item.vue
 create mode 100644 src/views/mes/md/client/components/salesRecord.vue

diff --git a/src/api/mes/wm/productsalse.js b/src/api/mes/wm/productsalse.js
index 1d3cd8f..c2ef673 100644
--- a/src/api/mes/wm/productsalse.js
+++ b/src/api/mes/wm/productsalse.js
@@ -50,3 +50,19 @@ export function execute(salseId) {
     method: 'put'
   })
 }
+
+// 根据客户 id 查询销售产品信息
+export function getItem(clientId) {
+  return request({
+    url: '/mes/wm/productsalse/getItem/' + clientId,
+    method: 'get'
+  })
+}
+
+// 根据客户 id 查询销售订单信息
+export function getSaleRecord(clientId) {
+  return request({
+    url: '/mes/wm/productsalse/getSaleRecord/' + clientId,
+    method: 'get'
+  })
+}
diff --git a/src/views/mes/md/client/components/item.vue b/src/views/mes/md/client/components/item.vue
new file mode 100644
index 0000000..12e6545
--- /dev/null
+++ b/src/views/mes/md/client/components/item.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="app-container">
+    <el-table v-loading="loading" :data="itemList">
+      <el-table-column label="物料编码" align="center" width="120px" prop="itemCode" />
+      <el-table-column label="物料名称" align="center" prop="itemName" :show-overflow-tooltip="true"/>
+      <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
+      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="入库数量" align="center" prop="quantityRecived" />
+      <el-table-column label="批次号" align="center" prop="batchCode" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import {getItem} from "@/api/mes/wm/productsalse";
+
+export default {
+  name: "Bom",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 产品BOM关系表格数据
+      itemList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  props: {
+    optType: undefined,
+    clientId: undefined
+  },
+  created() {
+    this.getList(this.clientId);
+  },
+  methods: {
+    handleOpen(vendorId) {
+      this.getList(vendorId)
+    },
+    /** 获取表格数据 */
+    getList(clientId) {
+      this.loading = true;
+      getItem(clientId).then(response => {
+        this.itemList = response.data;
+        this.loading = false;
+      });
+    },
+  }
+};
+</script>
diff --git a/src/views/mes/md/client/components/salesRecord.vue b/src/views/mes/md/client/components/salesRecord.vue
new file mode 100644
index 0000000..e753c39
--- /dev/null
+++ b/src/views/mes/md/client/components/salesRecord.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="app-container">
+    <el-table v-loading="loading" :data="recordList">
+      <el-table-column label="出库单编号" align="center" prop="salseCode" width="120px" :show-overflow-tooltip="true" />
+      <el-table-column label="出库单名称" align="center" prop="salseName" :show-overflow-tooltip="true" />
+      <el-table-column label="销售订单编号" align="center" prop="soCode" />
+      <el-table-column label="出库日期" align="center" prop="salseDate" width="120px" />
+      <el-table-column label="产品编码" align="center" prop="itemCode" :show-overflow-tooltip="true" />
+      <el-table-column label="产品名称" align="center" prop="itemName" :show-overflow-tooltip="true" />
+      <el-table-column label="规格型号" align="center" prop="specification" />
+      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="出库数量" align="center" prop="quantitySalse" />
+      <el-table-column label="批次号" align="center" prop="batchCode" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import {getSaleRecord} from "@/api/mes/wm/productsalse";
+
+export default {
+  name: "Bom",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 产品BOM关系表格数据
+      recordList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  props: {
+    optType: undefined,
+    clientId: undefined
+  },
+  created() {
+    this.getList(this.clientId);
+  },
+  methods: {
+    handleOpen(vendorId) {
+      this.getList(vendorId)
+    },
+    /** 获取表格数据 */
+    getList(clientId) {
+      this.loading = true;
+      getSaleRecord(clientId).then(response => {
+        this.recordList = response.data;
+        this.loading = false;
+      });
+    },
+  }
+};
+</script>
diff --git a/src/views/mes/md/client/index.vue b/src/views/mes/md/client/index.vue
index 6a49190..df8cbce 100644
--- a/src/views/mes/md/client/index.vue
+++ b/src/views/mes/md/client/index.vue
@@ -181,7 +181,7 @@
     />
 
     <!-- 添加或修改客户对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" @close="cancel" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="8">
@@ -345,6 +345,14 @@
           </el-col>
         </el-row>
       </el-form>
+      <el-tabs type="border-card" v-model="activeName" v-if="optType != 'add'" @tab-click="handleClick">
+        <el-tab-pane label="产品清单" name="item">
+          <Item ref="itemList" :optType="optType" :clientId="form.clientId"></Item>
+        </el-tab-pane>
+        <el-tab-pane label="销售记录" name="salesRecord">
+          <SalesRecord ref="salesRecordList" :optType="optType" :clientId="form.clientId"></SalesRecord>
+        </el-tab-pane>
+      </el-tabs>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-if="optType !='view'">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -389,11 +397,15 @@
 import { listClient, getClient, delClient, addClient, updateClient } from "@/api/mes/md/client";
 import {genCode} from "@/api/system/autocode/rule"
 import { getToken } from "@/utils/auth";
+import SalesRecord from "@/views/mes/md/client/components/salesRecord.vue";
+import Item from "@/views/mes/md/client/components/item.vue";
 export default {
   name: "Client",
+  components: { Item, SalesRecord },
   dicts: ['mes_client_type','sys_yes_no'],
   data() {
     return {
+      activeName: "item",
       //自动生成编码
       autoGenFlag:false,
       optType: undefined,
@@ -535,6 +547,18 @@ export default {
     this.getList();
   },
   methods: {
+    handleSkip() {
+      this.cancel()
+      this.$router.push("/mes/wm/arrivalnotice")
+    },
+    handleClick(tab) {
+      if (tab.name === 'item') {
+        this.$refs.itemList.handleOpen(this.form.clientId)
+      }
+      if (tab.name === 'salesRecord') {
+        this.$refs.salesRecordList.handleOpen(this.form.clientId)
+      }
+    },
     /** 查询客户列表 */
     getList() {
       this.loading = true;
@@ -546,6 +570,7 @@ export default {
     },
     // 取消按钮
     cancel() {
+      this.activeName = "item"
       this.open = false;
       this.reset();
     },
diff --git a/src/views/mes/md/vendor/components/item.vue b/src/views/mes/md/vendor/components/item.vue
index e5a0ccf..69277a8 100644
--- a/src/views/mes/md/vendor/components/item.vue
+++ b/src/views/mes/md/vendor/components/item.vue
@@ -12,10 +12,9 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-position"
             @click="handleSkip(scope.row)"
-            v-hasPermi="['mes:md:mditem:edit']"
-          >修改</el-button>
+          >跳转</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -71,7 +70,7 @@ export default {
     },
     /** 点击跳转按钮 */
     handleSkip(row) {
-      console.log(row, '点击跳转按钮');
+      this.$emit('handleSkip', row)
     },
   }
 };
diff --git a/src/views/mes/md/vendor/index.vue b/src/views/mes/md/vendor/index.vue
index f102666..e4d4add 100644
--- a/src/views/mes/md/vendor/index.vue
+++ b/src/views/mes/md/vendor/index.vue
@@ -356,9 +356,9 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
+      <el-tabs type="border-card" v-model="activeName" v-if="optType != 'add'" @tab-click="handleClick">
         <el-tab-pane label="物料清单" name="item">
-          <Item ref="itemList" :optType="optType" :vendorId="form.vendorId"></Item>
+          <Item ref="itemList" @handleSkip="handleSkip" :optType="optType" :vendorId="form.vendorId"></Item>
         </el-tab-pane>
         <el-tab-pane label="采购记录" name="purchase">
           <Purchase ref="PurchaseList" :optType="optType" :vendorId="form.vendorId"></Purchase>
@@ -555,6 +555,10 @@ export default {
     this.getList();
   },
   methods: {
+    handleSkip() {
+      this.cancel()
+      this.$router.push("/mes/wm/arrivalnotice")
+    },
     handleClick(tab) {
       if (tab.name == 'item') {
         this.$refs.itemList.handleOpen(this.form.vendorId)