|
|
@@ -14,8 +14,9 @@
|
|
|
v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
|
|
|
:loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
|
|
|
</el-button>
|
|
|
- <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
|
|
|
- :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
|
|
|
+ <el-button size="small" type="success" style="margin-right: 8px"
|
|
|
+ v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
|
|
|
+ @click="submitforApproval">提交请核
|
|
|
</el-button>
|
|
|
<el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
|
|
|
:loading="saveLoading" @click="revokepleaseReview">撤销请核
|
|
|
@@ -31,28 +32,28 @@
|
|
|
<el-card class="box-card">
|
|
|
<el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">
|
|
|
<el-row>
|
|
|
- <el-col :span="5">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="原M B/L NO" prop="mblno">
|
|
|
- <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
|
|
|
- autocomplete="off" clearable placeholder="请输入原M B/L NO">
|
|
|
+ <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
|
|
|
+ size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="原H B/L NO" prop="hblno">
|
|
|
- <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable" size="small"
|
|
|
- autocomplete="off" clearable placeholder="请输入原H B/L NO">
|
|
|
+ <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable"
|
|
|
+ size="small" autocomplete="off" clearable placeholder="请输入原H B/L NO">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="原RET MBLNO" prop="refno" label-width="110px">
|
|
|
- <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable" size="small"
|
|
|
- autocomplete="off" clearable placeholder="请输入原RET MBLNO">
|
|
|
+ <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable"
|
|
|
+ size="small" autocomplete="off" clearable placeholder="请输入原RET MBLNO">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="AMEND原因" prop="responsibleParty">
|
|
|
<search-query :datalist="responsiblePartyData" :selectValue="form.responsibleParty"
|
|
|
:filterable="true" :disabled="buttonDisable" :clearable="true" :buttonIf="false"
|
|
|
@@ -65,23 +66,24 @@
|
|
|
<el-col :span="10">
|
|
|
<el-col :span="15">
|
|
|
<el-form-item label="客户名称" prop="corpCnName">
|
|
|
- <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
|
|
|
- :disabled="true" clearable placeholder="客户名称">
|
|
|
+ <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
|
|
|
+ autocomplete="off" :disabled="true" clearable placeholder="客户名称">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="9">
|
|
|
<el-form-item label="" prop="corpEnName" label-width="5px">
|
|
|
- <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
|
|
|
- :disabled="true" clearable placeholder="客户名称">
|
|
|
+ <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
|
|
|
+ autocomplete="off" :disabled="true" clearable placeholder="客户名称">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="业务类型" prop="businessType">
|
|
|
- <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
|
|
|
- :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
|
|
|
+ <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
|
|
|
+ :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
|
|
|
+ placeholder="业务类型">
|
|
|
</search-query>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -95,16 +97,16 @@
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="制单日期" prop="createTime">
|
|
|
<el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
|
|
|
- type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss" :disabled="buttonDisable"
|
|
|
- placeholder="选择制单日期">
|
|
|
+ type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ :disabled="buttonDisable" placeholder="选择制单日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="航空公司" prop="vesselCnName">
|
|
|
- <el-input style="width: 100%;" v-model="form.carrierCnName" size="small" autocomplete="off"
|
|
|
- :disabled="true" clearable placeholder="航空公司">
|
|
|
+ <el-input style="width: 100%;" v-model="form.carrierCnName" size="small"
|
|
|
+ autocomplete="off" :disabled="true" clearable placeholder="航空公司">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -145,15 +147,15 @@
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="毛重" prop="grossWeight">
|
|
|
- <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
|
|
|
- :disabled="true" clearable placeholder="毛重">
|
|
|
+ <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
|
|
|
+ autocomplete="off" :disabled="true" clearable placeholder="毛重">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="尺码" prop="measurement">
|
|
|
- <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
|
|
|
- :disabled="true" clearable placeholder="尺码">
|
|
|
+ <el-input style="width: 100%;" v-model="form.measurement" size="small"
|
|
|
+ autocomplete="off" :disabled="true" clearable placeholder="尺码">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -164,6 +166,13 @@
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item label="业务部门" prop="createDeptName">
|
|
|
+ <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
|
|
|
+ autocomplete="off" :disabled="true" clearable placeholder="业务部门">
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="原业务备注" prop="origRemarks">
|
|
|
<el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
|
|
|
@@ -178,7 +187,7 @@
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
+ <el-col :offset="20" :span="4">
|
|
|
<el-form-item label="" prop="billNo" label-width="50px">
|
|
|
<el-button size="small" type="primary" style="margin-right: 8px" :disabled="form.id"
|
|
|
:loading="saveLoading" @click="retrievalfun">提取原业务信息
|
|
|
@@ -205,8 +214,9 @@
|
|
|
<i class="el-icon-coin"></i>
|
|
|
<span>应收费用</span>
|
|
|
</div>
|
|
|
- <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
|
|
|
- plain size="small" :disabled="buttonDisable" @click="upwardAddfun('D')">生成amend费用
|
|
|
+ <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
|
|
|
+ type="primary" plain size="small" :disabled="buttonDisable"
|
|
|
+ @click="upwardAddfun('D')">生成amend费用
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
|
|
|
@@ -219,8 +229,9 @@
|
|
|
<i class="el-icon-coin"></i>
|
|
|
<span>应付费用</span>
|
|
|
</div>
|
|
|
- <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
|
|
|
- plain size="small" :disabled="buttonDisable" @click="upwardAddfun('C')">生成amend费用
|
|
|
+ <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
|
|
|
+ type="primary" plain size="small" :disabled="buttonDisable"
|
|
|
+ @click="upwardAddfun('C')">生成amend费用
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
|
|
|
@@ -233,8 +244,8 @@
|
|
|
<el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
|
|
|
:close-on-click-modal="false">
|
|
|
<div>
|
|
|
- <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
|
|
|
- :header-cell-class-name="headerClassName">
|
|
|
+ <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
|
|
|
+ id="out-table" :header-cell-class-name="headerClassName">
|
|
|
<template slot="menu" slot-scope="{ row }">
|
|
|
<el-button type="text" icon="" size="small" @click.stop="retrievePopupsSelect(row)">选择
|
|
|
</el-button>
|
|
|
@@ -265,7 +276,8 @@
|
|
|
id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
|
|
|
:cell-style="{ padding: '0px' }">
|
|
|
<template slot-scope="scope" slot="menu">
|
|
|
- <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
|
|
|
+ <el-button type="text" size="small"
|
|
|
+ @click="dialogPreviewfun(scope.row)">打印预览</el-button>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</el-col>
|
|
|
@@ -277,8 +289,8 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!--预览-->
|
|
|
- <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
|
|
|
- :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
+ <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
|
|
|
+ :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
<div>
|
|
|
<reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
|
|
|
</div>
|
|
|
@@ -312,7 +324,7 @@ import { aeabillsGetDetail } from "@/api/iosBasicData/aeabills";
|
|
|
import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
|
|
|
import { getList as getreportsList } from "@/api/iosBasicData/reports";
|
|
|
import { contrastObj, contrastList } from "@/util/contrastData";
|
|
|
-
|
|
|
+import { getList as userGetList } from '@/api/system/user'
|
|
|
export default {
|
|
|
components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
|
|
|
data() {
|
|
|
@@ -402,12 +414,16 @@ export default {
|
|
|
saveLoading: false, // 按钮加载动画
|
|
|
// 选择的数据
|
|
|
form: {
|
|
|
+ // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
|
|
|
+ // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
|
|
|
createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
|
|
|
feeCenterListD: [],
|
|
|
feeCenterListC: [],
|
|
|
feeCenterList: []
|
|
|
},
|
|
|
oldForm: {
|
|
|
+ // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
|
|
|
+ // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
|
|
|
createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
|
|
|
feeCenterListD: [],
|
|
|
feeCenterListC: [],
|
|
|
@@ -521,8 +537,23 @@ export default {
|
|
|
},
|
|
|
created() {
|
|
|
this.roleName = localStorage.getItem('roleName').split(',')
|
|
|
+ // if (!this.form.id) {
|
|
|
+ // this.userGetListfun() // 获取用户管理数据
|
|
|
+ // }
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 获取用户管理数据
|
|
|
+ userGetListfun(account = undefined, type = false,) {
|
|
|
+ console.log(this.form.operatorName)
|
|
|
+ userGetList(1, 10, { account: this.form.operatorName }, JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_pid.split(',')[0]).then(res => {
|
|
|
+ for (let item of res.data.data.records) {
|
|
|
+ if (item.name == this.form.operatorName) {
|
|
|
+ this.$set(this.form, 'createDeptName', item.deptName)
|
|
|
+ this.$set(this.form, 'createDept', item.deptId)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// 报表预览
|
|
|
previewreportfun() {
|
|
|
getreportsList(1, 10, {
|
|
|
@@ -581,7 +612,7 @@ export default {
|
|
|
reportCode: this.reportformsObj.classifyCode,
|
|
|
groupCode: this.reportformsObj.groupCode,
|
|
|
corpIds: row.id,
|
|
|
- curCode:row.curCode,
|
|
|
+ curCode: row.curCode,
|
|
|
type: 'AMEND'
|
|
|
}).then(res => {
|
|
|
this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
|
|
|
@@ -798,14 +829,15 @@ export default {
|
|
|
this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
|
|
|
this.form.businessType = 'AEA'
|
|
|
this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
|
|
|
-
|
|
|
+ this.form.createDept = row.accDept
|
|
|
+ this.form.createDeptName = row.accDeptName
|
|
|
delete this.form.id
|
|
|
delete this.form.status
|
|
|
delete this.form.id
|
|
|
// delete this.form.createUser
|
|
|
// delete this.form.createUserName
|
|
|
- delete this.form.createDept
|
|
|
- delete this.form.createDeptName
|
|
|
+ // delete this.form.createDept
|
|
|
+ // delete this.form.createDeptName
|
|
|
// delete this.form.createTime
|
|
|
delete this.form.updateUser
|
|
|
delete this.form.updateUserName
|
|
|
@@ -1445,7 +1477,8 @@ export default {
|
|
|
font-size: 16px;
|
|
|
color: #54BCBD;
|
|
|
}
|
|
|
-::v-deep .el-card__body{
|
|
|
+
|
|
|
+::v-deep .el-card__body {
|
|
|
padding: 6px 20px;
|
|
|
}
|
|
|
</style>
|
Qukatie