|
|
@@ -191,7 +191,7 @@
|
|
|
<span class="seal-card-type">{{ item.transportation || '未知交通' }} {{ item.departureCity || '?' }}→{{ item.destinationCity || '?' }}</span>
|
|
|
<div class="seal-card-actions">
|
|
|
<van-button size="mini" type="primary" plain @click="openTripEditDialog(scope, 'edit', index)">编辑</van-button>
|
|
|
- <van-button size="mini" type="danger" plain @click="delNewRow('blank_business_trip', index);calcTripTotal(scope)">删除</van-button>
|
|
|
+ <van-button size="mini" type="danger" plain @click="delNewRow('blank_business_trip', index).then(() => calcTripTotal())">删除</van-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="seal-card-body">
|
|
|
@@ -246,6 +246,48 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
+ <template v-slot:blank_business_component="scope">
|
|
|
+ <div style="width: 100%;">
|
|
|
+ <view v-for="(item, index) in scope.model.blank_business_component" :key="index" class="seal-card">
|
|
|
+ <div class="seal-card-header">
|
|
|
+ <span class="seal-card-index">{{ index + 1 }}.</span>
|
|
|
+ <span class="seal-card-type">{{ item.transportationWay || '未知交通' }} {{ item.startPlace || '?' }}→{{ item.endPlace || '?' }}</span>
|
|
|
+ <div class="seal-card-actions">
|
|
|
+ <van-button size="mini" type="primary" plain @click="openBusinessEditDialog(scope, 'edit', index)">编辑</van-button>
|
|
|
+ <van-button size="mini" type="danger" plain @click="delNewRow('blank_business_component', index).then(() => calcBizTotal())">删除</van-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="seal-card-body">
|
|
|
+ <div class="seal-card-row">
|
|
|
+ <span class="seal-card-label">出发</span>
|
|
|
+ <span class="seal-card-value">{{ item.startDate || '-' }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="seal-card-row">
|
|
|
+ <span class="seal-card-label">到达</span>
|
|
|
+ <span class="seal-card-value">{{ item.endDate || '-' }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="seal-card-row">
|
|
|
+ <span class="seal-card-label">出发地</span>
|
|
|
+ <span class="seal-card-value">{{ item.startPlace || '-' }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="seal-card-row">
|
|
|
+ <span class="seal-card-label">到达地</span>
|
|
|
+ <span class="seal-card-value">{{ item.endPlace || '-' }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="seal-card-row">
|
|
|
+ <span class="seal-card-label">交通</span>
|
|
|
+ <span class="seal-card-value">{{ item.transportationWay || '-' }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="seal-card-row">
|
|
|
+ <span class="seal-card-label">费用</span>
|
|
|
+ <span class="seal-card-value">¥{{ item.price || '0' }}</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </view>
|
|
|
+ <van-button type="primary" size="small" block @click="openBusinessEditDialog(scope, 'add', scope.model.blank_business_component?scope.model.blank_business_component.length:0)" style="margin-bottom:10px">+ 添加交通费用</van-button>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+
|
|
|
</fm-generate-vant-form>
|
|
|
|
|
|
<!-- 印章选择弹窗(根层级,避免被 form overflow 裁剪) -->
|
|
|
@@ -364,11 +406,11 @@
|
|
|
<h4 style="text-align:center;margin-bottom:12px">{{ tripEditTitle }}</h4>
|
|
|
<div class="seal-form-row">
|
|
|
<span class="seal-form-label">交通工具</span>
|
|
|
- <input class="seal-form-input" v-model="tripEditForm.transportation" placeholder="飞机/高铁/汽车" />
|
|
|
+ <input class="seal-form-input" v-model="tripEditForm.transportation" placeholder="请输入" />
|
|
|
</div>
|
|
|
<div class="seal-form-row">
|
|
|
<span class="seal-form-label">单程往返</span>
|
|
|
- <input class="seal-form-input" v-model="tripEditForm.isRoundTrip" placeholder="单程/往返" />
|
|
|
+ <input class="seal-form-input" v-model="tripEditForm.isRoundTrip" placeholder="请输入" />
|
|
|
</div>
|
|
|
<div class="seal-form-row">
|
|
|
<span class="seal-form-label">出发城市</span>
|
|
|
@@ -415,6 +457,53 @@
|
|
|
</div>
|
|
|
</van-popup>
|
|
|
|
|
|
+ <!-- 交通费用编辑弹窗 -->
|
|
|
+ <van-popup v-model:show="businessEditVisible" position="bottom" :style="{ height: '75%' }" round>
|
|
|
+ <div style="padding:16px">
|
|
|
+ <h4 style="text-align:center;margin-bottom:12px">{{ businessEditTitle }}</h4>
|
|
|
+ <div class="seal-form-row">
|
|
|
+ <span class="seal-form-label">出发日期</span>
|
|
|
+ <input class="seal-form-input" type="datetime-local" v-model="businessEditForm.startDate" />
|
|
|
+ </div>
|
|
|
+ <div class="seal-form-row">
|
|
|
+ <span class="seal-form-label">到达日期</span>
|
|
|
+ <input class="seal-form-input" type="datetime-local" v-model="businessEditForm.endDate" />
|
|
|
+ </div>
|
|
|
+ <div class="seal-form-row">
|
|
|
+ <span class="seal-form-label">出发地</span>
|
|
|
+ <input class="seal-form-input" v-model="businessEditForm.startPlace" placeholder="请输入" />
|
|
|
+ </div>
|
|
|
+ <div class="seal-form-row">
|
|
|
+ <span class="seal-form-label">到达地</span>
|
|
|
+ <input class="seal-form-input" v-model="businessEditForm.endPlace" placeholder="请输入" />
|
|
|
+ </div>
|
|
|
+ <div class="seal-form-row" @click="businessTransportPopVisible = true">
|
|
|
+ <span class="seal-form-label">交通方式</span>
|
|
|
+ <span class="seal-form-val">{{ businessEditForm.transportationWay || '请选择' }}</span>
|
|
|
+ <span class="seal-form-arrow">›</span>
|
|
|
+ </div>
|
|
|
+ <div class="seal-form-row">
|
|
|
+ <span class="seal-form-label">交通费用</span>
|
|
|
+ <input class="seal-form-input" type="number" v-model="businessEditForm.price" placeholder="请输入" />
|
|
|
+ </div>
|
|
|
+ <div style="display:flex;justify-content:space-between;padding:20px 0">
|
|
|
+ <van-button style="width:48%" @click="businessEditVisible = false">取消</van-button>
|
|
|
+ <van-button style="width:48%" type="primary" @click="onBusinessEditSave">保存</van-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </van-popup>
|
|
|
+
|
|
|
+ <!-- 交通方式选择弹窗 -->
|
|
|
+ <van-popup v-model:show="businessTransportPopVisible" position="bottom" :style="{ height: '30%' }">
|
|
|
+ <van-picker
|
|
|
+ show-toolbar
|
|
|
+ title="选择交通方式"
|
|
|
+ :columns="transportationWayList"
|
|
|
+ @confirm="onBusinessTransportConfirm"
|
|
|
+ @cancel="businessTransportPopVisible = false"
|
|
|
+ />
|
|
|
+ </van-popup>
|
|
|
+
|
|
|
<div>
|
|
|
|
|
|
<div v-if='isEdit'
|
|
|
@@ -611,6 +700,48 @@
|
|
|
prEditMode: 'add',
|
|
|
prEditScope: null,
|
|
|
prEditIndex: null,
|
|
|
+ // 交通费用
|
|
|
+ transportationWayList: [
|
|
|
+ {
|
|
|
+ value: '火车',
|
|
|
+ text: '火车'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '飞机',
|
|
|
+ text: '飞机'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '高铁',
|
|
|
+ text: '高铁'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '公车',
|
|
|
+ text: '公车'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '私车',
|
|
|
+ text: '私车'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '大巴',
|
|
|
+ text: '大巴'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '顺风车',
|
|
|
+ text: '顺风车'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '滴滴',
|
|
|
+ text: '滴滴'
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ businessEditVisible: false,
|
|
|
+ businessEditTitle: '添加交通费用',
|
|
|
+ businessEditForm: { startDate: '', endDate: '', startPlace: '', endPlace: '', transportationWay: '', price: '' },
|
|
|
+ businessEditMode: 'add',
|
|
|
+ businessEditScope: null,
|
|
|
+ businessEditIndex: null,
|
|
|
+ businessTransportPopVisible: false,
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -904,13 +1035,16 @@
|
|
|
} else {
|
|
|
data[key].push(JSON.parse(JSON.stringify(this.tripEditForm)))
|
|
|
}
|
|
|
- this.$refs.generateForm.setData({ [key]: data[key] })
|
|
|
+ await this.$refs.generateForm.setData({ [key]: data[key] })
|
|
|
this.tripEditVisible = false
|
|
|
- this.calcTripTotal(scope)
|
|
|
+ await this.calcTripTotal()
|
|
|
},
|
|
|
- calcTripTotal(scope) {
|
|
|
- var list = scope.model.blank_business_trip || []
|
|
|
+ async calcTripTotal() {
|
|
|
+ var data = await this.$refs.generateForm.getData(false);
|
|
|
+ var list = data.blank_business_trip || []
|
|
|
var totalSec = 0
|
|
|
+
|
|
|
+ console.log('calcTripTotal', data, list)
|
|
|
list.forEach(function(it) {
|
|
|
var d = it.duration
|
|
|
if (!d) return
|
|
|
@@ -946,6 +1080,54 @@
|
|
|
this.$refs.generateForm.setData({ [key]: data[key] })
|
|
|
this.prEditVisible = false
|
|
|
},
|
|
|
+ // ===== 交通费用 =====
|
|
|
+ openBusinessEditDialog(scope, mode, index) {
|
|
|
+ this.businessEditScope = scope
|
|
|
+ this.businessEditIndex = index
|
|
|
+ this.businessEditMode = mode
|
|
|
+ if (mode === 'edit' && scope.model.blank_business_component[index]) {
|
|
|
+ var r = scope.model.blank_business_component[index]
|
|
|
+ this.businessEditForm = { startDate: r.startDate||'', endDate: r.endDate||'', startPlace: r.startPlace||'', endPlace: r.endPlace||'', transportationWay: r.transportationWay||'', price: r.price||'' }
|
|
|
+ this.businessEditTitle = '编辑交通费用'
|
|
|
+ } else {
|
|
|
+ this.businessEditForm = { startDate: '', endDate: '', startPlace: '', endPlace: '', transportationWay: '', price: '' }
|
|
|
+ this.businessEditTitle = '添加交通费用'
|
|
|
+ }
|
|
|
+ this.businessEditVisible = true
|
|
|
+ },
|
|
|
+ async onBusinessEditSave() {
|
|
|
+ var scope = this.businessEditScope, idx = this.businessEditIndex, key = 'blank_business_component'
|
|
|
+ var data = await this.$refs.generateForm.getData(false)
|
|
|
+ if (!data[key]) data[key] = []
|
|
|
+ if (this.businessEditMode === 'edit') data[key][idx] = JSON.parse(JSON.stringify(this.businessEditForm))
|
|
|
+ else data[key].push(JSON.parse(JSON.stringify(this.businessEditForm)))
|
|
|
+ await this.$refs.generateForm.setData({ [key]: data[key] })
|
|
|
+ this.businessEditVisible = false
|
|
|
+ await this.calcBizTotal()
|
|
|
+ },
|
|
|
+ onBusinessTransportConfirm(picker) {
|
|
|
+ var sel = (picker && picker.selectedOptions && picker.selectedOptions[0]) ? picker.selectedOptions[0].text : picker
|
|
|
+ this.businessEditForm.transportationWay = sel
|
|
|
+ this.businessTransportPopVisible = false
|
|
|
+ },
|
|
|
+ async calcBizTotal() {
|
|
|
+ var data = await this.$refs.generateForm.getData(false)
|
|
|
+ var list = data.blank_business_component || []
|
|
|
+ var totalPrice = 0
|
|
|
+ list.forEach(function(it) {
|
|
|
+ totalPrice += Number(it.price) || 0
|
|
|
+ })
|
|
|
+ // 其他费用字段(住宿费、市内交通平台、餐费补贴、市内交通费、招待费、其他费用)
|
|
|
+ var zsf = Number(data.number_uyuxcowe) || 0
|
|
|
+ var snjtpt = Number(data.number_0zw5q8y9) || 0
|
|
|
+ var cfbt = Number(data.number_fyl8n1lm) || 0
|
|
|
+ var snjtf = Number(data.number_p093shsw) || 0
|
|
|
+ var zdf = Number(data.number_uiv62o0r) || 0
|
|
|
+ var qtfy = Number(data.number_i5y1dk9x) || 0
|
|
|
+ this.$refs.generateForm.setData({
|
|
|
+ number_06fgz5gs: totalPrice + zsf + snjtpt + cfbt + snjtf + zdf + qtfy
|
|
|
+ })
|
|
|
+ },
|
|
|
async handleUploadLocal (model, rowIndex) {
|
|
|
console.log('上传本地文件按钮被点击,字段模型:', model, '行索引:', rowIndex)
|
|
|
let data = await this.$refs.generateForm.getData(false);
|
|
|
@@ -983,7 +1165,7 @@
|
|
|
async delNewRow(key, index, isChange) {
|
|
|
let data = await this.$refs.generateForm.getData(false);
|
|
|
data[key] = data[key].filter((item, index1) => index1 != index);
|
|
|
- this.$refs.generateForm.setData({
|
|
|
+ await this.$refs.generateForm.setData({
|
|
|
[key]: data[key]
|
|
|
});
|
|
|
if (isChange) {
|
|
|
@@ -1033,10 +1215,15 @@
|
|
|
});
|
|
|
},
|
|
|
async handleAudit(status) {
|
|
|
+ console.log(1111111, status)
|
|
|
+ let formData = await this.$refs.generateForm.getData(false);
|
|
|
+ console.log('formData~~~~', formData)
|
|
|
this.loading = true;
|
|
|
+ console.log(this.loading)
|
|
|
try {
|
|
|
this.form.valueJson = await this.generateFormValid();
|
|
|
} catch (error) {
|
|
|
+ console.log(22222, error)
|
|
|
this.loading = false;
|
|
|
return;
|
|
|
}
|