|
@@ -129,6 +129,73 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ v-if="form.billType == 1"
|
|
|
+ label="卸货地点"
|
|
|
+ prop="mdLoadAddr"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.mdLoadAddr"
|
|
|
+ placeholder="请输入装卸货地点"
|
|
|
+ :disabled="disabled"
|
|
|
+ size="mini"
|
|
|
+ style="width: 180px"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ v-if="form.billType == 2"
|
|
|
+ label="装货地点"
|
|
|
+ prop="mdLoadAddr"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.mdLoadAddr"
|
|
|
+ placeholder="请输入装货地点"
|
|
|
+ :disabled="disabled"
|
|
|
+ size="mini"
|
|
|
+ style="width: 180px"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
|
|
|
+ <el-form-item label="计划时间" prop="mdLoadDate">
|
|
|
+ <el-date-picker
|
|
|
+ clearable
|
|
|
+ size="mini"
|
|
|
+ style="width: 180px"
|
|
|
+ v-model="form.mdLoadDate"
|
|
|
+ type="datetime"
|
|
|
+ placeholder="选择计划装卸货时间"
|
|
|
+ :disabled="disabled"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
|
|
|
+ <el-form-item label="联系人" prop="mdLoadAttn">
|
|
|
+ <el-input
|
|
|
+ v-model="form.mdLoadAttn"
|
|
|
+ placeholder="请输入装卸货联系人"
|
|
|
+ :disabled="disabled"
|
|
|
+ size="mini"
|
|
|
+ style="width: 180px"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
|
|
|
+ <el-form-item label="联系电话" prop="mdLoadAttnTel">
|
|
|
+ <el-input
|
|
|
+ v-model="form.mdLoadAttnTel"
|
|
|
+ placeholder="请输入装卸货联系电话"
|
|
|
+ :disabled="disabled"
|
|
|
+ v-input-limit="0"
|
|
|
+ size="mini"
|
|
|
+ style="width: 180px"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="卸车地点" prop="unLoadAddr">
|
|
@@ -540,7 +607,7 @@
|
|
|
<el-select
|
|
|
v-model="scope.row.cntrId"
|
|
|
placeholder="请选择箱型"
|
|
|
- :disabled="scope.row.billStatus >= 6"
|
|
|
+ :disabled="scope.row.disabled"
|
|
|
@change="checkPid(scope.row)"
|
|
|
>
|
|
|
<el-option
|
|
@@ -562,7 +629,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.carcorPid"
|
|
|
placeholder="车队名称"
|
|
|
- :disabled="scope.row.billStatus >= 6"
|
|
|
+ :disabled="scope.row.disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -571,14 +638,13 @@
|
|
|
label="调度安排货量"
|
|
|
align="center"
|
|
|
prop="cntrQty"
|
|
|
- :disabled="disabled"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.cntrQty"
|
|
|
placeholder="调度安排货量"
|
|
|
v-input-limit="2"
|
|
|
- :disabled="scope.row.billStatus >= 6"
|
|
|
+ :disabled="scope.row.disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -600,7 +666,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.remarks"
|
|
|
placeholder="备注"
|
|
|
- :disabled="scope.row.billStatus >= 6"
|
|
|
+ :disabled="scope.row.disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -619,7 +685,7 @@
|
|
|
@click.native.prevent="
|
|
|
delplansRow(scope.$index, schedulingList, scope.row)
|
|
|
"
|
|
|
- :disabled="scope.row.billStatus >= 6"
|
|
|
+ :disabled="scope.row.disabled"
|
|
|
>删除</el-button
|
|
|
>
|
|
|
<el-button
|
|
@@ -627,7 +693,7 @@
|
|
|
type="text"
|
|
|
icon="el-icon-document-checked"
|
|
|
@click.native.prevent="addplansRow(scope.row)"
|
|
|
- :disabled="scope.row.billStatus >= 6"
|
|
|
+ :disabled="scope.row.disabled"
|
|
|
>提交</el-button
|
|
|
>
|
|
|
<el-button
|
|
@@ -637,7 +703,7 @@
|
|
|
@click.native.prevent="
|
|
|
revokeplansRow(scope.$index, schedulingList, scope.row)
|
|
|
"
|
|
|
- :disabled="disabled"
|
|
|
+ :disabled="true"
|
|
|
>撤销</el-button
|
|
|
>
|
|
|
<el-button
|
|
@@ -682,10 +748,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-table :data="DList">
|
|
|
- <el-table-column label="结算单位" align="center" prop="fcorpid">
|
|
|
+ <el-table-column label="结算单位" align="center" prop="fCorpid">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
- v-model="scope.row.fcorpid"
|
|
|
+ v-model="scope.row.fCorpid"
|
|
|
placeholder="结算单位"
|
|
|
:clearable="true"
|
|
|
filterable
|
|
@@ -701,10 +767,10 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column label="费用名称" align="center" prop="ffeeid">
|
|
|
+ <el-table-column label="费用名称" align="center" prop="fFeeid">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
- v-model="scope.row.ffeeid"
|
|
|
+ v-model="scope.row.fFeeid"
|
|
|
placeholder="费用名称"
|
|
|
clearable
|
|
|
filterable
|
|
@@ -722,11 +788,11 @@
|
|
|
<el-table-column
|
|
|
label="计费单位"
|
|
|
align="center"
|
|
|
- prop="ffeeunitid"
|
|
|
+ prop="fFeeunitid"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
- v-model="scope.row.ffeeunitid"
|
|
|
+ v-model="scope.row.fFeeunitid"
|
|
|
placeholder="计费单位"
|
|
|
:disabled="disabled"
|
|
|
>
|
|
@@ -739,69 +805,69 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="计费数量" align="center" prop="fqty">
|
|
|
+ <el-table-column label="计费数量" align="center" prop="fQty">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fqty"
|
|
|
+ v-model="scope.row.fQty"
|
|
|
placeholder="计费数量"
|
|
|
v-input-limit="0"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="单价" align="center" prop="funitprice">
|
|
|
+ <el-table-column label="单价" align="center" prop="fUnitprice">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.funitprice"
|
|
|
+ v-model="scope.row.fUnitprice"
|
|
|
placeholder="单价"
|
|
|
v-input-limit="2"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="币种" align="center" prop="fcurrency">
|
|
|
+ <el-table-column label="币种" align="center" prop="fCurrency">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fcurrency"
|
|
|
+ v-model="scope.row.fCurrency"
|
|
|
placeholder="RMB"
|
|
|
- :disabled="disabled"
|
|
|
+ :disabled="true"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="税率" align="center" prop="ftaxrate">
|
|
|
+ <el-table-column label="税率" align="center" prop="fTaxrate">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.ftaxrate"
|
|
|
+ v-model="scope.row.fTaxrate"
|
|
|
placeholder="税率"
|
|
|
v-input-limit="2"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="金额" align="center" prop="famount">
|
|
|
+ <el-table-column label="金额" align="center" prop="fAmount">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.famount"
|
|
|
+ v-model="scope.row.fAmount"
|
|
|
placeholder="金额"
|
|
|
v-input-limit="2"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="汇率" align="center" prop="fexrate">
|
|
|
+ <el-table-column label="汇率" align="center" prop="fExrate">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fexrate"
|
|
|
+ v-model="scope.row.fExrate"
|
|
|
placeholder="汇率"
|
|
|
v-input-limit="2"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="备注" align="center" prop="remark">
|
|
|
+ <el-table-column label="备注" align="center" prop="remarks">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.remark"
|
|
|
+ v-model="scope.row.remarks"
|
|
|
placeholder="备注"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
@@ -857,10 +923,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-table :data="CList">
|
|
|
- <el-table-column label="结算单位" align="center" prop="fcorpid">
|
|
|
+ <el-table-column label="结算单位" align="center" prop="fCorpid">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
- v-model="scope.row.fcorpid"
|
|
|
+ v-model="scope.row.fCorpid"
|
|
|
placeholder="结算单位"
|
|
|
:clearable="true"
|
|
|
filterable
|
|
@@ -876,10 +942,10 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column label="费用名称" align="center" prop="ffeeid">
|
|
|
+ <el-table-column label="费用名称" align="center" prop="fFeeid">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
- v-model="scope.row.ffeeid"
|
|
|
+ v-model="scope.row.fFeeid"
|
|
|
placeholder="费用名称"
|
|
|
clearable
|
|
|
filterable
|
|
@@ -897,11 +963,11 @@
|
|
|
<el-table-column
|
|
|
label="计费单位"
|
|
|
align="center"
|
|
|
- prop="ffeeunitid"
|
|
|
+ prop="fFeeunitid"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
- v-model="scope.row.ffeeunitid"
|
|
|
+ v-model="scope.row.fFeeunitid"
|
|
|
placeholder="计费单位"
|
|
|
:disabled="disabled"
|
|
|
>
|
|
@@ -914,69 +980,69 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="计费数量" align="center" prop="fqty">
|
|
|
+ <el-table-column label="计费数量" align="center" prop="fQty">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fqty"
|
|
|
+ v-model="scope.row.fQty"
|
|
|
placeholder="计费数量"
|
|
|
v-input-limit="0"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="单价" align="center" prop="funitprice">
|
|
|
+ <el-table-column label="单价" align="center" prop="fUnitprice">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.funitprice"
|
|
|
+ v-model="scope.row.fUnitprice"
|
|
|
placeholder="单价"
|
|
|
v-input-limit="2"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="币种" align="center" prop="fcurrency">
|
|
|
+ <el-table-column label="币种" align="center" prop="fCurrency">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fcurrency"
|
|
|
+ v-model="scope.row.fCurrency"
|
|
|
placeholder="RMB"
|
|
|
- :disabled="disabled"
|
|
|
+ :disabled="true"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="税率" align="center" prop="ftaxrate">
|
|
|
+ <el-table-column label="税率" align="center" prop="fTaxrate">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.ftaxrate"
|
|
|
+ v-model="scope.row.fTaxrate"
|
|
|
placeholder="税率"
|
|
|
v-input-limit="2"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="金额" align="center" prop="famount">
|
|
|
+ <el-table-column label="金额" align="center" prop="fAmount">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.famount"
|
|
|
+ v-model="scope.row.fAmount"
|
|
|
placeholder="金额"
|
|
|
v-input-limit="2"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="汇率" align="center" prop="fexrate">
|
|
|
+ <el-table-column label="汇率" align="center" prop="fExrate">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fexrate"
|
|
|
+ v-model="scope.row.fExrate"
|
|
|
placeholder="汇率"
|
|
|
v-input-limit="2"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="备注" align="center" prop="remark">
|
|
|
+ <el-table-column label="备注" align="center" prop="remarks">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.remark"
|
|
|
+ v-model="scope.row.remarks"
|
|
|
placeholder="备注"
|
|
|
:disabled="disabled"
|
|
|
/>
|
|
@@ -994,7 +1060,7 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
- @click.native.prevent="deleteRow(scope.$index, CList)"
|
|
|
+ @click.native.prevent="deleteRow(scope.$index, DList)"
|
|
|
:disabled="disabled"
|
|
|
>删除</el-button
|
|
|
>
|
|
@@ -1128,11 +1194,11 @@
|
|
|
</el-form>
|
|
|
</span>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="submitForm" :disabled="disabled2"
|
|
|
+ <el-button type="primary" @click="submitForm" :disabled="disabled"
|
|
|
>提交</el-button
|
|
|
>
|
|
|
<el-button type="success" @click="submitAllowChanges">修改</el-button>
|
|
|
- <el-button type="info" @click="submitSave" :disabled="disabled2"
|
|
|
+ <el-button type="info" @click="submitSave" :disabled="disabled"
|
|
|
>保 存</el-button
|
|
|
>
|
|
|
<el-button
|
|
@@ -1392,7 +1458,7 @@ export default {
|
|
|
if (valid) {
|
|
|
let arr = this.schedulingList.filter((e) => e.billStatus == 6);
|
|
|
if (this.schedulingList.length == arr.length) {
|
|
|
- this.form["billStatus"] = "80";
|
|
|
+ this.form["billStatus"] = "6";
|
|
|
this.DList.map((e) => {
|
|
|
return (e.fDc = "D");
|
|
|
});
|
|
@@ -1424,7 +1490,7 @@ export default {
|
|
|
},
|
|
|
//保存
|
|
|
submitSave() {
|
|
|
- this.form["billStatus"] = "50";
|
|
|
+ this.form["billStatus"] = "2";
|
|
|
this.DList.map((e) => {
|
|
|
return (e.fDc = "D");
|
|
|
});
|
|
@@ -1439,9 +1505,10 @@ export default {
|
|
|
formData.append("plans", JSON.stringify(this.schedulingList));
|
|
|
saveFtmsorderbillsplans(formData).then((response) => {
|
|
|
if (response.code == 200) {
|
|
|
+ console.log(response);
|
|
|
this.msgSuccess("保存成功");
|
|
|
this.$parent.getList();
|
|
|
- this.$parent.getSave(response);
|
|
|
+ // this.$parent.getSave(response);
|
|
|
}
|
|
|
});
|
|
|
},
|
|
@@ -1530,7 +1597,7 @@ export default {
|
|
|
},
|
|
|
//单条订单调度提交
|
|
|
addplansRow(row) {
|
|
|
- if (row.billStatus == 70) {
|
|
|
+ if (row.billStatus == 5) {
|
|
|
let formData = new window.FormData();
|
|
|
formData.append("tmsorder", JSON.stringify(this.form));
|
|
|
formData.append("plans", JSON.stringify(row));
|
|
@@ -1581,12 +1648,20 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
changeplansRow(row) {
|
|
|
- changeFtmsorderbillsplans(row).then((response) => {
|
|
|
- if (response.code == 200) {
|
|
|
- this.msgSuccess("允许变更");
|
|
|
- this.$set(row, "billStatus", response.data.billStatus);
|
|
|
- }
|
|
|
- });
|
|
|
+ if (billStatus != 5) {
|
|
|
+ this.msgSuccess("允许变更");
|
|
|
+ this.$set(row, "billStatus", 5);
|
|
|
+ this.$set(row, "disabled", false);
|
|
|
+ } else {
|
|
|
+ this.msgSuccess("请勿重复变更");
|
|
|
+ }
|
|
|
+
|
|
|
+ // changeFtmsorderbillsplans(row).then((response) => {
|
|
|
+ // if (response.code == 200) {
|
|
|
+ // this.msgSuccess("允许变更");
|
|
|
+ // this.$set(row, "billStatus", response.data.billStatus);
|
|
|
+ // }
|
|
|
+ // });
|
|
|
},
|
|
|
},
|
|
|
watch: {
|