Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui
This commit is contained in:
commit
2d6cffa4a2
File diff suppressed because it is too large
Load Diff
|
|
@ -478,6 +478,9 @@ export default {
|
|||
message: '请上传委托书',
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
deviceType: [
|
||||
{ required: true, message: '请选择类型规格', trigger: 'blur' }
|
||||
]
|
||||
},
|
||||
maTypeList: [], // 类型名称
|
||||
|
|
@ -542,6 +545,19 @@ export default {
|
|||
return this.maForm.bmFileInfos && this.maForm.bmFileInfos.length == 5
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
equipmentList(newVal) {
|
||||
if (newVal && newVal.length > 0) {
|
||||
// 设备列表有值，设置deviceType为非必填
|
||||
this.rules.deviceType = []
|
||||
} else {
|
||||
// 设备列表为空，设置deviceType为必填
|
||||
this.rules.deviceType = [{ required: true, message: '请选择类型规格', trigger: 'blur' }]
|
||||
}
|
||||
// 重置表单验证状态，避免旧的错误提示残留
|
||||
this.$refs.maForm.clearValidate('deviceType')
|
||||
}
|
||||
},
|
||||
created() {
|
||||
// getCode()
|
||||
if (this.$route.query.type == 'edit') {
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@
|
|||
</div>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="print">打 印</el-button>
|
||||
<el-button type="primary" @click="">查看PDF</el-button>
|
||||
<!-- <el-button type="primary" @click="">查看PDF</el-button> -->
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@
|
|||
</el-form-item>
|
||||
|
||||
<div>
|
||||
<el-form-item prop="deviceName">
|
||||
<el-form-item prop="maName">
|
||||
<el-input
|
||||
maxlength="50"
|
||||
v-model="queryParams.deviceName"
|
||||
v-model="queryParams.maName"
|
||||
placeholder="请输入检索设备名称"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
|
|
@ -330,6 +330,7 @@ import {getReliefList,addRelief } from "@/api/cost/cost";
|
|||
import {downloadFile, downloadFileData} from '@/utils/download'
|
||||
import {getToken} from '@/utils/auth'
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import Decimal from "@/utils/decimal";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
export default {
|
||||
name: "",
|
||||
|
|
@ -370,6 +371,8 @@ export default {
|
|||
agreementId: '',
|
||||
agreementCode: '',
|
||||
time:null,
|
||||
maName:null,
|
||||
typeName:null,
|
||||
},
|
||||
|
||||
// 多选框选中数据
|
||||
|
|
@ -527,7 +530,7 @@ export default {
|
|||
async getList() {
|
||||
this.loading = true;
|
||||
const params = {
|
||||
deviceName: this.queryParams.deviceName,
|
||||
maName: this.queryParams.maName,
|
||||
typeName: this.queryParams.typeName,
|
||||
agreementId: this.queryParams.agreementId,
|
||||
startTime: this.queryParams.time && this.queryParams.time[0],
|
||||
|
|
@ -537,11 +540,10 @@ export default {
|
|||
getReliefList(params).then((response) => {
|
||||
this.pushReviewList = response.data;
|
||||
console.log('22222222',this.pushReviewList)
|
||||
this.leaseAll = Number(
|
||||
this.pushReviewList.reduce((total, item) => {
|
||||
return total + Number(item.leaseMoney);
|
||||
}, 0).toFixed(2)
|
||||
);
|
||||
this.leaseAll = this.pushReviewList.reduce((total, item) => {
|
||||
// return total + Number(item.leaseMoney);
|
||||
return new Decimal(total).add(new Decimal(item.leaseMoney)).toString();
|
||||
}, 0);
|
||||
let obj = {
|
||||
id:null,
|
||||
leaseMoney: this.leaseAll,
|
||||
|
|
@ -559,6 +561,8 @@ export default {
|
|||
projectId: null,
|
||||
agreementId: '',
|
||||
agreementCode: '',
|
||||
maName:null,
|
||||
typeName:null
|
||||
}
|
||||
this.resetForm('queryForm')
|
||||
this.queryParams.time=[]
|
||||
|
|
|
|||
|
|
@ -187,12 +187,12 @@
|
|||
:action="upload.url" style="width: 100%;" :file-list="fileList"
|
||||
:on-success="handleSuccess" :on-error="handleError" :on-remove="handleFileRemove"
|
||||
:before-upload="beforeUpload"
|
||||
accept=".rar,.zip"
|
||||
accept="image/*,.pdf,.doc,.docx"
|
||||
>
|
||||
<i class="el-icon-upload"></i>
|
||||
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
|
||||
<div class="el-upload__tip text-center" slot="tip">
|
||||
<span>按住Ctrl可同时多选，支持上传rar/zip格式文件，单个文件不能超过5M</span>
|
||||
<span>按住Ctrl可同时多选，支持上传图、PDF、Word格式文件，单个文件不能超过5M</span>
|
||||
</div>
|
||||
</el-upload>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<el-form-item prop="dateRange">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="daterange"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期">
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<el-form-item prop="dateRange">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="daterange"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期">
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<el-form-item prop="dateRange">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="daterange"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期">
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<el-form-item prop="dateRange">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="daterange"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期">
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<el-form-item prop="dateRange">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="datetimerange"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="daterange"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期">
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@ module.exports = {
|
|||
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
||||
[process.env.VUE_APP_BASE_API]: {
|
||||
// target: `http://36.33.26.201:19988/prod-api`,
|
||||
// target: `http://192.168.0.15:18080`,//马
|
||||
target: `http://192.168.0.96:18080`,//马
|
||||
// target: `http://192.168.0.244:18580`,//测试
|
||||
// target: `http://192.168.2.223:18080`,//山
|
||||
// target: `http://192.168.2.23:18080`,//洪
|
||||
// target: `http://192.168.0.234:18080`, //阮
|
||||
// target: `http://192.168.137.1:18080`,//
|
||||
target: `http://192.168.0.15:18080`, // 韩傲宇
|
||||
// target: `http://192.168.0.15:18080`, // 韩傲宇
|
||||
// target: `http://192.168.0.60:18080`, // 赵福海
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue