czg_team
/
management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

耗材修改

This commit is contained in:
魏啾 2024-10-18 15:15:32 +08:00
parent d21d4f490d
commit 0c7637f507
8 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/consumable.js
View File

@ -154,17 +154,6 @@ export function deletetbProskuCon(data) {
data data
}); });
} }
/**
* 查询耗材流水信息
* @returns
*/
export function gettbConsInfoFlow(data) {
return request({
url: "/api/viewConInfoFlow/get",
method: "post",
data
});
}
/** /**

4
src/views/invoicing/components/addConsTakin.vue
View File

@ -168,8 +168,7 @@ export default {
this.form.stockNumber = obj.stockNumber this.form.stockNumber = obj.stockNumber
this.form.balance = obj.stockNumber this.form.balance = obj.stockNumber
this.form.price == null ? 0 : this.form.price this.form.price == null ? 0 : this.form.price
this.searhForm.skuId = obj.productId this.searhForm.productId = obj.id
this.searhForm.productId = obj.consId
this.getTableData() this.getTableData()
}, },
// 分页大小改变 // 分页大小改变
@ -187,6 +186,7 @@ export default {
try { try {
this.tableData.loading = true this.tableData.loading = true
const res = await tbConCheckGet({ const res = await tbConCheckGet({
page: this.tableData.page, page: this.tableData.page,
size: this.tableData.size, size: this.tableData.size,
conInfoId: this.searhForm.productId, conInfoId: this.searhForm.productId,

4
src/views/invoicing/components/cons_record_detail.vue
View File

@ -76,7 +76,7 @@
</template> </template>
<script> <script>
import { gettbConsInfoFlow } from "@/api/consumable"; import { gettbConsInfo } from "@/api/consumable";
import orderDetail from "@/views/order_manage/components/orderDetail"; import orderDetail from "@/views/order_manage/components/orderDetail";
export default { export default {
components:{ components:{
@ -144,7 +144,7 @@ export default {
async getTableData() { async getTableData() {
try { try {
this.clickseetableData.loading = true; this.clickseetableData.loading = true;
const res = await gettbConsInfoFlow({ const res = await gettbConsInfo({
page: this.clickseetableData.page, page: this.clickseetableData.page,
size: this.clickseetableData.size, size: this.clickseetableData.size,
...this.query, ...this.query,

8
src/views/invoicing/consumable/cons_record copy.vue
View File

@ -96,7 +96,7 @@
</template> </template>
<script> <script>
import { gettbConsInfoFlow, gettbConsInfo } from "@/api/consumable"; import { gettbConsInfo } from "@/api/consumable";
export default { export default {
data() { data() {
return { return {
@ -139,7 +139,7 @@ export default {
async getGroupConInfoFlow(row) { async getGroupConInfoFlow(row) {
try { try {
row.loading = true; row.loading = true;
const res = await gettbConsInfoFlow({ const res = await gettbConsInfo({
page: row.page, page: row.page,
size: row.size, size: row.size,
consId: row.consId, consId: row.consId,
@ -157,7 +157,7 @@ export default {
total: res.totalElements, total: res.totalElements,
}); });
} }
// const res = await gettbConsInfoFlow({ // const res = await gettbConsInfo({
// page: this.clickseetableData.page, // page: this.clickseetableData.page,
// size: this.clickseetableData.size, // size: this.clickseetableData.size,
// consId: "", // consId: "",
@ -213,7 +213,7 @@ export default {
conName: this.query.conName, conName: this.query.conName,
shopId: localStorage.getItem("shopId"), shopId: localStorage.getItem("shopId"),
}); });
// const res = await gettbConsInfoFlow({ // const res = await gettbConsInfo({
// page: this.clickseetableData.page, // page: this.clickseetableData.page,
// size: this.clickseetableData.size, // size: this.clickseetableData.size,
// consId: "", // consId: "",

2
src/views/invoicing/consumable/cons_record.vue
View File

@ -81,7 +81,7 @@
</template> </template>
<script> <script>
import { gettbConsInfoFlow, gettbConsInfo } from "@/api/consumable"; import { gettbConsInfo } from "@/api/consumable";
import consRecordDetail from "../components/cons_record_detail"; import consRecordDetail from "../components/cons_record_detail";
export default { export default {

12
src/views/invoicing/consumable/information.vue
View File

@ -38,7 +38,6 @@
<el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button> <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_in')">入库</el-button>
<el-button @click="routerGo('operation_out')">出库</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: 'type' })">分类管理</el-button>
<el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button> <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
<el-button icon="el-icon-download" :loading="downloadLoading" @click="protHandle">导出耗材</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> <i class="el-icon-caret-bottom el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item class="clearfix" v-for="(item) in scope.row.product" :key="item.productId" <el-dropdown-item class="clearfix" v-for="(item) in scope.row.product" :key="item.id"
:command="item.productId"> :command="item.id">
{{ item.name }} {{ item.name }}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
@ -581,7 +580,6 @@ import {
gettbConsType, gettbConsType,
gettbConsInfo, gettbConsInfo,
posttbConsInfo, posttbConsInfo,
gettbConsInfoFlow,
posttbConsInfostockIn, posttbConsInfostockIn,
postapitbConsInfo, postapitbConsInfo,
tbConsInfoFlowcount, tbConsInfoFlowcount,
@ -820,7 +818,7 @@ export default {
// 状态切换 // 状态切换
async showChange(e, row) { async showChange(e, row) {
await postapitbConsInfo([{ await postapitbConsInfo([{
id: row.consId, id: row.id,
"isCheck": row.isCheck, "isCheck": row.isCheck,
shopId: localStorage.getItem('shopId') shopId: localStorage.getItem('shopId')
}]) }])
@ -845,7 +843,7 @@ export default {
this.ruleForm[key] = row[key]; this.ruleForm[key] = row[key];
} }
console.log(row, '调试1') console.log(row, '调试1')
this.ruleForm.id = row.consId; this.ruleForm.id = row.id;
this.dialogshow = true; this.dialogshow = true;
}, },
// 重置查询 // 重置查询
@ -1146,7 +1144,7 @@ export default {
async getConsRecord() { async getConsRecord() {
try { try {
this.clickseetableData.loading = true; this.clickseetableData.loading = true;
const res = await gettbConsInfoFlow({ const res = await gettbConsInfo({
page: this.clickseetableData.page, page: this.clickseetableData.page,
size: this.clickseetableData.size, size: this.clickseetableData.size,
// consId: this.consRecordItem.consId, // consId: this.consRecordItem.consId,

19
src/views/invoicing/operation_in.vue
View File

@ -382,15 +382,15 @@ export default {
}, },
// 切换入库内容 // 切换入库内容
tabChange(value, type) { tabChange(value, type) {
console.log(value,type) console.log(value, type)
this.shopTypesActive = type == 'in' ? 0 : 1 this.shopTypesActive = type == 'in' ? 0 : 1
this.inTabValue = value this.inTabValue = value
this.resetHandle() this.resetHandle()
this.$refs.shopList.reset()//清除选项 this.$refs.shopList.reset()//清除选项
this.$refs.ConsumableList.reset()//清除选项 this.$refs.ConsumableList.reset()//清除选项
}, },
// 切换类型 // 切换类型
changeTypeEnum(index) { changeTypeEnum(index) {
this.inTabs.forEach((i) => { this.inTabs.forEach((i) => {
if (i.value == this.inTabValue) { if (i.value == this.inTabValue) {
this.queryForm.type = i.type this.queryForm.type = i.type
@ -487,9 +487,14 @@ export default {
break; break;
} }
this.queryFormLoading = false this.queryFormLoading = false
this.showResult = true this.$message({
this.$refs.shopList.reset()//清除选项 message: '入库提交成功',
this.$refs.ConsumableList.reset()//清除选项 type: 'success'
})
this.resetHandle()//初始化
// this.showResult = true
// this.$refs.shopList.reset()//清除选项
// this.$refs.ConsumableList.reset()//清除选项
} catch (error) { } catch (error) {
console.log(error) console.log(error)
this.queryFormLoading = false this.queryFormLoading = false
@ -522,7 +527,7 @@ export default {
this.$refs.queryForm.resetFields() this.$refs.queryForm.resetFields()
this.$refs.queryForm.resetFields() this.$refs.queryForm.resetFields()
}, },
// 获取供应商列表 // 获取供应商列表
async tbShopPurveyorGet() { async tbShopPurveyorGet() {
try { try {

11
src/views/invoicing/operation_out.vue
View File

@ -450,9 +450,14 @@ export default {
break; break;
} }
this.queryFormLoading = false this.queryFormLoading = false
this.showResult = true this.$message({
this.$refs.shopList.clearSelection()//清除选项 message: '出库提交成功',
this.$refs.ConsumableList.clearSelection()//清除选项 type: 'success'
})
this.resetHandle()//初始化
// this.showResult = true
// this.$refs.shopList.clearSelection()//清除选项
// this.$refs.ConsumableList.clearSelection()//清除选项
} catch (error) { } catch (error) {
console.log(error) console.log(error)
this.queryFormLoading = false this.queryFormLoading = false