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

Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev

Browse Source
This commit is contained in:
魏啾
2024-10-31 10:18:09 +08:00
parent 4af25b2b80 58ed04ea71
commit df10beaaec
18 changed files with 1261 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,12 +42,12 @@
<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-upload2" :loading="uploadLoading" @click="dialogVisible = true">导入耗材</el-button> -->
<el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
<el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
<el-option label="创建时间" value="createTime,desc" />
<el-option label="数量由低到高" value="balance,asc" />
</el-select>
</div>
</div>
<div class="row_wrap" style="margin-top: 12px">
<div class="row">
@@ -242,7 +242,7 @@
<span>
{{ scope.row.conUnit }}
</span>
<i class="el-icon-edit" @click="editorHandle(scope.row)"></i>
<i class="el-icon-edit" @click="editorHandles(scope.row)"></i>
</template>
</el-table-column>
@@ -352,7 +352,6 @@
</el-form>
</el-dialog>
<!-- 修改和增加 -->
<el-dialog :title="dialogtitle" :visible.sync="dialogshow" width="80%">
<template v-if="dialogtitle != '编辑'">
<div v-for="(item, index) in ruleForms" :key="index">
@@ -482,6 +481,39 @@
</el-form>
</template>
</el-dialog>
<!-- 单位修改 -->
<el-dialog :title="unitItem ? unitItem.conName : ''" :visible.sync="dialogtitleunit" width="40%">
<template>
<div class="unitStyle unitWidth">
<div>主单位</div>
<div>{{ unitItem ? unitItem.conUnit : '' }}</div>
<div style="display: flex;align-items: center;">
<div style="width: 9px;height: 9px;background-color: #D9D9D9;border-radius: 50%;margin:0 6px;"></div> 订货单位
</div>
</div>
<div class="unitStyleBottom unitWidth" @click="switchs = 1" v-if="switchs == 2">
<span style="margin-right: 10px;">+</span> 添加单位
</div>
<div class="unitStyle unitWidth " style="margin-top: 20px;" v-else>
<div>副单位</div>
<div><input style="width: 70px;" type="text" v-model="unitItem.conUnitTwo"> </div>
<div style="display: flex;align-items: center;">
<div style="width: 9px;height: 9px;background-color: #D9D9D9;border-radius: 50%;margin:0 6px;"></div> 订货单位
<input type="text" disabled placeholder="1">
<div style="width: 80px;">{{ unitItem.conUnitTwo }}</div>= <input style="width: 80px;" v-model="unitItem.conUnitTwoConvert"
type="number">{{
unitItem.conUnit }}
</div>
</div>
<div style="display: flex; justify-content: center;margin-top: 20px;">
<el-button @click="dialogtitleunit = false">取 消</el-button>
<el-button type="primary" @click="submitUnit()">
确 定
</el-button>
</div>
</template>
</el-dialog>
<el-dialog title="选择类型" :visible.sync="typedialogshow">
<div class="head-container">
@@ -592,7 +624,7 @@ import {
tbConsInfoFlowstock
} from "@/api/consumable";
import AddConsTakin from "../components/addConsTakin";
import { tbConsInfodownload, tbConsInfoinputStock } from '@/api/invoicing'
import { tbConsInfodownload, tbConsInfoinputStock, unittbConsInfo } from '@/api/invoicing'
import { downloadFile } from "@/utils";
import UploadExcel from '@/components/UploadExcel'
import consRecordDetail from "../components/cons_record_detail";
@@ -677,6 +709,9 @@ export default {
total: 0
},
ruleFormLoading: false,
dialogtitleunit: false,
unitItem: { switchs: 2 },
switchs: 2,
ruleForms: [],
ruleForm: {
conCode: "",
@@ -769,6 +804,15 @@ export default {
}
})
},
async submitUnit() {
const res = await unittbConsInfo([{
conUnitTwoConvert: this.unitItem.conUnitTwoConvert * 1,
conUnitTwo: this.unitItem.conUnitTwo,
id: this.unitItem.id
}])
this.unitItem = {}
this.dialogtitleunit = false
},
//跳转订单列表
toGoodslist(orderNo) {
this.$router.push({
@@ -843,13 +887,22 @@ export default {
console.log(error);
}
},
// 单位编辑
editorHandles(row) {
this.unitItem = row;
this.switchs = 2
if (row.conUnitTwo) {
this.switchs = 1
}
this.dialogtitleunit = true;
},
// 编辑
editorHandle(row) {
this.dialogtitle = "编辑";
for (let key in this.ruleForm) {
this.ruleForm[key] = row[key];
}
console.log(row, '调试1')
this.ruleForm.id = row.id;
this.dialogshow = true;
},
@@ -1306,4 +1359,70 @@ export default {
}
}
}
.unitStyle {
display: flex;
align-items: center;
border-radius: 2px 2px 2px 2px;
>div:first-child {
width: 95px;
height: 42px;
line-height: 42px;
text-align: center;
border-right: 1px solid #DDDFE6;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 14px;
color: #999999;
}
>div:nth-child(2) {
width: 80px;
height: 42px;
line-height: 42px;
text-align: center;
border-right: 1px solid #DDDFE6;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 14px;
color: #3F9EFF;
}
>div:last-child {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 14px;
color: #999999;
>input {
width: 39px;
height: 28px;
background: #FFFFFF;
border-radius: 2px 2px 2px 2px;
border: 1px solid #DDDFE6;
margin: 0 16px;
}
}
}
.unitStyleBottom {
margin-top: 30px;
line-height: 42px;
text-align: center;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 14px;
color: #3F9EFF;
}
.unitWidth {
// width: 418px;
height: 42px;
border-radius: 2px 2px 2px 2px;
border: 1px solid #DDDFE6;
}
</style>

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

@@ -84,6 +84,10 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="欠款金额">
<el-input v-model="queryForm.waitAmount" disabled style="width: 220px;"></el-input>
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="备注">
<el-input v-model="queryForm.remark" placeholder="请输入备注" style="width: 220px;"></el-input>
</el-form-item>
@@ -122,6 +126,17 @@
<div class="tips">原价￥{{ scope.row.costPrice }}/{{ scope.row.conUnit }}</div>
</template>
</el-table-column>
<el-table-column label="单位">
<template v-slot="scope">
<el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit"
:placeholder="scope.row.conUnit">
<el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
<el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo"
v-if="scope.row.conUnitTwo"> </el-option>
</el-select>
<div class="tips"> &nbsp;</div>
</template>
</el-table-column>
<el-table-column label="数量">
<template v-slot="scope">
<el-input-number v-model="scope.row.stockNumber" :min="0" :step="1" step-strictly
@@ -133,10 +148,9 @@
</el-table-column>
<el-table-column label="小计">
<template v-slot="scope">
<!-- <el-input-number v-model="scope.row.totalAmount" :min="0"
<!-- <el-input-number v-model="scope.row.totalAmount" :min="0" scope.row.price , scope.row.stockNumber
controls-position="right"></el-input-number> -->
<el-input :value="formatDecimal(scope.row.price * scope.row.stockNumber)" readonly
style="width: 100px;" />
<el-input :value="formatDecimal(testform(scope.row))" readonly style="width: 100px;" />
</template>
</el-table-column>
<!-- <el-table-column label="变动后剩余库存">
@@ -342,6 +356,13 @@ export default {
cb(uniqueArray);
}, 1000 * Math.random());
},
testform(d) {
let p = 1
if (d.unit && d.unit == d.conUnitTwo) {
p = d.conUnitTwoConvert
}
return d.price * d.stockNumber * p
},
handleSelect(item) {//选定后清空
this.autocompletename = ''
if (this.inTabValue == 'goods') {
@@ -392,6 +413,9 @@ export default {
},
// 切换类型
changeTypeEnum(index) {
let filterd= this.purveyorList.filter(ele=>ele.id == index)
this.queryForm.waitAmount = filterd[0].waitAmount
this.inTabs.forEach((i) => {
if (i.value == this.inTabValue) {
this.queryForm.type = i.type
@@ -424,7 +448,11 @@ export default {
let zong = 0
this.tableData.list.forEach(ele => {
zong += ele.price * ele.stockNumber
let p = 1
if (ele.unit && ele.conUnitTwo == ele.unit) {
p = ele.conUnitTwoConvert
}
zong += ele.price * ele.stockNumber * p
})
this.queryForm.totalAmount = formatDecimal(zong)
}

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

@@ -83,6 +83,11 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="欠款金额">
<el-input v-model="queryForm.waitAmount" disabled style="width: 220px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注">
<el-input v-model="queryForm.remark" placeholder="请输入备注" style="width: 220px;"></el-input>
@@ -120,6 +125,17 @@
<div class="tips">原价￥{{ scope.row.costPrice }}/{{ scope.row.conUnit }}</div>
</template>
</el-table-column>
<el-table-column label="单位">
<template v-slot="scope">
<el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit"
:placeholder="scope.row.conUnit">
<el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
<el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo"
v-if="scope.row.conUnitTwo"> </el-option>
</el-select>
<div class="tips"> &nbsp;</div>
</template>
</el-table-column>
<el-table-column label="数量">
<template v-slot="scope">
<el-input-number v-model="scope.row.stockNumber" :min="0" :step="1" step-strictly
@@ -132,8 +148,7 @@
<template v-slot="scope">
<!-- <el-input-number v-model="scope.row.totalAmount" :min="0"
controls-position="right"></el-input-number> -->
<el-input :value="formatDecimal(scope.row.price * scope.row.stockNumber)" readonly
style="width: 100px;" />
<el-input :value="formatDecimal(testform(scope.row))" readonly style="width: 100px;" />
</template>
</el-table-column>
<!-- <el-table-column label="变动后剩余库存">
@@ -337,6 +352,13 @@ export default {
cb(uniqueArray);
}, 1000 * Math.random());
},
testform(d) {
let p = 1
if (d.unit && d.unit == d.conUnitTwo) {
p = d.conUnitTwoConvert
}
return d.price * d.stockNumber * p
},
handleSelect(item) {//选定后清空
this.autocompletename = ''
if (this.inTabValue == 'goods') {
@@ -385,7 +407,11 @@ export default {
let zong = 0
this.tableData.list.forEach(ele => {
zong += ele.price * ele.stockNumber
let p = 1
if (ele.unit && ele.conUnitTwo == ele.unit) {
p = ele.conUnitTwoConvert
}
zong += ele.price * ele.stockNumber * p
})
this.queryForm.totalAmount = formatDecimal(zong)
}
@@ -508,6 +534,9 @@ export default {
},
// 切换类型
changeTypeEnum(index) {
let filterd= this.purveyorList.filter(ele=>ele.id == index)
this.queryForm.waitAmount = filterd[0].waitAmount
if (this.queryForm.purveyorId) {
this.shopTypesActive = 0
} else {