|
@@ -383,18 +383,6 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="接单备注" prop="acceptRemarks">
|
|
|
- <el-input
|
|
|
- v-model="form.acceptRemarks"
|
|
|
- placeholder="请输入接单备注"
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- :disabled="disabled"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="提箱时间" prop="loadDate">
|
|
@@ -412,17 +400,6 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="提箱备注" prop="loadRemarks">
|
|
|
- <el-input
|
|
|
- v-model="form.loadRemarks"
|
|
|
- placeholder="请输入提箱备注"
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- :disabled="disabled"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
<el-form-item label="装卸货时间" prop="mdLoadDate">
|
|
|
<el-date-picker
|
|
|
clearable
|
|
@@ -437,35 +414,7 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="装卸货备注" prop="mdLoadRemarks">
|
|
|
- <el-input
|
|
|
- v-model="form.mdLoadRemarks"
|
|
|
- placeholder="请输入装卸货备注"
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- :disabled="disabled"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <!-- <el-col :span="6">
|
|
|
- <el-form-item label="还柜时间" prop="unLoadDate">
|
|
|
- <el-date-picker
|
|
|
- clearable
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- v-model="form.unLoadDate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择还柜时间"
|
|
|
- :disabled="true"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- </el-col> -->
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="还卸柜时间" prop="unLoadDate">
|
|
|
<el-date-picker
|
|
|
clearable
|
|
@@ -481,17 +430,6 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="还卸柜备注" prop="unLoadRemarks">
|
|
|
- <el-input
|
|
|
- v-model="form.unLoadRemarks"
|
|
|
- placeholder="请输入还卸柜备注"
|
|
|
- size="mini"
|
|
|
- style="width: 180px"
|
|
|
- :disabled="disabled"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
<el-form-item label="回单时间" prop="waybillDate">
|
|
|
<el-date-picker
|
|
|
clearable
|
|
@@ -507,10 +445,10 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="回单备注" prop="waybillRemarks">
|
|
|
+ <el-form-item label="备注" prop="acceptRemarks">
|
|
|
<el-input
|
|
|
- v-model="form.waybillRemarks"
|
|
|
- placeholder="请输入回单备注"
|
|
|
+ v-model="form.acceptRemarks"
|
|
|
+ placeholder="请输入备注"
|
|
|
size="mini"
|
|
|
style="width: 180px"
|
|
|
:disabled="disabled"
|
|
@@ -518,6 +456,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ </el-row>
|
|
|
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
@@ -557,7 +496,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="备注" prop="costRemarks">
|
|
|
+ <el-form-item label="花销备注" prop="costRemarks">
|
|
|
<el-input
|
|
|
v-model="form.costRemarks"
|
|
|
placeholder="请输入备注"
|
|
@@ -606,7 +545,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="费用备注" prop="costomStr02">
|
|
|
+ <el-form-item label="垫付备注" prop="costomStr02">
|
|
|
<el-input
|
|
|
v-model="form.costomStr02"
|
|
|
placeholder="请输入备注"
|
|
@@ -655,7 +594,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="费用备注" prop="costomStr01">
|
|
|
+ <el-form-item label="垫付备注" prop="costomStr01">
|
|
|
<el-input
|
|
|
v-model="form.costomStr01"
|
|
|
placeholder="请输入备注"
|
|
@@ -668,7 +607,7 @@
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<el-collapse v-model="collapses">
|
|
|
- <el-collapse-item v-if="userType == '00'">
|
|
|
+ <!-- <el-collapse-item v-if="userType == '00'">
|
|
|
<template slot="title">
|
|
|
<i class="header-icon el-icon-circle-plus" style="font-size: 16px"
|
|
|
><span
|
|
@@ -1023,7 +962,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
- </el-collapse-item>
|
|
|
+ </el-collapse-item> -->
|
|
|
<el-collapse-item>
|
|
|
<template slot="title">
|
|
|
<i class="header-icon el-icon-circle-plus" style="font-size: 16px"
|
|
@@ -1093,19 +1032,17 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="opdata"
|
|
|
+ prop="createTime"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="上传时间"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
- v-model="scope.row.opdata"
|
|
|
+ v-model="scope.row.createTime"
|
|
|
type="date"
|
|
|
disabled
|
|
|
placeholder="上传时间"
|
|
|
- format="yyyy-MM-dd HH:mm"
|
|
|
- value-format="timestamp"
|
|
|
></el-date-picker>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -1343,7 +1280,7 @@ export default {
|
|
|
attachUrl: null,
|
|
|
attachName: null,
|
|
|
createBy: this.username,
|
|
|
- opdata: Date.parse(new Date()),
|
|
|
+ createTime: Date.parse(new Date()),
|
|
|
});
|
|
|
},
|
|
|
//附件删除
|