|
|
@@ -11,7 +11,7 @@
|
|
|
<el-input
|
|
|
v-model="queryParams.fBillno"
|
|
|
placeholder="请输入业务编号"
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 200px"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
@@ -23,7 +23,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
clearable
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 200px"
|
|
|
:remote-method="userRemoteMethod"
|
|
|
placeholder="请选择制单人"
|
|
|
>
|
|
|
@@ -35,26 +35,12 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="出库日期" prop="timeInterval">
|
|
|
- <el-date-picker
|
|
|
- v-model="queryParams.timeInterval"
|
|
|
- type="daterange"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- clearable
|
|
|
- style="width: 60%"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="贸易方式" prop="fTrademodeid">
|
|
|
<el-select
|
|
|
v-model="queryParams.fTrademodeid"
|
|
|
placeholder="请选择贸易方式"
|
|
|
clearable
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -71,7 +57,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
clearable
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
placeholder="请选择货权方"
|
|
|
@@ -89,7 +75,7 @@
|
|
|
v-model="queryParams.fMblno"
|
|
|
placeholder="请输入提单号"
|
|
|
clearable
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 200px"
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
@@ -102,7 +88,7 @@
|
|
|
clearable
|
|
|
:remote-method="fSbuRemoteMethod"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 200px"
|
|
|
placeholder="请选择经营单位"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -119,6 +105,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
clearable
|
|
|
+ style="width: 200px"
|
|
|
:remote-method="goodsRemoteMethod"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
placeholder="请选择货物名称"
|
|
|
@@ -138,7 +125,7 @@
|
|
|
remote
|
|
|
@select="treeseLect"
|
|
|
:disabled="browseStatus || formBrowseStatus"
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
placeholder="请选择"
|
|
|
>
|
|
|
@@ -156,10 +143,38 @@
|
|
|
placeholder="请输入品牌"
|
|
|
clearable
|
|
|
size="small"
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="费用状态" prop="fBillstatus">
|
|
|
+ <el-select
|
|
|
+ style="width:200px"
|
|
|
+ v-model="queryParams.fBillstatus"
|
|
|
+ placeholder="请输入费用状态"
|
|
|
+ >
|
|
|
+ <el-option label="录入" value="1"></el-option>
|
|
|
+ <el-option label="暂存" value="2"></el-option>
|
|
|
+ <el-option label="驳回" value="3"></el-option>
|
|
|
+ <el-option label="请核" value="4"></el-option>
|
|
|
+ <el-option label="审核中" value="5"></el-option>
|
|
|
+ <el-option label="全部入账" value="6"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="出库日期" prop="timeInterval">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="queryParams.timeInterval"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ clearable
|
|
|
+ style="width: 240px"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
type="cyan"
|
|
|
@@ -252,8 +267,8 @@
|
|
|
<el-table-column label="仓库" align="center" prop="fWarehouseid" />
|
|
|
<el-table-column label="计划件数" align="center" prop="fPlanqty" />
|
|
|
<el-table-column label="出库件数" align="center" prop="fQty" />
|
|
|
- <el-table-column label="出库毛重(kg)" align="center" prop="fGrossweight" />
|
|
|
- <el-table-column label="出库净重(kg)" align="center" prop="fNetweight" />
|
|
|
+ <el-table-column label="出库毛重(kg)" align="center" prop="fGrossweight" width="100"/>
|
|
|
+ <el-table-column label="出库净重(kg)" align="center" prop="fNetweight" width="100"/>
|
|
|
<el-table-column label="车号" align="center" prop="fTruckno" width="100"/>
|
|
|
<el-table-column label="司机" align="center" prop="fDriverName" />
|
|
|
<el-table-column label="司机电话" align="center" prop="fDriverTel" width="120" show-overflow-tooltip/>
|
|
|
@@ -424,7 +439,32 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="业务时间" prop="fBsdate">
|
|
|
+ <el-time-picker
|
|
|
+ style="width: 80%"
|
|
|
+ v-model="form.fBsdate"
|
|
|
+ :picker-options="{
|
|
|
+ selectableRange: '00:00:01 - 23:59:59'
|
|
|
+ }"
|
|
|
+ placeholder="任意时间点">
|
|
|
+ </el-time-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="车辆类型" prop="fBsdate">
|
|
|
+ <el-select style="width: 80%" v-model="form.fCartype">
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fCartypeOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="仓管员" prop="fStorekeeper">
|
|
|
<el-select
|
|
|
@@ -451,6 +491,7 @@
|
|
|
v-model="form.fWarehouseid"
|
|
|
filterable
|
|
|
remote
|
|
|
+ @change="warwhouseTel"
|
|
|
:disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
@@ -465,8 +506,25 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="计费单位" prop="fFeetunit">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fFeetunit"
|
|
|
+ placeholder="请选择计费单位"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in jFeetunitOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="计划件数">
|
|
|
@@ -506,83 +564,6 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
-
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="车号" prop="fTruckno" :rules="{
|
|
|
- required: isrequired_s === 1 ? true : false,
|
|
|
- message: '请选择',
|
|
|
- trigger: ['blur', 'change']
|
|
|
- }">
|
|
|
- <el-input
|
|
|
- v-model="form.fTruckno"
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
- style="width: 80%"
|
|
|
- placeholder="请输货车车号"
|
|
|
- @change="changeInformation(whgenlegList)"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="司机" prop="fDriverName" :rules="{
|
|
|
- required: isrequired_s === 1 ? true : false,
|
|
|
- message: '请选择',
|
|
|
- trigger: ['blur', 'change']
|
|
|
- }">
|
|
|
- <el-input
|
|
|
- v-model="form.fDriverName"
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
- style="width: 80%"
|
|
|
- placeholder="请输司机姓名"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="司机电话" prop="fDriverTel" :rules="{
|
|
|
- required: isrequired_s === 1 ? true : false,
|
|
|
- message: '请选择',
|
|
|
- trigger: ['blur', 'change']
|
|
|
- }">
|
|
|
- <el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d]/g,"")'
|
|
|
- v-model="form.fDriverTel"
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
- style="width: 80%"
|
|
|
- placeholder="请输司机电话"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="司机身份证" prop="fDriverIdCar" :rules="{
|
|
|
- required: isrequired_s === 1 ? true : false,
|
|
|
- message: '请选择',
|
|
|
- trigger: ['blur', 'change']
|
|
|
- }">
|
|
|
- <el-input
|
|
|
- v-model="form.fDriverIdCar"
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
- style="width: 80%"
|
|
|
- placeholder="请输司机身份证"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="计费单位" prop="fFeetunit">
|
|
|
- <el-select
|
|
|
- v-model="form.fFeetunit"
|
|
|
- placeholder="请选择计费单位"
|
|
|
- :disabled="browseStatus || formBrowseStatus"
|
|
|
- clearable
|
|
|
- style="width: 80%"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in jFeetunitOptions"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="作业类型" prop="fBusinessType">
|
|
|
<el-select
|
|
|
@@ -655,7 +636,69 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-col :span="15">
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="车号" prop="fTruckno" :rules="{
|
|
|
+ required: isrequired_s === 1 ? true : false,
|
|
|
+ message: '请选择',
|
|
|
+ trigger: ['blur', 'change']
|
|
|
+ }">
|
|
|
+ <el-input
|
|
|
+ v-model="form.fTruckno"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
+ style="width: 80%"
|
|
|
+ placeholder="请输货车车号"
|
|
|
+ @change="changeInformation(whgenlegList)"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="司机" prop="fDriverName" :rules="{
|
|
|
+ required: isrequired_s === 1 ? true : false,
|
|
|
+ message: '请选择',
|
|
|
+ trigger: ['blur', 'change']
|
|
|
+ }">
|
|
|
+ <el-input
|
|
|
+ v-model="form.fDriverName"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
+ style="width: 80%"
|
|
|
+ placeholder="请输司机姓名"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="司机电话" prop="fDriverTel" :rules="{
|
|
|
+ required: isrequired_s === 1 ? true : false,
|
|
|
+ message: '请选择',
|
|
|
+ trigger: ['blur', 'change']
|
|
|
+ }">
|
|
|
+ <el-input
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d]/g,"")'
|
|
|
+ v-model="form.fDriverTel"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
+ style="width: 80%"
|
|
|
+ placeholder="请输司机电话"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="司机身份证" prop="fDriverIdCar" :rules="{
|
|
|
+ required: isrequired_s === 1 ? true : false,
|
|
|
+ message: '请选择',
|
|
|
+ trigger: ['blur', 'change']
|
|
|
+ }">
|
|
|
+ <el-input
|
|
|
+ v-model="form.fDriverIdCar"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
+ style="width: 80%"
|
|
|
+ placeholder="请输司机身份证"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input
|
|
|
style="width: 100%"
|
|
|
@@ -685,7 +728,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="仓库电话" prop="ftel">
|
|
|
+ <el-form-item label="仓库电话" prop="fTel">
|
|
|
<el-input
|
|
|
v-model="form.fTel"
|
|
|
:disabled="browseStatus || formBrowseStatus"
|
|
|
@@ -2582,7 +2625,7 @@
|
|
|
width="1400"
|
|
|
colspan="6"
|
|
|
class="zzss"
|
|
|
- style="font-size: 28px; font-weight: bold; border: none"
|
|
|
+ style="font-size: 20px; font-weight: bold; border: none"
|
|
|
>
|
|
|
大木国际物流(青岛)有限公司作业单
|
|
|
</td>
|
|
|
@@ -2594,12 +2637,11 @@
|
|
|
class="zzss"
|
|
|
style="font-size: 28px; font-weight: bold"
|
|
|
>
|
|
|
-
|
|
|
</td>
|
|
|
<td
|
|
|
width="500"
|
|
|
colspan="2"
|
|
|
- style="padding-bottom: 0px; font-weight: bold; border: none"
|
|
|
+ style="padding-bottom: 0px; font-weight: bold;"
|
|
|
class="zzss"
|
|
|
>
|
|
|
出库日期：{{ fBsdate }}
|
|
|
@@ -2660,9 +2702,9 @@
|
|
|
<td>机械/人工：</td>
|
|
|
<td>{{ form.fContacts }}</td>
|
|
|
</tr>
|
|
|
- <tr>
|
|
|
- <td colspan="6" class="zzss"> </td>
|
|
|
- </tr>
|
|
|
+<!-- <tr>-->
|
|
|
+<!-- <td colspan="6" class="zzss"> </td>-->
|
|
|
+<!-- </tr>-->
|
|
|
<tr>
|
|
|
<td width="280" class="zzss"></td>
|
|
|
<td width="280" class="zzss"></td>
|
|
|
@@ -2870,6 +2912,8 @@ export default {
|
|
|
typeVal:{
|
|
|
dictLabel:null
|
|
|
},
|
|
|
+ //车辆类型字典表
|
|
|
+ fCartypeOptions:[],
|
|
|
// 仓库(仓库数据)
|
|
|
warehouseOptions: [],
|
|
|
// 库存明细入账数组
|
|
|
@@ -2967,6 +3011,7 @@ export default {
|
|
|
fTrademodeid: null,
|
|
|
fWarehouseid: null,
|
|
|
fBusinessType: null,
|
|
|
+ fCartype:''
|
|
|
},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
@@ -3191,6 +3236,9 @@ export default {
|
|
|
this.getDicts("st_out_type").then((response) => {
|
|
|
this.businessTypeOption = response.data;
|
|
|
});
|
|
|
+ this.getDicts("sys_car_type").then((response) => {
|
|
|
+ this.fCartypeOptions = response.data;
|
|
|
+ });
|
|
|
// this.getDicts("data_customer_category").then(response => {
|
|
|
// this.fCompanyOptIons = response.data;
|
|
|
// });
|
|
|
@@ -3413,7 +3461,7 @@ export default {
|
|
|
},
|
|
|
printSomething() {
|
|
|
// 此处的style即为打印时的样式
|
|
|
- const style = "@media print { .print-div{ border:1px solid #000;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
|
|
|
+ const style = "@media print { .print-div{ border:1px solid #000;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center;border:1px solid #000}}";
|
|
|
print({ printable: "print_area", type: "html",
|
|
|
style: style, // 亦可使用引入的外部css;
|
|
|
scanStyles: false,
|
|
|
@@ -3848,6 +3896,13 @@ export default {
|
|
|
this.$message.error('请输入司机电话')
|
|
|
return false
|
|
|
}
|
|
|
+ if (this.dataWithdrawList.length > 0 || this.dataListSelection.length > 0) {
|
|
|
+ for (let item in this.warehouseOptions) {
|
|
|
+ if (this.form.fWarehouseid == this.warehouseOptions[item].fId) {
|
|
|
+ this.fAddr = this.warehouseOptions[item].fAddr
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
// 获取业务日期
|
|
|
var date = new Date(this.form.fBsdate)
|
|
|
var Y = date.getFullYear() + '-'
|
|
|
@@ -3933,6 +3988,19 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ //仓库电话、仓库联系人带入
|
|
|
+ warwhouseTel(){
|
|
|
+ for(let item in this.warehouseOptions){
|
|
|
+ console.log(this.form.fWarehouseid)
|
|
|
+ console.log(this.warehouseOptions)
|
|
|
+ if(this.form.fWarehouseid == this.warehouseOptions[item].fId){
|
|
|
+
|
|
|
+ console.log(this.warehouseOptions[item].fTel)
|
|
|
+ this.form.fTel = this.warehouseOptions[item].fTel
|
|
|
+ this.form.fContacts = this.warehouseOptions[item].fContacts
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
addpayment() {
|
|
|
if(this.form.fBusinessType == null){
|
|
|
this.$message.error("请维护作业类型")
|
|
|
@@ -4132,6 +4200,7 @@ export default {
|
|
|
fGoodsid:null,
|
|
|
fWarehouseid:null,
|
|
|
fMarks:null,
|
|
|
+ fBillstatus:null
|
|
|
}
|
|
|
this.resetForm("queryForm");
|
|
|
this.handleQuery();
|
wengyuwen