|
|
@@ -3,10 +3,10 @@
|
|
|
<div style="display: flex; align-items: center">
|
|
|
<el-breadcrumb separator="/">
|
|
|
<el-breadcrumb-item
|
|
|
- ><span style="font-weight: 700">调拨</span></el-breadcrumb-item
|
|
|
+ ><span style="font-weight: 700">通关</span></el-breadcrumb-item
|
|
|
>
|
|
|
<el-breadcrumb-item
|
|
|
- ><span style="font-weight: 700">调拨详情页</span></el-breadcrumb-item
|
|
|
+ ><span style="font-weight: 700">通关详情页</span></el-breadcrumb-item
|
|
|
>
|
|
|
</el-breadcrumb>
|
|
|
<el-button
|
|
|
@@ -41,7 +41,11 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="结算方式" prop="fStltypeid">
|
|
|
+ <el-form-item
|
|
|
+ label="结算方式"
|
|
|
+ prop="fStltypeid"
|
|
|
+ v-if="dataShowcar == '0'"
|
|
|
+ >
|
|
|
<el-select
|
|
|
v-model="form.fStltypeid"
|
|
|
placeholder="请选择结算方式"
|
|
|
@@ -57,6 +61,31 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="作业类型"
|
|
|
+ prop="fBusinessType"
|
|
|
+ v-if="dataShowcar == '1'"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ style="width: 80%"
|
|
|
+ v-model="form.fBusinessType"
|
|
|
+ filterable
|
|
|
+ @change="educationChange"
|
|
|
+ :disabled="
|
|
|
+ contrOl ||
|
|
|
+ browseStatus ||
|
|
|
+ warehouseDrList.length > 0 ||
|
|
|
+ warehouseCrList.length > 0
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in businessTypeOption"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="提单号" prop="fMblno">
|
|
|
@@ -204,9 +233,13 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-row>
|
|
|
+ <el-row v-if="detailsHidden2">
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="作业类型" prop="fBusinessType">
|
|
|
+ <el-form-item
|
|
|
+ label="作业类型"
|
|
|
+ prop="fBusinessType"
|
|
|
+ v-if="dataShowcar == '0'"
|
|
|
+ >
|
|
|
<el-select
|
|
|
style="width: 80%"
|
|
|
v-model="form.fBusinessType"
|
|
|
@@ -227,6 +260,26 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="结算方式"
|
|
|
+ prop="fStltypeid"
|
|
|
+ v-if="dataShowcar == '1'"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ v-model="form.fStltypeid"
|
|
|
+ placeholder="请选择结算方式"
|
|
|
+ clearable
|
|
|
+ :disabled="browseStatus"
|
|
|
+ style="width: 80%"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in fStltypeOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="劳务公司" prop="fLabour">
|
|
|
@@ -275,7 +328,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-row>
|
|
|
+ <el-row v-if="detailsHidden2">
|
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
|
label="车号"
|
|
|
@@ -332,7 +385,7 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-col :span="8">
|
|
|
+ <el-col :span="8" v-if="detailsHidden2">
|
|
|
<el-form-item
|
|
|
label="司机身份证"
|
|
|
prop="fDriverIdCar"
|
|
|
@@ -467,10 +520,19 @@
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="2">
|
|
|
+ <el-col :span="8">
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
@click="
|
|
|
+ detailsHidden2
|
|
|
+ ? (detailsHidden2 = false)
|
|
|
+ : (detailsHidden2 = true)
|
|
|
+ "
|
|
|
+ v-if="this.dataShowcar == 1"
|
|
|
+ >{{ detailsHidden2 ? "隐藏" : "更多" }}
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ @click="
|
|
|
detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
|
|
|
"
|
|
|
>{{ detailsHidden ? "隐藏" : "展开" }}
|
|
|
@@ -934,6 +996,7 @@
|
|
|
v-model="scope.row.fLocalcntrno"
|
|
|
placeholder="库内箱号"
|
|
|
:disabled="browseStatus || scope.row.fBillstatus >= 40"
|
|
|
+ v-Alphabet
|
|
|
/>
|
|
|
</span>
|
|
|
<span v-else-if="item.label == 'fSealno'">
|
|
|
@@ -2727,6 +2790,7 @@ export default {
|
|
|
fbillingway: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fTocorpid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fFeetUnit: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
+ fNewTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
},
|
|
|
browseStatus: false,
|
|
|
goodsOptions: [],
|
|
|
@@ -3138,6 +3202,8 @@ export default {
|
|
|
allCheck2: false,
|
|
|
showSetting2: false,
|
|
|
unloadModes: [],
|
|
|
+ detailsHidden2: true,
|
|
|
+ dataShowcar: null,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -3174,6 +3240,13 @@ export default {
|
|
|
this.getDicts("data_ifdamage_status").then((response) => {
|
|
|
this.fIfdamageOptions = response.data;
|
|
|
});
|
|
|
+ this.getConfigKey("data_showcar").then((response) => {
|
|
|
+ this.dataShowcar = response.msg;
|
|
|
+ if (this.dataShowcar == "1") {
|
|
|
+ this.detailsHidden2 = false;
|
|
|
+ this.form.fBusinessType = "0";
|
|
|
+ }
|
|
|
+ });
|
|
|
listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
this.warehouseOptions = response.rows;
|
|
|
});
|
|
|
@@ -3246,6 +3319,9 @@ export default {
|
|
|
this.warehouseCrList = [];
|
|
|
this.warehouseDrList = [];
|
|
|
this.CntrTable = [];
|
|
|
+ if (this.dataShowcar == "1") {
|
|
|
+ this.detailsHidden2 = false;
|
|
|
+ }
|
|
|
this.getForm();
|
|
|
},
|
|
|
init2() {
|
|
|
@@ -3571,7 +3647,11 @@ export default {
|
|
|
changefStltype(row) {
|
|
|
this.fMblnoOptions.map((e) => {
|
|
|
if (row == e.fId) {
|
|
|
- this.$set(this.form, "fStltypeid", e.fStltypeid.toString());
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fStltypeid",
|
|
|
+ e.fStltypeid ? e.fStltypeid.toString() : null
|
|
|
+ );
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -3958,6 +4038,13 @@ export default {
|
|
|
this.form.fTrademodeid.toString()
|
|
|
);
|
|
|
}
|
|
|
+ if (this.form.fNewTrademodeid) {
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fNewTrademodeid",
|
|
|
+ this.form.fNewTrademodeid.toString()
|
|
|
+ );
|
|
|
+ }
|
|
|
treeselect(this.form.fWarehouseid).then((response) => {
|
|
|
this.fWarehouseidOptions = response.data;
|
|
|
});
|
|
|
@@ -4175,6 +4262,9 @@ export default {
|
|
|
this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
this.form.fGrossweight = this.fGrossweight;
|
|
|
}
|
|
|
+ if (this.form.fTrademodeid == this.form.fNewTrademodeid) {
|
|
|
+ return this.$message.error("原贸易方式不能与新贸易方式相同");
|
|
|
+ }
|
|
|
// 附件数据
|
|
|
this.form.fQty = this.fQty;
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
@@ -4291,6 +4381,13 @@ export default {
|
|
|
this.form.fTrademodeid.toString()
|
|
|
);
|
|
|
}
|
|
|
+ if (this.form.fNewTrademodeid) {
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fNewTrademodeid",
|
|
|
+ this.form.fNewTrademodeid.toString()
|
|
|
+ );
|
|
|
+ }
|
|
|
response.data.warehousebillsitems.map((e) => {
|
|
|
e.fBsdate = Date.parse(e.fBsdate);
|
|
|
e.fBusinessType = e.fBusinessType.toString();
|
qukaidi