|
|
@@ -134,7 +134,7 @@
|
|
|
<el-option v-for="item in secondList" :key="item.id" :label="item.dictValue" :value="item.dictKey">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <span v-else>{{ row.frequency !=5 ? row.second : '-' }}</span>
|
|
|
+ <span v-else>{{ row.frequency != 5 ? row.second : '-' }}</span>
|
|
|
</template>
|
|
|
<template slot="amount" slot-scope="{ row }">
|
|
|
<el-input v-if="row.$cellEdit" v-model="row.amount" placeholder="请输入" size="small"
|
|
|
@@ -751,7 +751,22 @@ export default {
|
|
|
|
|
|
})
|
|
|
})
|
|
|
+ //备注格式
|
|
|
+ let remark = "收入:\n" +
|
|
|
+ "1、业务名称:\n" +
|
|
|
+ "2、费用明细:\n" +
|
|
|
+ "3、业务负责人:\n" +
|
|
|
+ "4、优惠合计:\n" +
|
|
|
+ "5、实际收费:\n" +
|
|
|
+ "6、付款人:\n" +
|
|
|
+ "7、收款时间:\n" +
|
|
|
+ "8、收款人:\n" +
|
|
|
+ "9、收款方式:\n" +
|
|
|
+ "10、备注/特别说明:";
|
|
|
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$set(this.form, "remark", remark)
|
|
|
+ })
|
|
|
} else {
|
|
|
//责任人 承揽人 默认当前登录人
|
|
|
this.$set(this.formTwo, "corpAttn", this.$store.getters.userInfo.user_name)
|
|
|
@@ -1122,7 +1137,7 @@ export default {
|
|
|
const params = {
|
|
|
...this.form,
|
|
|
...this.formTwo,
|
|
|
- corpName:null,
|
|
|
+ corpName: null,
|
|
|
itemList: this.dataList,
|
|
|
filesList: this.upLoadData
|
|
|
}
|
|
|
@@ -1288,7 +1303,7 @@ export default {
|
|
|
this.getList();
|
|
|
},
|
|
|
frequencyChange(row) {
|
|
|
- this.$set(row,'second',null)
|
|
|
+ this.$set(row, 'second', null)
|
|
|
// row.second = null
|
|
|
},
|
|
|
//上传文件保存
|
|
|
@@ -1360,7 +1375,8 @@ export default {
|
|
|
unit: item.unit,
|
|
|
secondDisable: this.secondDisable,
|
|
|
frequency: item.rate,
|
|
|
- projectType: this.secondDisable
|
|
|
+ projectType: this.secondDisable,
|
|
|
+ commission:item.commission,
|
|
|
}
|
|
|
this.$refs.crud.rowCellAdd(params);
|
|
|
this.$refs.crud.rowCell(item, this.optionFrom.length - 1)
|
qukaidi