bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购：通知验收内容带入机具类型，租赁价格带入修改，含税价格修改

This commit is contained in:
zzyuan 2025-01-07 16:21:59 +08:00
parent 002171f60d
commit 2cf85bbe1f
9 changed files with 124 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/material/lease/apply/component/addToolsApply.vue
View File

@ -650,7 +650,7 @@ export default {
{ dictLabel: "型式试验报告", fileType: "1", name: "", url: "" }, { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
{ dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" }, { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
{ dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" }, { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
{ dictLabel: "其他报告", fileType: "4", name: "", url: "" }, { dictLabel: "其他", fileType: "4", name: "", url: "" },
]; ];
if (this.taskId == "") { if (this.taskId == "") {
// console.log(this.rowData) // console.log(this.rowData)

57
src/views/material/ma/type/index.vue
View File

@ -422,11 +422,11 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item <el-form-item
label="购置价(元/含税)" label="购置价(元/含税)"
prop="name3" prop="buyPrice"
label-width="120px" label-width="120px"
> >
<el-input <el-input
v-model="form.name3" v-model="form.buyPrice"
placeholder="请输入" placeholder="请输入"
maxlength="20" maxlength="20"
type="number" :min="0" type="number" :min="0"
@ -434,32 +434,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="赔偿价(元)" prop="name2" label-width="120px">
<el-input
v-model="form.name2"
placeholder="请输入"
maxlength="20"
type="number" :min="0"
style="width: 170px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="租赁价(元/天)"
prop="name1"
label-width="120px"
>
<el-input
v-model="form.name1"
placeholder="请输入"
maxlength="20"
type="number" :min="0"
style="width: 160px"
/>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item <el-form-item
label="购置价(元/不含税)" label="购置价(元/不含税)"
@ -475,6 +449,33 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="赔偿价(元)" prop="payPrice" label-width="120px">
<el-input
v-model="form.payPrice"
placeholder="请输入"
maxlength="20"
type="number" :min="0"
style="width: 170px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="租赁价(元/天)"
prop="rentPrice"
label-width="120px"
>
<el-input
v-model="form.rentPrice"
placeholder="请输入"
maxlength="20"
type="number" :min="0"
style="width: 160px"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>

4
src/views/material/purchase/goodsAccept/detail.vue
View File

@ -366,7 +366,7 @@ export default {
{ dictLabel: "型式试验报告", fileType: "1", name: "", url: "" }, { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
{ dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" }, { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
{ dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" }, { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
{ dictLabel: "其他报告", fileType: "4", name: "", url: "" }, { dictLabel: "其他", fileType: "4", name: "", url: "" },
], ],
// 查询参数 // 查询参数
queryParams: { queryParams: {
@ -574,7 +574,7 @@ export default {
{ dictLabel: "型式试验报告", fileType: "1", name: "", url: "" }, { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
{ dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" }, { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
{ dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" }, { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
{ dictLabel: "其他报告", fileType: "4", name: "", url: "" }, { dictLabel: "其他", fileType: "4", name: "", url: "" },
]; ];
this.getFileData(); this.getFileData();
this.open = true; this.open = true;

147
src/views/material/purchase/goodsArrived/component/addTools.vue
View File

@ -138,7 +138,7 @@
<el-input-number <el-input-number
v-model="scope.row.purchaseTaxPrice" v-model="scope.row.purchaseTaxPrice"
controls-position="right" controls-position="right"
style="width: 100%" style="width: 100%" @blur="scope.row.purchaseTaxPrice = scope.row.purchaseTaxPrice>0? scope.row.purchaseTaxPrice:0"
:min="0" :step="1" :disabled="scope.row.status!=1&&scope.row.status!=12" :min="0" :step="1" :disabled="scope.row.status!=1&&scope.row.status!=12"
@change="purchaseTaxPriceChange(scope.row,scope.$index)" @change="purchaseTaxPriceChange(scope.row,scope.$index)"
></el-input-number> ></el-input-number>
@ -154,11 +154,23 @@
v-model="scope.row.purchasePrice" v-model="scope.row.purchasePrice"
controls-position="right" controls-position="right"
style="width: 100%" style="width: 100%"
:min="0" :step="1" :disabled="scope.row.status!=1&&scope.row.status!=12" :min="0" :step="1" disabled
@input="purchasePriceChange(scope.row,scope.$index)" @input="purchasePriceChange(scope.row,scope.$index)"
></el-input-number> ></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="租赁价" prop="rentPrice"
align="center" width="200"
>
<template slot-scope="scope">
<el-input-number
v-model="scope.row.rentPrice"
controls-position="right"
style="width: 100%" @blur="scope.row.rentPrice = scope.row.rentPrice>0? Number(scope.row.rentPrice.toFixed(2)) :0"
:min="0" :step="1" :disabled="(scope.row.status!=1&&scope.row.status!=12)||scope.row.rentPriceDisabled"
></el-input-number>
</template>
</el-table-column>
<el-table-column <el-table-column
label="是否为固定资产" label="是否为固定资产"
prop="fixCode" prop="fixCode"
@ -202,7 +214,8 @@
prop="bmFileInfos" prop="bmFileInfos"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: rgb(2, 167, 240);cursor: pointer;" @click="openFileDialog(scope.row)">报告管理</div> <div style="color: #02A7F0;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==0">报告管理</div>
<div style="color: #ccc;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==1">报告管理</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true"> <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
@ -355,7 +368,7 @@ export default {
{dictLabel:"型式试验报告",fileType:"1",name:"",url:""}, {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
{dictLabel:"出厂检测报告",fileType:"2",name:"",url:""}, {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
{dictLabel:"第三方监测报告",fileType:"3",name:"",url:""}, {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
{dictLabel:"其他报告",fileType:"4",name:"",url:""}, {dictLabel:"其他",fileType:"4",name:"",url:""},
], ],
//图片查看弹窗 //图片查看弹窗
dialogImageUrl: '', dialogImageUrl: '',
@ -387,13 +400,13 @@ export default {
}, },
// 表单校验 // 表单校验
rules: { rules: {
// deviceType: [ taxRate: [
// { {
// required: true, required: true,
// message: '请选择类型规格', message: '请填写税率',
// trigger: 'blur', trigger: 'blur',
// }, },
// ], ],
arrivalTime: [ arrivalTime: [
{ {
required: true, required: true,
@ -446,18 +459,19 @@ export default {
taxRateChange(val){ taxRateChange(val){
this.maForm.taxRate = val.replace(/[^\d.]/g,'') this.maForm.taxRate = val.replace(/[^\d.]/g,'')
this.equipmentList.forEach(item=>{ this.equipmentList.forEach(item=>{
if(item.status==1||item.status==12){ if(item.status==1||item.status==12){
item.purchaseTaxPrice = ((item.purchasePrice*(1 + this.maForm.taxRate/100))).toFixed(10) item.purchasePrice = ((item.purchaseTaxPrice/(100 + Number(this.maForm.taxRate)))*100).toFixed(10)
} }
}) })
}, },
// 含税单价 // 含税单价
purchaseTaxPriceChange(row,val){ purchaseTaxPriceChange(row,val){
row.purchasePrice = ((row.purchaseTaxPrice/(100 + this.maForm.taxRate))*100).toFixed(10) row.purchaseTaxPrice = row.purchaseTaxPrice.toFixed(2)
row.purchasePrice = ((row.purchaseTaxPrice/(100 + Number(this.maForm.taxRate)))*100).toFixed(10)
}, },
// 不含税单价 // 不含税单价
purchasePriceChange(row,val){ purchasePriceChange(row,val){
row.purchaseTaxPrice = ((row.purchasePrice*(100 + this.maForm.taxRate))/100).toFixed(10) // row.purchaseTaxPrice = ((row.purchasePrice*(100 + this.maForm.taxRate))/100).toFixed(2)
}, },
/** 物资厂家-下拉选 */ /** 物资厂家-下拉选 */
supplierInfoList() { supplierInfoList() {
@ -556,6 +570,11 @@ export default {
obj.fixCode = "0" obj.fixCode = "0"
obj.status=1 obj.status=1
obj.bmFileInfos=[] obj.bmFileInfos=[]
if(obj.rentPrice>0){//判断是否有租赁价格：有禁用;无修改;
obj.rentPriceDisabled=true
}else{
obj.rentPriceDisabled=false
}
tempList.push(obj) tempList.push(obj)
break break
} }
@ -604,7 +623,10 @@ export default {
this.maForm.taxRate = response.data.purchaseCheckInfo.taxRate this.maForm.taxRate = response.data.purchaseCheckInfo.taxRate
// this.maForm.purchaseNumber = response.data.purchaseNumber // this.maForm.purchaseNumber = response.data.purchaseNumber
// this.maForm.productionTime = response.data.purchaseCheckInfo.productionTime // this.maForm.productionTime = response.data.purchaseCheckInfo.productionTime
this.equipmentList = response.data.purchaseCheckDetailsList this.equipmentList = response.data.purchaseCheckDetailsList;
this.equipmentList.forEach(item=>{
item.rentPriceDisabled=true
})
console.log(this.equipmentList) console.log(this.equipmentList)
// this.loading = false; // this.loading = false;
}) })
@ -616,58 +638,55 @@ export default {
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 保存按钮操作 */ /** 保存按钮操作 */
handleSave() { handleSave() {
// console.log(this.equipmentList)
if (this.equipmentList.length > 0) { if (this.equipmentList.length > 0) {
this.$refs['maForm'].validate((valid) => { this.$refs['maForm'].validate((valid) => {
if (valid) { if (valid) {
this.maForm.taskId = this.taskId this.maForm.taskId = this.taskId;
// this.maForm.checkDetailsList = this.equipmentList let index =this.equipmentList.findIndex(item=>item.purchaseNum==0)
this.$modal let index1 =this.equipmentList.findIndex(item=>item.rentPrice==0)
.confirm('是否确认保存当前页面') let index2 =this.equipmentList.findIndex(item=>item.purchaseTaxPrice==0)
.then(function () {}) if(index>-1){
.then(() => { this.$modal.msgError('采购数量不能为0！')
if (this.isEdit) { }else if(index1>-1){
console.log('编辑') this.$modal.msgError('租赁价格不能为0！')
this.loading = true }else if(index2>-1){
updatePurchaseCheckInfo({purchaseCheckDetailsList: this.equipmentList,purchaseCheckInfo:this.maForm}).then((response) => { this.$modal.msgError('购置单价（含税）不能为0！')
if (response.code == 200) { }else{
this.$modal.msgSuccess( this.$modal.confirm('是否确认保存当前页面').then(function () {})
'编辑成功', .then(() => {
) if (this.isEdit) {
// this.$tab.closeOpenPage({ console.log('编辑')
// path: '/store/newBuy/newDevicesList', this.loading = true
// }) updatePurchaseCheckInfo({purchaseCheckDetailsList: this.equipmentList,purchaseCheckInfo:this.maForm}).then((response) => {
if (response.code == 200) {
this.$emit( this.$modal.msgSuccess(
'addToolsSuccess', '编辑成功',
) )
} this.$emit(
this.loading = false 'addToolsSuccess',
}) )
} else if (!this.isEdit) {
console.log('新增')
// console.log(this.equipmentList)
this.loading = true
addPurchaseCheckInfo({purchaseCheckDetailsList: this.equipmentList,purchaseCheckInfo:this.maForm}).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess(
'新增成功',
)
// this.$tab.closeOpenPage({
// path: '/store/newBuy/newDevicesList',
// })
this.$emit(
'addToolsSuccess',
)
}
this.loading = false
})
} }
this.loading = false
}) })
.catch(() => {}) } else if (!this.isEdit) {
console.log('新增')
// console.log(this.equipmentList)
this.loading = true
addPurchaseCheckInfo({purchaseCheckDetailsList: this.equipmentList,purchaseCheckInfo:this.maForm}).then((response) => {
if (response.code == 200) {
this.$modal.msgSuccess(
'新增成功',
)
this.$emit(
'addToolsSuccess',
)
}
this.loading = false
})
}
}).catch(() => {})
}
} }
}) })
@ -682,7 +701,7 @@ export default {
{dictLabel:"型式试验报告",fileType:"1",name:"",url:""}, {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
{dictLabel:"出厂检测报告",fileType:"2",name:"",url:""}, {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
{dictLabel:"第三方监测报告",fileType:"3",name:"",url:""}, {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
{dictLabel:"其他报告",fileType:"4",name:"",url:""}] {dictLabel:"其他",fileType:"4",name:"",url:""}]
if(this.taskId==""){ if(this.taskId==""){
// console.log(this.rowData) // console.log(this.rowData)
// console.log(this.rowData.bmFileInfos) // console.log(this.rowData.bmFileInfos)

2
src/views/material/purchase/goodsArrived/component/home.vue
View File

@ -722,7 +722,7 @@ export default {
"remark", "remark",
"各位同事您好，请于" + "各位同事您好，请于" +
this.getNowTime() + this.getNowTime() +
"在宏源工业园，进行机具验收。" "在宏源工业园，进行"+row.purchaseMaTypeName+"验收。"
); );
this.getNoticeList(); this.getNoticeList();
this.showPeople = true; this.showPeople = true;

4
src/views/material/purchase/goodsArrived/component/queryTools.vue
View File

@ -177,7 +177,7 @@ export default {
{dictLabel:"型式试验报告",fileType:"1",name:"",url:""}, {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
{dictLabel:"出厂检测报告",fileType:"2",name:"",url:""}, {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
{dictLabel:"第三方监测报告",fileType:"3",name:"",url:""}, {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
{dictLabel:"其他报告",fileType:"4",name:"",url:""}, {dictLabel:"其他",fileType:"4",name:"",url:""},
], ],
//上传 //上传
upload: { upload: {
@ -219,7 +219,7 @@ export default {
{dictLabel:"型式试验报告",fileType:"1",name:"",url:""}, {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
{dictLabel:"出厂检测报告",fileType:"2",name:"",url:""}, {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
{dictLabel:"第三方监测报告",fileType:"3",name:"",url:""}, {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
{dictLabel:"其他报告",fileType:"4",name:"",url:""}] {dictLabel:"其他",fileType:"4",name:"",url:""}]
this.getFileData() this.getFileData()
this.open=true this.open=true
}, },

4
src/views/material/purchase/goodsBind/component/bindTools.vue
View File

@ -522,7 +522,7 @@ export default {
{ dictLabel: "型式试验报告", fileType: "1", name: "", url: "" }, { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
{ dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" }, { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
{ dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" }, { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
{ dictLabel: "其他报告", fileType: "4", name: "", url: "" }, { dictLabel: "其他", fileType: "4", name: "", url: "" },
], ],
//图片查看弹窗 //图片查看弹窗
dialogImageUrl: "", dialogImageUrl: "",
@ -649,7 +649,7 @@ export default {
{ dictLabel: "型式试验报告", fileType: "1", name: "", url: "" }, { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
{ dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" }, { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
{ dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" }, { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
{ dictLabel: "其他报告", fileType: "4", name: "", url: "" }, { dictLabel: "其他", fileType: "4", name: "", url: "" },
]; ];
if (this.taskId == "") { if (this.taskId == "") {
// console.log(this.rowData) // console.log(this.rowData)

4
src/views/material/purchase/goodsEntry/detail.vue
View File

@ -260,7 +260,7 @@ export default {
{dictLabel:"型式试验报告",fileType:"1",name:"",url:""}, {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
{dictLabel:"出厂检测报告",fileType:"2",name:"",url:""}, {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
{dictLabel:"第三方监测报告",fileType:"3",name:"",url:""}, {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
{dictLabel:"其他报告",fileType:"4",name:"",url:""}, {dictLabel:"其他",fileType:"4",name:"",url:""},
], ],
// 查询参数 // 查询参数
queryParams: { queryParams: {
@ -460,7 +460,7 @@ export default {
{dictLabel:"型式试验报告",fileType:"1",name:"",url:""}, {dictLabel:"型式试验报告",fileType:"1",name:"",url:""},
{dictLabel:"出厂检测报告",fileType:"2",name:"",url:""}, {dictLabel:"出厂检测报告",fileType:"2",name:"",url:""},
{dictLabel:"第三方监测报告",fileType:"3",name:"",url:""}, {dictLabel:"第三方监测报告",fileType:"3",name:"",url:""},
{dictLabel:"其他报告",fileType:"4",name:"",url:""}] {dictLabel:"其他",fileType:"4",name:"",url:""}]
this.getFileData() this.getFileData()
this.open=true this.open=true
}, },

4
vue.config.js
View File

@ -36,11 +36,11 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:18080`, // target: `http://localhost:18080`,
// target: `http://192.168.2.248:18080`,//马 target: `http://192.168.2.245:18080`,//马
// target: `http://192.168.0.244:18580`,//测试 // target: `http://192.168.0.244:18580`,//测试
// target: `http://192.168.2.223:18080`,//山 // target: `http://192.168.2.223:18080`,//山
// target: `http://192.168.0.110:18080`,//洪 // target: `http://192.168.0.110:18080`,//洪
target: `http://192.168.0.234:18080`,//阮 // target: `http://192.168.0.234:18080`,//阮
// target: `http://192.168.137.1:18080`,// // target: `http://192.168.137.1:18080`,//
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {