|
|
@@ -277,7 +277,7 @@
|
|
|
<el-table-column label="司机名称" align="center" prop="fDriverName" />
|
|
|
<el-table-column label="司机电话" align="center" prop="fDriverTel" width="120"/>
|
|
|
<el-table-column label="司机身份证" align="center" prop="fDriverIdCar" width="180"/>
|
|
|
- <el-table-column label="业务类别" align="center" prop="fBusinessType" />
|
|
|
+ <el-table-column label="业务类别" align="center" prop="fBusinessType" :formatter="fBusinessTypeFormat"/>
|
|
|
<el-table-column
|
|
|
width="100"
|
|
|
label="入库状态"
|
|
|
@@ -549,7 +549,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
|
- label="车号"
|
|
|
+ label="车号" prop="fTruckno"
|
|
|
:rules="{
|
|
|
required: isrequired_s=== 1 ? true : false,
|
|
|
message: '请选择',
|
|
|
@@ -567,7 +567,7 @@
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
|
- label="司机姓名"
|
|
|
+ label="司机姓名" prop="fDriverName"
|
|
|
:rules="{
|
|
|
required: isrequired_s === 1 ? true : false,
|
|
|
message: '请选择',
|
|
|
@@ -582,7 +582,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="司机身份证"
|
|
|
+ <el-form-item label="司机身份证" prop="fDriverIdCar"
|
|
|
:rules="{
|
|
|
required: isrequired_s === 1 ? true : false,
|
|
|
message: '请选择',
|
|
|
@@ -599,6 +599,7 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
|
label="司机电话"
|
|
|
+ prop="fDriverTel"
|
|
|
:rules="{
|
|
|
required: isrequired_s === 1 ? true : false,
|
|
|
message: '请选择',
|
|
|
@@ -620,7 +621,7 @@
|
|
|
style="width: 80%"
|
|
|
v-model="form.fBusinessType"
|
|
|
filterable
|
|
|
- @change="Educationchange"
|
|
|
+ @change="educationChange"
|
|
|
:disabled="contrOl"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -663,27 +664,22 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-col :span="16">
|
|
|
+ <el-col :span="15">
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input
|
|
|
style="width: 100%"
|
|
|
v-model="form.remark"
|
|
|
-
|
|
|
+ type="textarea"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="请输入内容"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-button
|
|
|
- style="margin-left: 120px"
|
|
|
- size="small"
|
|
|
- @click="
|
|
|
- detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
|
|
|
- "
|
|
|
- >{{ detailsHidden ? '隐藏' : '展开' }}
|
|
|
- </el-button
|
|
|
- >
|
|
|
+ <el-form-item>
|
|
|
+ <el-button @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">{{ detailsHidden ? '隐藏' : '展开' }}
|
|
|
+ </el-button>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -929,7 +925,7 @@
|
|
|
|
|
|
|
|
|
<el-collapse v-model="activeNames">
|
|
|
- <el-collapse-item name="1" class="itemTitle minHeight">
|
|
|
+ <el-collapse-item name="1">
|
|
|
<template slot="title">
|
|
|
<i class="el-icon-s-home"></i>入库明细
|
|
|
</template>
|
|
|
@@ -1748,6 +1744,24 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fStltypeid"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="130px"
|
|
|
+ label="结算方式"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select v-model="scope.row.fStltypeid" style="width: 250px" placeholder="请选择结算表票结、月结">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in fStltypeidOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="parseInt(dict.dictValue)"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="fCurrency"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -2051,6 +2065,24 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fStltypeid"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="130px"
|
|
|
+ label="结算方式"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select v-model="scope.row.fStltypeid" style="width: 250px" placeholder="请选择结算表票结、月结">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in fStltypeidOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="parseInt(dict.dictValue)"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="fCurrency"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -2997,6 +3029,8 @@ export default {
|
|
|
fBilltypeOptions: [],
|
|
|
// 状态(数据字典),N 入字典
|
|
|
fBillstatusOptions: [],
|
|
|
+ //结算方式对应字典表
|
|
|
+ fStltypeidOptions:[],
|
|
|
// 费用名称
|
|
|
fWbuOptions: [],
|
|
|
// 计价单位
|
|
|
@@ -3153,6 +3187,9 @@ export default {
|
|
|
this.getDicts("st_in_type").then((response) => {
|
|
|
this.businessTypeOption = response.data;
|
|
|
});
|
|
|
+ this.getDicts("data_stltype_type").then(response => {
|
|
|
+ this.fStltypeidOptions = response.data;
|
|
|
+ });
|
|
|
},
|
|
|
activated() {
|
|
|
this.adoPt()
|
|
|
@@ -3813,6 +3850,10 @@ export default {
|
|
|
this.warehousingagreements = false;
|
|
|
}
|
|
|
},
|
|
|
+ // 作业类型(数据字典),对应st_in_type 字典翻译
|
|
|
+ fBusinessTypeFormat(row,column){
|
|
|
+ return this.selectDictLabel(this.businessTypeOption, row.fBusinessType);
|
|
|
+ },
|
|
|
// 贸易方式(数据字典),对���t_trademodels 字典翻译
|
|
|
fTrademodeidFormat(row, column) {
|
|
|
return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
|
|
|
@@ -4496,17 +4537,20 @@ export default {
|
|
|
this.$set(this.form, 'fProductName', Array.from(new Set(fGoodsid)).join(","))
|
|
|
},
|
|
|
//作业类型校验
|
|
|
- Educationchange() {
|
|
|
+ educationChange() {
|
|
|
console.log(this.form.fBusinessType)
|
|
|
- if (this.form.fBusinessType === 1 || this.form.fBusinessType === 2) {
|
|
|
+ if (this.form.fBusinessType === '1' || this.form.fBusinessType === '2') {
|
|
|
console.log("111")
|
|
|
console.log("走这")
|
|
|
this.isrequired = 1
|
|
|
- }else if(this.form.fBusinessType === 3 || this.form.fBusinessType === 4){
|
|
|
+ this.isrequired_s = 2
|
|
|
+ }else if(this.form.fBusinessType === '3' || this.form.fBusinessType === '4'){
|
|
|
console.log("333")
|
|
|
this.isrequired_s = 1
|
|
|
+ this.isrequired = 2
|
|
|
}else{
|
|
|
this.isrequired = 2
|
|
|
+ this.isrequired_s = 2
|
|
|
}
|
|
|
},
|
|
|
// 提交保存保存成功
|
wengyuwen