|
|
@@ -149,15 +149,19 @@
|
|
|
</el-select>
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="车牌号" span="1" prop="carNo">
|
|
|
- <ws-input :disabled="disabled2" v-if="options2.length == 0 || serviceManagementType==3" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
|
|
|
+ <ws-input :disabled="disabled2" v-if="options2.length == 0&&serviceManagementType==1 || serviceManagementType==3&&carNumberList.length==0" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
|
|
|
size="small" />
|
|
|
- <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType!=3" filterable clearable v-model="deptBudgetList.carNoCopy" placeholder="请选择车牌号" class="typeselect" @change="carChange">
|
|
|
+ <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType!=3" filterable clearable v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange($event,0)">
|
|
|
<el-option v-for="(item,index) in options2" :key="index"
|
|
|
:label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
|
|
|
</el-select>
|
|
|
- <el-select :disabled="disabled2" v-if="!carstatus && options2.length > 0" filterable clearable :filter-method="dataFilter2"
|
|
|
- v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
|
|
|
+ <el-select :disabled="disabled2" v-if="!carstatus && options2.length > 0 && serviceManagementType!=3" filterable clearable :filter-method="dataFilter2"
|
|
|
+ v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange($event,0)">
|
|
|
<el-option v-for="item in options2" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
|
|
|
+ </el-select>
|
|
|
+ <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && serviceManagementType==3" filterable clearable :filter-method="dataFilter2"
|
|
|
+ v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange($event,1)">
|
|
|
+ <el-option v-for="item in carNumberList" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
|
|
|
</el-select>
|
|
|
<!-- <el-select @change='carchange' v-if="statusTypetext=='初检'&&editcar==false&&carstatus||statusTypetext=='确认'&&editcar==false&&carstatus" v-model="deptBudgetList.carNo" placeholder="请选择车牌号">
|
|
|
<el-option v-for="(item,index) in options2" :key="item.value" :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
|
|
|
@@ -313,6 +317,7 @@
|
|
|
getcustomer,
|
|
|
getDryGrainPrice,
|
|
|
getinspectLookGoods,
|
|
|
+ getshippinginfo
|
|
|
} from '@/model/houseSelfCollect/index'
|
|
|
import {
|
|
|
pullDown,
|
|
|
@@ -339,6 +344,8 @@
|
|
|
typeList: ['干粮', '潮粮'],
|
|
|
disablednotarize:false,
|
|
|
goodsdisabled:false,
|
|
|
+ customerName:'',
|
|
|
+ customerPhone:'',
|
|
|
deptBudgetList:{
|
|
|
type: '潮粮',
|
|
|
freight: 0,
|
|
|
@@ -423,6 +430,7 @@
|
|
|
directselling:false,
|
|
|
fleetNameList:[],
|
|
|
outContractNo:[],
|
|
|
+ carNumberList:[],
|
|
|
options1:[],
|
|
|
editcar:false,
|
|
|
isGetCost:'',
|
|
|
@@ -529,9 +537,13 @@
|
|
|
record(){
|
|
|
this.$router.push({path: 'inspectionManagementrecord' })
|
|
|
},
|
|
|
- carChange(e) {
|
|
|
- this.$set(this.deptBudgetList, 'customerName', this.carNumberList[e].shipperName)
|
|
|
- this.$set(this.deptBudgetList, 'customerPhone', this.carNumberList[e].shipperPhone)
|
|
|
+ carChange(e,status) {
|
|
|
+ console.log(status)
|
|
|
+ if(status==1){
|
|
|
+ this.$set(this.deptBudgetList, 'customerName', this.carNumberList[e].shipperName)
|
|
|
+ this.$set(this.deptBudgetList, 'customerPhone', this.carNumberList[e].shipperPhone)
|
|
|
+ }
|
|
|
+
|
|
|
for (let i = 0; i < this.customerList1.length; i++) {
|
|
|
if (this.customerList1[i].customerName == this.deptBudgetList.customerName) {
|
|
|
this.deptBudgetList.customerNumberCard = this.customerList1[i].customerNumberCard
|
|
|
@@ -1645,6 +1657,8 @@
|
|
|
// this.printData.qrCodeUrl = res
|
|
|
// })
|
|
|
this.deptBudgetList = response2
|
|
|
+ this.deptBudgetList.customerName=this.customerName
|
|
|
+ this.deptBudgetList.customerPhone=this.customerPhone
|
|
|
if (response.compName == '黑龙江秋收有限公司') {
|
|
|
this.deptBudgetList.compName = '黑龙江中天昊元贸易有限公司'
|
|
|
}
|
|
|
@@ -1751,6 +1765,7 @@
|
|
|
natureOfGrainPurchase: '贸易粮',
|
|
|
buckleMiscellaneous: 0,
|
|
|
paramType: 1,
|
|
|
+
|
|
|
warehouseInOutDetail: {
|
|
|
grade:'',
|
|
|
reGrade:'',
|
|
|
@@ -1953,6 +1968,8 @@
|
|
|
this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
|
|
|
this.deptBudgetList.grade = this.outContractNo[i].grade
|
|
|
if (this.outContractNo[i].inOutType == '采购入库') {
|
|
|
+ this.customerName=this.carNumberList[e].buyer
|
|
|
+ this.customerPhone=this.carNumberList[e].buyerPhone
|
|
|
this.deptBudgetList.qualityNo='CGRK'+this.getTime()+this.warehouseNo+this.warehouseCount
|
|
|
if (!this.outContractNo[i].unitContractPrice) {
|
|
|
this.deptBudgetList.tips = '卖方' + this.outContractNo[i].seller
|
|
|
@@ -1961,6 +1978,7 @@
|
|
|
}
|
|
|
this.deptBudgetList.inOutTypeKey = 1
|
|
|
} else if (this.outContractNo[i].inOutType == '移库入库') {
|
|
|
+ this.customerName=localStorage.getItem('ws-pf_compName')
|
|
|
this.deptBudgetList.qualityNo='YKRK'+this.getTime()+this.warehouseNo+this.warehouseCount
|
|
|
this.deptBudgetList.goodsName = data.goodsName
|
|
|
this.deptBudgetList.goodsNameKey = data.goodsNameKey
|
|
|
@@ -2110,6 +2128,13 @@
|
|
|
this.goodnameList = response
|
|
|
this.purchasePriceList = response
|
|
|
})
|
|
|
+ getshippinginfo({
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ warehouseName: this.warehouseName
|
|
|
+ }).toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.carNumberList = response
|
|
|
+ })
|
|
|
// 品级
|
|
|
pullDown({
|
|
|
constId: 'CON3',
|
zhongtianhaoyuan