|
@@ -125,32 +125,48 @@
|
|
|
@refreshDataList="returnData"
|
|
|
></approval-comments>
|
|
|
<el-dialog
|
|
|
- title="打印报销单"
|
|
|
+ :title="`打印${reverse}`"
|
|
|
:visible.sync="dialogVisible"
|
|
|
:fullscreen="true"
|
|
|
style="padding: 0;margin:0"
|
|
|
width="70%"
|
|
|
>
|
|
|
<div ref="print">
|
|
|
+ <div style="margin-bottom: 5px">
|
|
|
+ 标题切换:
|
|
|
+ <el-radio-group v-model="reverse">
|
|
|
+ <el-radio label="报销单">报销单</el-radio>
|
|
|
+ <el-radio label="付款单">付款单</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </div>
|
|
|
<table class="table table-striped table-bordered" align="center" valign="center">
|
|
|
<tr>
|
|
|
- <td style="font-size: 24px;font-weight:bold" class="column" colspan="11">报销单</td>
|
|
|
+ <td style="font-size: 24px;font-weight:bold" class="column" colspan="11">{{ reverse }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td class="column" style="width: 6%;">部门</td>
|
|
|
- <td class="column" colspan="2" style="width: 19%;">{{formList.deptName}}</td>
|
|
|
+ <td class="column" colspan="2" style="width: 19%;">{{ formList.deptName }}</td>
|
|
|
<td class="column" style="width: 9%;">报销方式</td>
|
|
|
- <td class="column" style="width: 9%;">{{formList.expenseTypeName}}</td>
|
|
|
+ <td class="column" style="width: 9%;">{{ formList.expenseTypeName }}</td>
|
|
|
<td class="column" style="width: 9.5%;">业务类型</td>
|
|
|
- <td class="column" style="width: 9.5%;">{{formList.businessTypeName}}</td>
|
|
|
+ <td class="column" style="width: 9.5%;">{{ formList.businessTypeName }}</td>
|
|
|
<td class="column" style="width: 9.5%;">制单人</td>
|
|
|
- <td class="column" style="width: 9.5%;">{{formList.createBy}}</td>
|
|
|
+ <td class="column" style="width: 9.5%;">{{ formList.createBy }}</td>
|
|
|
<td class="column" style="width: 9.5%;">制单日期</td>
|
|
|
- <td class="column" style="width: 9.5%;">{{formList.createTime?formList.createTime.slice(0,10):''}}</td>
|
|
|
+ <td class="column" style="width: 9.5%;">{{ formList.createTime ? formList.createTime.slice(0, 10) : '' }}
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td class="column">户头</td>
|
|
|
+ <td class="column" colspan="3">{{ formList.account }}</td>
|
|
|
+ <td class="column">开户行</td>
|
|
|
+ <td class="column" colspan="3">{{ formList.openingBank }}</td>
|
|
|
+ <td class="column">账号</td>
|
|
|
+ <td class="column" colspan="2">{{ formList.openingBankAccount }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td class="column">备注</td>
|
|
|
- <td class="column" colspan="10" style="text-align: left">{{formList.remark}}</td>
|
|
|
+ <td class="column" colspan="10" style="text-align: left">{{ formList.remark }}</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
<table class="table table-striped table-bordered" align="center" valign="center">
|
|
@@ -165,7 +181,7 @@
|
|
|
<td class="column" style="border-top: none;width: 19%;" colspan="2">备注</td>
|
|
|
</tr>
|
|
|
<tr v-for="(item,index) in contentList" :key="index">
|
|
|
- <td class="column">{{ Number(index)+1 }}</td>
|
|
|
+ <td class="column">{{ Number(index) + 1 }}</td>
|
|
|
<td class="column">{{ item.expenseName }}</td>
|
|
|
<td class="column">{{ item.amount ? Number(item.amount).toFixed(2) : item.amount }}</td>
|
|
|
<td class="column">{{ item.belongsProjectName }}</td>
|
|
@@ -174,18 +190,22 @@
|
|
|
<td class="column">{{ item.matterName }}</td>
|
|
|
<td class="column" colspan="2">{{ item.remark }}</td>
|
|
|
</tr>
|
|
|
- </table>
|
|
|
- <table class="table table-striped table-bordered" align="center" valign="center">
|
|
|
<tr>
|
|
|
- <td class="column" style="width: 14%;border-top: none">金额合计(小写):</td>
|
|
|
- <td class="column" colspan="4" style="text-align: left;border-top: none;width: 40%">{{formList.totalAmount?formList.totalAmount.toFixed(2):''}}</td>
|
|
|
- <td class="column" style="width: 14%;border-top: none">金额合计(大写):</td>
|
|
|
- <td class="column" colspan="4" style="text-align: left;border-top: none;width: 40%">{{formList.totalAmount?dealBigMoney(formList.totalAmount):''}}</td>
|
|
|
+ <td class="column" colspan="2" style="width: 15.5%;border-top: none">金额合计(小写):</td>
|
|
|
+ <td class="column" colspan="2" style="text-align: left;border-top: none;">
|
|
|
+ {{ formList.totalAmount ? formList.totalAmount.toFixed(2) : '' }}
|
|
|
+ </td>
|
|
|
+ <td class="column" colspan="3" style="width: 15%;border-top: none">金额合计(大写):</td>
|
|
|
+ <td class="column" colspan="3" style="text-align: left;border-top: none;">
|
|
|
+ {{ formList.totalAmount ? dealBigMoney(formList.totalAmount) : '' }}
|
|
|
+ </td>
|
|
|
</tr>
|
|
|
+ </table>
|
|
|
+ <table class="table table-striped table-bordered" align="center" valign="center">
|
|
|
<tr>
|
|
|
<td class="column" style="width: 15%;border: none">财务:</td>
|
|
|
<td class="column" colspan="2" style="text-align: left;border: none;width: 18%"></td>
|
|
|
- <td class="column" style="width: 15%;border: none">部门经理:</td>
|
|
|
+ <td class="column" style="width: 15%;border: none">财务经理:</td>
|
|
|
<td class="column" colspan="2" style="text-align: left;border: none;width: 18%"></td>
|
|
|
<td class="column" style="width: 15%;border: none">总经理:</td>
|
|
|
<td class="column" colspan="2" style="text-align: left;border: none;width: 18%"></td>
|
|
@@ -225,15 +245,16 @@ import Global from '@/layout/components/global'
|
|
|
import moment from 'moment'
|
|
|
import { listDept, treeselect } from '@/api/system/dept'
|
|
|
import { getliable } from '@/api/project'
|
|
|
-import cUpload from '@/components/cUpload/index.vue'
|
|
|
+import cUpload from '@/components/cUpload/index.vue'
|
|
|
|
|
|
export default {
|
|
|
name: 'index',
|
|
|
- components:{
|
|
|
+ components: {
|
|
|
cUpload
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ reverse:'报销单',
|
|
|
before: '',
|
|
|
lander: '',
|
|
|
operator: '',
|
|
@@ -258,8 +279,8 @@ export default {
|
|
|
expenseType: [],
|
|
|
expenseId: [],
|
|
|
belongsProjectId: [],
|
|
|
- departmentId:[],
|
|
|
- personnelId:[]
|
|
|
+ departmentId: [],
|
|
|
+ personnelId: []
|
|
|
},
|
|
|
hasPermi: {
|
|
|
lookup: ['anpin:management:query'],
|
|
@@ -277,7 +298,7 @@ export default {
|
|
|
createById: [],
|
|
|
itemDepartment: []
|
|
|
},
|
|
|
- tEnclosure:[],
|
|
|
+ tEnclosure: [],
|
|
|
contentList: [],
|
|
|
inDex: 4,
|
|
|
tableData: [],
|
|
@@ -492,13 +513,13 @@ export default {
|
|
|
plain: true,
|
|
|
disabled: false
|
|
|
}
|
|
|
- // , {
|
|
|
- // type: 'primary',
|
|
|
- // size: 'mini',
|
|
|
- // icon: 'el-icon-edit-outline',
|
|
|
- // name: '请核',
|
|
|
- // disabled: false
|
|
|
- // }
|
|
|
+ , {
|
|
|
+ type: 'primary',
|
|
|
+ size: 'mini',
|
|
|
+ icon: 'el-icon-edit-outline',
|
|
|
+ name: '请核',
|
|
|
+ disabled: false
|
|
|
+ }
|
|
|
, {
|
|
|
type: 'primary',
|
|
|
size: 'mini',
|
|
@@ -535,14 +556,13 @@ export default {
|
|
|
icon: 'el-icon-edit-outline',
|
|
|
name: '打印',
|
|
|
disabled: false
|
|
|
+ }, {
|
|
|
+ type: 'primary',
|
|
|
+ size: 'mini',
|
|
|
+ icon: 'el-icon-edit-outline',
|
|
|
+ name: '查看审批',
|
|
|
+ disabled: false
|
|
|
}
|
|
|
- // , {
|
|
|
- // type: 'primary',
|
|
|
- // size: 'mini',
|
|
|
- // icon: 'el-icon-edit-outline',
|
|
|
- // name: '查看审批',
|
|
|
- // disabled: false
|
|
|
- // }
|
|
|
],
|
|
|
formOption: [
|
|
|
{
|
|
@@ -708,6 +728,34 @@ export default {
|
|
|
labelSize: '80'
|
|
|
}
|
|
|
],
|
|
|
+ pushList: [{
|
|
|
+ index: '10',
|
|
|
+ span: 6,
|
|
|
+ label: 'account',
|
|
|
+ name: '户头',
|
|
|
+ inputType: 2,
|
|
|
+ width: 200,
|
|
|
+ disabled: false,
|
|
|
+ labelSize: '80'
|
|
|
+ }, {
|
|
|
+ index: '11',
|
|
|
+ span: 6,
|
|
|
+ label: 'openingBank',
|
|
|
+ name: '开户行',
|
|
|
+ inputType: 2,
|
|
|
+ width: 200,
|
|
|
+ disabled: false,
|
|
|
+ labelSize: '80'
|
|
|
+ }, {
|
|
|
+ index: '12',
|
|
|
+ span: 6,
|
|
|
+ label: 'openingBankAccount',
|
|
|
+ name: '账号',
|
|
|
+ inputType: 2,
|
|
|
+ width: 200,
|
|
|
+ disabled: false,
|
|
|
+ labelSize: '80'
|
|
|
+ }],
|
|
|
pendingPage: ''
|
|
|
}
|
|
|
},
|
|
@@ -753,18 +801,18 @@ export default {
|
|
|
for (let item in res.rows) {
|
|
|
this.listData.personnelId.push({
|
|
|
label: res.rows[item].userName,
|
|
|
- value: res.rows[item].userId,
|
|
|
- });
|
|
|
+ value: res.rows[item].userId
|
|
|
+ })
|
|
|
this.dataList.itemPersonnel.push({
|
|
|
label: res.rows[item].userName,
|
|
|
- value: res.rows[item].userId,
|
|
|
- });
|
|
|
+ value: res.rows[item].userId
|
|
|
+ })
|
|
|
this.dataList.createById.push({
|
|
|
label: res.rows[item].userName,
|
|
|
- value: res.rows[item].userId,
|
|
|
- });
|
|
|
+ value: res.rows[item].userId
|
|
|
+ })
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
corpsList({ fTypeid: 205 }).then(res => {
|
|
|
for (let item in res.rows) {
|
|
|
this.listData.belongsProjectId.push({
|
|
@@ -804,27 +852,27 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
/** 数字金额大写转换(可以处理整数,小数,负数) */
|
|
|
- dealBigMoney(n){
|
|
|
- let fraction = ['角', '分'];
|
|
|
- let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
|
|
|
- let unit = [ ['元', '万', '亿'], ['', '拾', '佰', '仟'] ];
|
|
|
- let head = n < 0? '欠': '';
|
|
|
- n = Math.abs(n);
|
|
|
- let s = '';
|
|
|
- for (let i = 0; i < fraction.length; i++){
|
|
|
- s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
|
|
|
+ dealBigMoney(n) {
|
|
|
+ let fraction = ['角', '分']
|
|
|
+ let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
|
|
|
+ let unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']]
|
|
|
+ let head = n < 0 ? '欠' : ''
|
|
|
+ n = Math.abs(n)
|
|
|
+ let s = ''
|
|
|
+ for (let i = 0; i < fraction.length; i++) {
|
|
|
+ s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '')
|
|
|
}
|
|
|
- s = s || '整';
|
|
|
- n = Math.floor(n);
|
|
|
- for (let i = 0; i < unit[0].length && n > 0; i++){
|
|
|
- let p = '';
|
|
|
- for (let j = 0; j < unit[1].length && n > 0; j++){
|
|
|
- p = digit[n % 10] + unit[1][j] + p;
|
|
|
- n = Math.floor(n / 10);
|
|
|
+ s = s || '整'
|
|
|
+ n = Math.floor(n)
|
|
|
+ for (let i = 0; i < unit[0].length && n > 0; i++) {
|
|
|
+ let p = ''
|
|
|
+ for (let j = 0; j < unit[1].length && n > 0; j++) {
|
|
|
+ p = digit[n % 10] + unit[1][j] + p
|
|
|
+ n = Math.floor(n / 10)
|
|
|
}
|
|
|
- s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s;
|
|
|
+ s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s
|
|
|
}
|
|
|
- return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整');
|
|
|
+ return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
|
|
|
},
|
|
|
change(scope) {
|
|
|
for (let item in this.contentList) {
|
|
@@ -880,13 +928,13 @@ export default {
|
|
|
addOrUpdateHandle() {
|
|
|
this.addOrUpdateVisible = true
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.addOrUpdate.init(this.$refs.avatar.form.fId, 520)
|
|
|
+ this.$refs.addOrUpdate.init(this.$refs.avatar.form.fId, 560)
|
|
|
})
|
|
|
},
|
|
|
addOrUpdateHand() {
|
|
|
this.addOrUpdateVisib = true
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.ApprovalComments.init(this.$refs.avatar.form.fId, 520)
|
|
|
+ this.$refs.ApprovalComments.init(this.$refs.avatar.form.fId, 560)
|
|
|
})
|
|
|
},
|
|
|
//首页审批跳转关闭返回首页
|
|
@@ -940,11 +988,11 @@ export default {
|
|
|
this.query(this.formDataList)
|
|
|
},
|
|
|
//计算金额
|
|
|
- totalAmount(scope, item,data) {
|
|
|
+ totalAmount(scope, item, data) {
|
|
|
if (item.label === 'amount') {
|
|
|
let amount = 0
|
|
|
- for (let item of data){
|
|
|
- amount += item.amount?Number(item.amount):0
|
|
|
+ for (let item of data) {
|
|
|
+ amount += item.amount ? Number(item.amount) : 0
|
|
|
}
|
|
|
this.$set(this.$refs.avatar.form, 'totalAmount', amount.toFixed(2))
|
|
|
}
|
|
@@ -1010,8 +1058,19 @@ export default {
|
|
|
this.contentButton.push(JSON.parse(this.$route.query.list))
|
|
|
if (JSON.parse(this.$route.query.list)) this.$router.push({ query: {} })
|
|
|
}
|
|
|
+ if (this.$refs.avatar.form.expenseType == 0) {
|
|
|
+ let dataTwo = []
|
|
|
+ for (let item of this.pushList) {
|
|
|
+ dataTwo.push({
|
|
|
+ ...item,
|
|
|
+ disabled: true
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.contentOption = [...this.contentOption, ...dataTwo]
|
|
|
+ this.inDex = this.contentOption.length
|
|
|
+ }
|
|
|
let data = {
|
|
|
- actId: 520,
|
|
|
+ actId: 560,
|
|
|
id: this.$refs.avatar.form.fId
|
|
|
}
|
|
|
getName(data).then(response => {
|
|
@@ -1035,15 +1094,15 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
let operator = this.$refs.avatar.form.createBy
|
|
|
- // if (this.$refs.avatar.form.fBillstatus === 4 && this.lander === operator) {
|
|
|
- // this.contentButton.push({
|
|
|
- // type: 'danger',
|
|
|
- // size: 'mini',
|
|
|
- // icon: 'el-icon-edit-outline',
|
|
|
- // name: '撤销审批',
|
|
|
- // disabled: false
|
|
|
- // })
|
|
|
- // }
|
|
|
+ if (this.$refs.avatar.form.fStatus > 0 && this.lander === operator || this.lander === "admin") {
|
|
|
+ this.contentButton.push({
|
|
|
+ type: 'danger',
|
|
|
+ size: 'mini',
|
|
|
+ icon: 'el-icon-edit-outline',
|
|
|
+ name: '撤销审批',
|
|
|
+ disabled: false
|
|
|
+ })
|
|
|
+ }
|
|
|
this.contentButton.forEach(item => {
|
|
|
if (this.$refs.avatar.form.fBillstatus < 4) {
|
|
|
if (item.name == '录入明细' || item.name == '保存') {
|
|
@@ -1051,7 +1110,7 @@ export default {
|
|
|
} else {
|
|
|
item.disabled = false
|
|
|
}
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
if (item.name == '修改' || item.name == '打印') {
|
|
|
item.disabled = false
|
|
|
} else {
|
|
@@ -1094,7 +1153,7 @@ export default {
|
|
|
let list = {
|
|
|
tCostManagement: res.data.tCostManagement,
|
|
|
tCostManagementItem: res.data.tCostManagementItem,
|
|
|
- tEnclosure:res.data.tEnclosure
|
|
|
+ tEnclosure: res.data.tEnclosure
|
|
|
}
|
|
|
// this.$refs.avatar.form = {}
|
|
|
this.getRow(data, list, '', i)
|
|
@@ -1169,58 +1228,58 @@ export default {
|
|
|
//详情内容保存
|
|
|
submitAndSave(item, res) {
|
|
|
// if (this.$refs.avatar.form.fBillstatus <= 4 || this.$refs.avatar.form.fBillstatus > 5 || !this.$refs.avatar.form.fBillstatus) {
|
|
|
- let formData = new window.FormData()
|
|
|
- this.$refs.avatar.form.fMoney = 0
|
|
|
- this.contentList.forEach(item => this.$refs.avatar.form.fMoney += Number(item.fAmount))
|
|
|
- formData.append('tCostManagement', JSON.stringify(this.$refs.avatar.form))
|
|
|
- formData.append('tCostManagementItem', JSON.stringify(this.contentList))
|
|
|
- formData.append('tEnclosure', JSON.stringify(this.tEnclosure))
|
|
|
- formData.append('fBilltype', 'FY')
|
|
|
- if (item === 3) {
|
|
|
- this.$refs.avatar.form.fId = ''
|
|
|
- this.$refs.avatar.form.fBillno = ''
|
|
|
- this.$refs.avatar.form.fCreateLog = ''
|
|
|
- this.$refs.avatar.form.fPrintLog = ''
|
|
|
- this.$refs.avatar.form.fBillstatus = 2
|
|
|
- this.$refs.avatar.form.fPrint = 0
|
|
|
- this.contentList.forEach(item => item.fId = '')
|
|
|
- this.tEnclosure = []
|
|
|
- this.contentOption.forEach(item => {
|
|
|
- if (item.label == 'createDeptName' || item.label == 'createBy' || item.label == 'createTime' || item.label == 'totalAmount') {
|
|
|
- item.disabled = true
|
|
|
- } else {
|
|
|
- item.disabled = false
|
|
|
+ let formData = new window.FormData()
|
|
|
+ this.$refs.avatar.form.fMoney = 0
|
|
|
+ this.contentList.forEach(item => this.$refs.avatar.form.fMoney += Number(item.fAmount))
|
|
|
+ formData.append('tCostManagement', JSON.stringify(this.$refs.avatar.form))
|
|
|
+ formData.append('tCostManagementItem', JSON.stringify(this.contentList))
|
|
|
+ formData.append('tEnclosure', JSON.stringify(this.tEnclosure))
|
|
|
+ formData.append('fBilltype', 'FY')
|
|
|
+ if (item === 3) {
|
|
|
+ this.$refs.avatar.form.fId = ''
|
|
|
+ this.$refs.avatar.form.fBillno = ''
|
|
|
+ this.$refs.avatar.form.fCreateLog = ''
|
|
|
+ this.$refs.avatar.form.fPrintLog = ''
|
|
|
+ this.$refs.avatar.form.fBillstatus = 2
|
|
|
+ this.$refs.avatar.form.fPrint = 0
|
|
|
+ this.contentList.forEach(item => item.fId = '')
|
|
|
+ this.tEnclosure = []
|
|
|
+ this.contentOption.forEach(item => {
|
|
|
+ if (item.label == 'createDeptName' || item.label == 'createBy' || item.label == 'createTime' || item.label == 'totalAmount') {
|
|
|
+ item.disabled = true
|
|
|
+ } else {
|
|
|
+ item.disabled = false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.disabled = false
|
|
|
+ this.$message.success('操作成功')
|
|
|
+ this.purchaseList.columnList.forEach(item => item.disabled = false)
|
|
|
+ this.contentButton.forEach(item => item.disabled = false)
|
|
|
+ this.contentStyle.forEach(item => item.disabled = false)
|
|
|
+ } else {
|
|
|
+ submit(formData).then(res => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ if (res) {
|
|
|
+ this.$refs.avatar.form = res.data.tCostManagement
|
|
|
}
|
|
|
- })
|
|
|
- this.disabled = false
|
|
|
- this.$message.success("操作成功")
|
|
|
- this.purchaseList.columnList.forEach(item => item.disabled = false)
|
|
|
- this.contentButton.forEach(item => item.disabled = false)
|
|
|
- this.contentStyle.forEach(item => item.disabled = false)
|
|
|
- } else {
|
|
|
- submit(formData).then(res => {
|
|
|
- if (res.code == 200) {
|
|
|
- if (res) {
|
|
|
- this.$refs.avatar.form = res.data.tCostManagement
|
|
|
- }
|
|
|
- this.contentList = res.data.tCostManagementItem
|
|
|
- this.tEnclosure = res.data.tEnclosure
|
|
|
- this.$message.success('保存成功')
|
|
|
- viewSingle(this.$refs.avatar.form.fId).then(res => {
|
|
|
- if (res.code === 200) {
|
|
|
- let list = {
|
|
|
- tCostManagement: res.data.tCostManagement,
|
|
|
- tCostManagementItem: res.data.tCostManagementItem,
|
|
|
- tEnclosure: res.data.tEnclosure
|
|
|
- }
|
|
|
- this.$refs.avatar.form = list.tCostManagement
|
|
|
- this.contentList = list.tCostManagementItem
|
|
|
- this.tEnclosure = list.tEnclosure
|
|
|
+ this.contentList = res.data.tCostManagementItem
|
|
|
+ this.tEnclosure = res.data.tEnclosure
|
|
|
+ this.$message.success('保存成功')
|
|
|
+ viewSingle(this.$refs.avatar.form.fId).then(res => {
|
|
|
+ if (res.code === 200) {
|
|
|
+ let list = {
|
|
|
+ tCostManagement: res.data.tCostManagement,
|
|
|
+ tCostManagementItem: res.data.tCostManagementItem,
|
|
|
+ tEnclosure: res.data.tEnclosure
|
|
|
}
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
+ this.$refs.avatar.form = list.tCostManagement
|
|
|
+ this.contentList = list.tCostManagementItem
|
|
|
+ this.tEnclosure = list.tEnclosure
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
// }
|
|
|
if (item == 1) {
|
|
|
this.dialogVisible = true
|
|
@@ -1274,7 +1333,7 @@ export default {
|
|
|
},
|
|
|
//表单选中后触发
|
|
|
selectTrigger(name, list, id) {
|
|
|
- console.log(list, id)
|
|
|
+ console.log(name, list, id)
|
|
|
if (name == 'fGoodsid') {
|
|
|
for (let item in list) {
|
|
|
if (list[item].value == id) {
|
|
@@ -1283,6 +1342,21 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if (name === 'expenseType') {
|
|
|
+ if (id == 0) {
|
|
|
+ this.contentOption = [...this.contentOption, ...this.pushList]
|
|
|
+ this.inDex = this.contentOption.length
|
|
|
+ } else {
|
|
|
+ for (let item in this.contentOption) {
|
|
|
+ for (let li in this.pushList) {
|
|
|
+ if (this.contentOption[item].label === this.pushList[li].label) {
|
|
|
+ this.contentOption.splice(item, 1)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.inDex = this.contentOption.length
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
//确认打印
|
|
|
Printing() {
|
|
@@ -1428,6 +1502,12 @@ export default {
|
|
|
} else {
|
|
|
item.disabled = true
|
|
|
}
|
|
|
+ } else if (this.$refs.avatar.form.fStatus > 0) {
|
|
|
+ if (item.name === '返回列表' || item.name == '打印' || item.name === '修改' || item.name === '查看审批' || item.name === '审批' || item.name === '撤销采购' || item.name === '撤销审批' || item.name === '保存') {
|
|
|
+ item.disabled = false
|
|
|
+ } else {
|
|
|
+ item.disabled = true
|
|
|
+ }
|
|
|
} else {
|
|
|
item.disabled = false
|
|
|
this.purchaseList.columnList.forEach(item => item.disabled = false)
|
|
@@ -1466,7 +1546,7 @@ export default {
|
|
|
this.addOrUpdateHand()
|
|
|
break
|
|
|
case '请核':
|
|
|
- if (this.$refs.avatar.form.fBillstatus < 4) {
|
|
|
+ if (this.$refs.avatar.form.fStatus < 1) {
|
|
|
this.$refs.avatar.submitForm('check')
|
|
|
} else {
|
|
|
this.$message.error('请先保存')
|
|
@@ -1495,7 +1575,7 @@ export default {
|
|
|
let m = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
|
|
|
let d = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate())
|
|
|
data = {
|
|
|
- actId: 520,
|
|
|
+ actId: 560,
|
|
|
id: this.$refs.avatar.form.fId,
|
|
|
billId: this.$refs.avatar.form.fId,
|
|
|
auditItem: y + '-' + m + '-' + d
|
|
@@ -1570,8 +1650,9 @@ export default {
|
|
|
//请核
|
|
|
writeOff() {
|
|
|
let formData = new window.FormData()
|
|
|
- formData.append('tWarehousebills', JSON.stringify(this.$refs.avatar.form))
|
|
|
- formData.append('tWarehousebillsfees', JSON.stringify(this.contentList))
|
|
|
+ formData.append('tCostManagement', JSON.stringify(this.$refs.avatar.form))
|
|
|
+ formData.append('tCostManagementItem', JSON.stringify(this.contentList))
|
|
|
+ formData.append('tEnclosure', JSON.stringify(this.tEnclosure))
|
|
|
formData.append('fBilltype', 'FY')
|
|
|
pleaseCheck(formData).then(res => {
|
|
|
if (res.code == 200) {
|
|
@@ -1651,33 +1732,33 @@ export default {
|
|
|
listDelete(rows[index].fId).then(data => {
|
|
|
rows.splice(index, 1)
|
|
|
let amount = 0
|
|
|
- for (let item of rows){
|
|
|
- amount += item.amount?Number(item.amount):0
|
|
|
+ for (let item of rows) {
|
|
|
+ amount += item.amount ? Number(item.amount) : 0
|
|
|
}
|
|
|
this.$set(this.$refs.avatar.form, 'totalAmount', amount.toFixed(2))
|
|
|
this.$message({
|
|
|
type: 'success',
|
|
|
message: '删除成功!'
|
|
|
- });
|
|
|
+ })
|
|
|
})
|
|
|
} else {
|
|
|
rows.splice(index, 1)
|
|
|
let amount = 0
|
|
|
- for (let item of rows){
|
|
|
- amount += item.amount?Number(item.amount):0
|
|
|
+ for (let item of rows) {
|
|
|
+ amount += item.amount ? Number(item.amount) : 0
|
|
|
}
|
|
|
this.$set(this.$refs.avatar.form, 'totalAmount', amount.toFixed(2))
|
|
|
this.$message({
|
|
|
type: 'success',
|
|
|
message: '删除成功!'
|
|
|
- });
|
|
|
+ })
|
|
|
}
|
|
|
}).catch(() => {
|
|
|
this.$message({
|
|
|
type: 'info',
|
|
|
message: '已取消删除'
|
|
|
- });
|
|
|
- });
|
|
|
+ })
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
}
|