Commit f758b3d0 authored by 邓春圆's avatar 邓春圆

Merge remote-tracking branch 'origin/release2.2' into release2.2

parents 86496fd4 114af037
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<div class="status-line"></div> <div class="status-line"></div>
<div class="status-number">{{logList.length - index}}</div> <div class="status-number">{{logList.length - index}}</div>
<div class="status-info"> <div class="status-info">
<div>{{$l(item, 'title')}}</div> <div>{{$l(item, 'title')}} <el-button v-if="item.approvalId>0" type="text" @click="handleApproval(item.bpmProcessId)">{{$t('查看审批')}}</el-button></div>
<div> <div>
<p>{{formatDate(item.createTime)}}</p> <p>{{formatDate(item.createTime)}}</p>
<p>{{item.operator}}</p> <p>{{item.operator}}</p>
...@@ -574,6 +574,9 @@ export default { ...@@ -574,6 +574,9 @@ export default {
); );
} }
}, },
handleApproval(id) {
this.$router.push({path: '/bpm/process-instance/detail', query: {id: id}})
}
}, },
computed: { computed: {
visitedViews() { visitedViews() {
...@@ -636,7 +639,7 @@ export default { ...@@ -636,7 +639,7 @@ export default {
} else { } else {
return getTotlContent(secStatistics); return getTotlContent(secStatistics);
} }
}, }
}, },
}; };
</script> </script>
......
...@@ -203,7 +203,6 @@ export default { ...@@ -203,7 +203,6 @@ export default {
}; };
}, },
created() { created() {
this.queryAllData();
this.getCountry() this.getCountry()
}, },
methods: { methods: {
...@@ -218,6 +217,7 @@ export default { ...@@ -218,6 +217,7 @@ export default {
if(warehouse){ if(warehouse){
this.$set(this.queryParams,'destCountryId', warehouse.guojia) this.$set(this.queryParams,'destCountryId', warehouse.guojia)
} }
this.queryAllData();
}, },
/* 查询已预装 */ /* 查询已预装 */
getSecGoods() { getSecGoods() {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item> <el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
<el-descriptions :column="3" border> <el-descriptions :column="3" border>
<el-descriptions-item > <el-descriptions-item >
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
{{ WriteOffProportion }}% {{ WriteOffProportion }}%
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<div style="margin: 20px 0;font-size:16px" v-if="form.financeRemark">{{$t('备注')}}:{{form.financeRemark}}</div>
<div class="btn"> <div class="btn">
<el-button <el-button
size="mini" size="mini"
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</el-col> </el-col>
<el-table v-loading="loadings" :data="list" border :key="isUpdate"> <el-table v-loading="loadings" :data="list" border :key="isUpdate">
<el-table-column :label="$t('订单号')" align="center" prop="orderNo" /> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
<el-table-column :label="$t('自编号')" align="center" prop="containerNumber" /> <el-table-column :label="$t('提单号')" align="center" prop="tidanNo" />
<el-table-column :label="$t('唛头')" align="center" prop="marks" /> <el-table-column :label="$t('唛头')" align="center" prop="marks" />
<el-table-column :label="$t('品名')" align="center" prop="title"> <el-table-column :label="$t('品名')" align="center" prop="title">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -532,10 +532,10 @@ ...@@ -532,10 +532,10 @@
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('自编号')" prop="containerNumber"> <el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input <el-input
v-model="queryParams.containerNumber" v-model="queryParams.tidanNo"
:placeholder="$t('请输入自编号')" :placeholder="$t('请输入提单号')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
> >
<el-table-column type="selection" width="55" :reserve-selection="true"> </el-table-column> <el-table-column type="selection" width="55" :reserve-selection="true"> </el-table-column>
<el-table-column :label="$t('订单号')" align="center" prop="orderNo" /> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
<el-table-column :label="$t('自编号')" align="center" prop="containerNumber" /> <el-table-column :label="$t('提单号')" align="center" prop="tidanNo" />
<el-table-column :label="$t('唛头')" align="center" prop="marks" /> <el-table-column :label="$t('唛头')" align="center" prop="marks" />
<el-table-column :label="$t('品名')" align="center" prop="title"> <el-table-column :label="$t('品名')" align="center" prop="title">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div slot="header" class="card-title">{{ $t('应收明细') }}</div> <div slot="header" class="card-title">{{ $t('应收明细') }}</div>
<el-table :data="list" border> <el-table :data="list" border>
<el-table-column :label="$t('订单号')" align="center" prop="orderNo" /> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
<el-table-column :label="$t('自编号')" align="center" prop="containerNumber" /> <el-table-column :label="$t('提单号')" align="center" prop="tidanNo" />
<el-table-column :label="$t('唛头')" align="center" prop="marks" /> <el-table-column :label="$t('唛头')" align="center" prop="marks" />
<el-table-column :label="$t('品名')" align="center" prop="title"> <el-table-column :label="$t('品名')" align="center" prop="title">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<div style="margin: 20px 0;font-size:16px" v-if="form.finaceRemark">{{form.finaceRemark}}</div> <div style="margin: 20px 0;font-size:16px" v-if="form.financeRemark">{{$t('备注')}}:{{form.financeRemark}}</div>
<div slot="footer" style="margin: 20px 0"> <div slot="footer" style="margin: 20px 0">
<el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6" type="primary" @click="toEdit" v-hasPermi="['ecw:payment:detail:edit']">{{ $t('编辑') }}</el-button> <el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6" type="primary" @click="toEdit" v-hasPermi="['ecw:payment:detail:edit']">{{ $t('编辑') }}</el-button>
<el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6" type="primary" @click="verificationAll" v-hasPermi="['ecw:payment:detail:allWriteOff']">{{ $t('全部核销') }}</el-button> <el-button v-if="form.state!=7&&form.state!=9&&form.state!=10&&form.state!=11&&form.state != 4&&form.state != 5 && form.state != 6" type="primary" @click="verificationAll" v-hasPermi="['ecw:payment:detail:allWriteOff']">{{ $t('全部核销') }}</el-button>
...@@ -1164,12 +1164,15 @@ export default { ...@@ -1164,12 +1164,15 @@ export default {
}, 0) }, 0)
}, },
editClick(row) { editClick(row) {
this.getsurplusData()
this.openAddDialog = true this.openAddDialog = true
this.dialogTitle = this.$t('编辑银行实收明细') this.dialogTitle = this.$t('编辑银行实收明细')
this.saveBtnText = this.$t('提交') this.saveBtnText = this.$t('提交')
this.isView = false this.isView = false
setTimeout(() => { setTimeout(() => {
this.addForm = { ...row } this.addForm = { ...row }
var bank = this.bankData.find(v=>v.baAccountNum==this.addForm.accountNo)
if(bank) this.addForm.accountId = bank.id
this.setWriteOffAmount() this.setWriteOffAmount()
}, 0) }, 0)
}, },
......
This diff is collapsed.
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的仓')"> <el-form-item :label="$t('目的仓')">
<el-select v-model="queryParams.dstWarehouseId" :placeholder="$t('请选择')" clearable> <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择')" clearable>
<el-option <el-option
v-for="item in importWarehouseList" v-for="item in importWarehouseList"
:key="item.id" :key="item.id"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<el-table-column :label="$t('运输方式') + '/' + $t('目的地')"> <el-table-column :label="$t('运输方式') + '/' + $t('目的地')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
/{{row.objectiveName}} /{{row.dstWarehouseName}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('仓库实测')"> <el-table-column :label="$t('仓库实测')">
......
...@@ -64,6 +64,15 @@ ...@@ -64,6 +64,15 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-form-item :label="$t('编号')">
<el-input
style="max-width: 188px"
v-model="queryParams.receiptNo"
:placeholder="$t('请输入订单号和提单号、自编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button> <el-button type="primary" @click="handleQuery">{{ $t('查找') }}</el-button>
</el-form-item> </el-form-item>
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment