From 0c7637f507b28342e109b82c901abc348dd1abac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 18 Oct 2024 15:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/consumable.js                         | 11 -----------
 .../invoicing/components/addConsTakin.vue     |  4 ++--
 .../components/cons_record_detail.vue         |  4 ++--
 .../invoicing/consumable/cons_record copy.vue |  8 ++++----
 .../invoicing/consumable/cons_record.vue      |  2 +-
 .../invoicing/consumable/information.vue      | 12 +++++-------
 src/views/invoicing/operation_in.vue          | 19 ++++++++++++-------
 src/views/invoicing/operation_out.vue         | 11 ++++++++---
 8 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/api/consumable.js b/src/api/consumable.js
index ece7e69..d2dc2d2 100644
--- a/src/api/consumable.js
+++ b/src/api/consumable.js
@@ -154,17 +154,6 @@ export function deletetbProskuCon(data) {
     data
   });
 }
-/**
- * 查询耗材流水信息
- * @returns
- */
-export function gettbConsInfoFlow(data) {
-  return request({
-    url: "/api/viewConInfoFlow/get",
-    method: "post",
-    data
-  });
-}
 
 
 /**
diff --git a/src/views/invoicing/components/addConsTakin.vue b/src/views/invoicing/components/addConsTakin.vue
index a69180c..c848d00 100644
--- a/src/views/invoicing/components/addConsTakin.vue
+++ b/src/views/invoicing/components/addConsTakin.vue
@@ -168,8 +168,7 @@ export default {
             this.form.stockNumber = obj.stockNumber
             this.form.balance = obj.stockNumber
             this.form.price == null ? 0 : this.form.price
-            this.searhForm.skuId = obj.productId
-            this.searhForm.productId = obj.consId
+            this.searhForm.productId = obj.id
             this.getTableData()
         },
         // 分页大小改变
@@ -187,6 +186,7 @@ export default {
             try {
                 this.tableData.loading = true
                 const res = await tbConCheckGet({
+                    
                     page: this.tableData.page,
                     size: this.tableData.size,
                     conInfoId: this.searhForm.productId,
diff --git a/src/views/invoicing/components/cons_record_detail.vue b/src/views/invoicing/components/cons_record_detail.vue
index bb39f7c..7441104 100644
--- a/src/views/invoicing/components/cons_record_detail.vue
+++ b/src/views/invoicing/components/cons_record_detail.vue
@@ -76,7 +76,7 @@
 </template>
   
   <script>
-import { gettbConsInfoFlow } from "@/api/consumable";
+import { gettbConsInfo } from "@/api/consumable";
 import orderDetail from "@/views/order_manage/components/orderDetail";
 export default {
     components:{
@@ -144,7 +144,7 @@ export default {
     async getTableData() {
       try {
         this.clickseetableData.loading = true;
-        const res = await gettbConsInfoFlow({
+        const res = await gettbConsInfo({
           page: this.clickseetableData.page,
           size: this.clickseetableData.size,
            ...this.query,
diff --git a/src/views/invoicing/consumable/cons_record copy.vue b/src/views/invoicing/consumable/cons_record copy.vue
index d603bc1..54ba8af 100644
--- a/src/views/invoicing/consumable/cons_record copy.vue	
+++ b/src/views/invoicing/consumable/cons_record copy.vue	
@@ -96,7 +96,7 @@
 </template>
 
 <script>
-import { gettbConsInfoFlow, gettbConsInfo } from "@/api/consumable";
+import { gettbConsInfo } from "@/api/consumable";
 export default {
   data() {
     return {
@@ -139,7 +139,7 @@ export default {
     async getGroupConInfoFlow(row) {
       try {
         row.loading = true;
-        const res = await gettbConsInfoFlow({
+        const res = await gettbConsInfo({
           page: row.page,
           size: row.size,
           consId: row.consId,
@@ -157,7 +157,7 @@ export default {
             total: res.totalElements,
           });
         }
-        // const res = await gettbConsInfoFlow({
+        // const res = await gettbConsInfo({
         //   page: this.clickseetableData.page,
         //   size: this.clickseetableData.size,
         //   consId: "",
@@ -213,7 +213,7 @@ export default {
           conName: this.query.conName,
           shopId: localStorage.getItem("shopId"),
         });
-        // const res = await gettbConsInfoFlow({
+        // const res = await gettbConsInfo({
         //   page: this.clickseetableData.page,
         //   size: this.clickseetableData.size,
         //   consId: "",
diff --git a/src/views/invoicing/consumable/cons_record.vue b/src/views/invoicing/consumable/cons_record.vue
index d8d586c..1d6af6c 100644
--- a/src/views/invoicing/consumable/cons_record.vue
+++ b/src/views/invoicing/consumable/cons_record.vue
@@ -81,7 +81,7 @@
 </template>
 
 <script>
-import { gettbConsInfoFlow, gettbConsInfo } from "@/api/consumable";
+import { gettbConsInfo } from "@/api/consumable";
 import consRecordDetail from "../components/cons_record_detail";
 
 export default {
diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue
index 58b6124..7d35b21 100644
--- a/src/views/invoicing/consumable/information.vue
+++ b/src/views/invoicing/consumable/information.vue
@@ -38,7 +38,6 @@
           <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
           <el-button @click="routerGo('operation_in')">入库</el-button>
           <el-button @click="routerGo('operation_out')">出库</el-button>
-          <el-button @click="$router.push({ name: 'cons_record' })">耗材记录</el-button>
           <el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
           <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
           <el-button icon="el-icon-download" :loading="downloadLoading" @click="protHandle">导出耗材</el-button>
@@ -264,8 +263,8 @@
                   <i class="el-icon-caret-bottom el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item class="clearfix" v-for="(item) in scope.row.product" :key="item.productId"
-                    :command="item.productId">
+                  <el-dropdown-item class="clearfix" v-for="(item) in scope.row.product" :key="item.id"
+                    :command="item.id">
                     {{ item.name }}
                   </el-dropdown-item>
                 </el-dropdown-menu>
@@ -581,7 +580,6 @@ import {
   gettbConsType,
   gettbConsInfo,
   posttbConsInfo,
-  gettbConsInfoFlow,
   posttbConsInfostockIn,
   postapitbConsInfo,
   tbConsInfoFlowcount,
@@ -820,7 +818,7 @@ export default {
     // 状态切换
     async showChange(e, row) {
       await postapitbConsInfo([{
-        id: row.consId,
+        id: row.id,
         "isCheck": row.isCheck,
         shopId: localStorage.getItem('shopId')
       }])
@@ -845,7 +843,7 @@ export default {
         this.ruleForm[key] = row[key];
       }
       console.log(row, '调试1')
-      this.ruleForm.id = row.consId;
+      this.ruleForm.id = row.id;
       this.dialogshow = true;
     },
     // 重置查询
@@ -1146,7 +1144,7 @@ export default {
     async getConsRecord() {
       try {
         this.clickseetableData.loading = true;
-        const res = await gettbConsInfoFlow({
+        const res = await gettbConsInfo({
           page: this.clickseetableData.page,
           size: this.clickseetableData.size,
           // consId: this.consRecordItem.consId,
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index 7062de5..612add2 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -382,15 +382,15 @@ export default {
         },
         // 切换入库内容
         tabChange(value, type) {
-        console.log(value,type)
+            console.log(value, type)
             this.shopTypesActive = type == 'in' ? 0 : 1
             this.inTabValue = value
             this.resetHandle()
             this.$refs.shopList.reset()//清除选项
             this.$refs.ConsumableList.reset()//清除选项
         },
-          // 切换类型
-          changeTypeEnum(index) {
+        // 切换类型
+        changeTypeEnum(index) {
             this.inTabs.forEach((i) => {
                 if (i.value == this.inTabValue) {
                     this.queryForm.type = i.type
@@ -487,9 +487,14 @@ export default {
                                 break;
                         }
                         this.queryFormLoading = false
-                        this.showResult = true
-                        this.$refs.shopList.reset()//清除选项
-                        this.$refs.ConsumableList.reset()//清除选项
+                        this.$message({
+                            message: '入库提交成功',
+                            type: 'success'
+                        })
+                        this.resetHandle()//初始化
+                        // this.showResult = true
+                        // this.$refs.shopList.reset()//清除选项
+                        // this.$refs.ConsumableList.reset()//清除选项
                     } catch (error) {
                         console.log(error)
                         this.queryFormLoading = false
@@ -522,7 +527,7 @@ export default {
             this.$refs.queryForm.resetFields()
             this.$refs.queryForm.resetFields()
         },
-      
+
         // 获取供应商列表
         async tbShopPurveyorGet() {
             try {
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index f10c465..6bdcf59 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -450,9 +450,14 @@ export default {
                                 break;
                         }
                         this.queryFormLoading = false
-                        this.showResult = true
-                        this.$refs.shopList.clearSelection()//清除选项
-                        this.$refs.ConsumableList.clearSelection()//清除选项
+                        this.$message({
+                            message: '出库提交成功',
+                            type: 'success'
+                        })
+                        this.resetHandle()//初始化
+                        // this.showResult = true
+                        // this.$refs.shopList.clearSelection()//清除选项
+                        // this.$refs.ConsumableList.clearSelection()//清除选项
                     } catch (error) {
                         console.log(error)
                         this.queryFormLoading = false