|
|
@@ -2,28 +2,163 @@
|
|
|
<view>
|
|
|
<view @click='hidden' class='wrap'>
|
|
|
<view class='title_b'>基本信息</view>
|
|
|
+ <view class="c-row ">
|
|
|
+ <view class="title">类型</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <u-radio-group @change="groupChange" v-model="typevalue">
|
|
|
+ <u-radio key="1" label="贸易入库" name="1">贸易入库</u-radio>
|
|
|
+ <u-radio key="3" label="收购入库" name="3">收购入库</u-radio>
|
|
|
+ </u-radio-group>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<view class="c-row ">
|
|
|
<view class="title">仓库</view>
|
|
|
<view class="con-list">
|
|
|
{{gridList.warehouseName}}
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <view v-if='typevalue==1' class="c-row ">
|
|
|
+ <view class="title">任务编号</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <view @click='show4=true'>{{gridList.inOutTaskNo?gridList.inOutTaskNo:'请选择任务编号'}}</view>
|
|
|
+ <u-picker :range="taskNolist" range-key="inOutTaskNo" @confirm='tasknopicker($event)' v-model="show4"
|
|
|
+ mode="selector">
|
|
|
+ </u-picker>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==1&&gridList.inOutType!="移库入库"' class="c-row ">
|
|
|
+ <view class="title">合同编号</view>
|
|
|
+ <view class="con-list">
|
|
|
+ {{gridList.contractNo?gridList.contractNo:'自动获取，不可编辑'}}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==1&&gridList.inOutType=="移库入库"' class="c-row ">
|
|
|
+ <view class="title">移库编号</view>
|
|
|
+ <view class="con-list">
|
|
|
+ {{gridList.contractNo?gridList.contractNo:'自动获取，不可编辑'}}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<view class="c-row ">
|
|
|
- <view class="title">编号</view>
|
|
|
+ <view class="title">业务编号</view>
|
|
|
<view class="con-list">
|
|
|
{{gridList.qualityNo}}
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <view v-if='typevalue==1' style=' align-items: flex-start;' class="c-row ">
|
|
|
+ <view class="title">提示</view>
|
|
|
+ <view class="con-list">
|
|
|
+ {{gridList.tips?gridList.tips:'自动获取，不可编辑'}}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==1' class="c-row ">
|
|
|
+ <view class="title">成本</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <view v-if='!coststatus'>{{gridList.cost?gridList.cost:'自动获取，不可编辑'}}</view>
|
|
|
+ <view v-if='coststatus'>
|
|
|
+ <input v-model='gridList.cost' placeholder="请输入成本" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <button class='cu-btn bg-green shadow' @click="changecost">{{costtext}}</button>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==1' class="c-row ">
|
|
|
+ <view class="title">运费</view>
|
|
|
+ <view class="con-list flex">
|
|
|
+ <view v-if='!freightstatus'>{{gridList.freight?gridList.freight:'自动获取，不可编辑'}}</view>
|
|
|
+ <view v-if='freightstatus'>
|
|
|
+ <input v-model='gridList.freight' placeholder="请输入运费" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <button class='cu-btn bg-green shadow' @click="changefreight">{{freighttext}}</button>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==1' class="c-row ">
|
|
|
+ <view class="title">扣款</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.deductionAmount' placeholder="请输入扣款" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==1' class="c-row ">
|
|
|
+ <view class="title">入库类型</view>
|
|
|
+ <view class="con-list">
|
|
|
+ {{gridList.inOutType?gridList.inOutType:'自动获取，不可编辑'}}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==1' class="c-row ">
|
|
|
+ <view class="title">入库日期</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <view @click='show5=true'>{{gridList.inOutDate?gridList.inOutDate:'请选择入库日期'}}</view>
|
|
|
+ <u-picker @confirm='inOutDatepicker($event)' :params="params" v-model="show5"
|
|
|
+ mode="time">
|
|
|
+ </u-picker>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==1||typevalue==3&&gridList.outType=="自运"' class="c-row ">
|
|
|
+ <view class="title">车队</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <view @click='show6=true'>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
|
|
|
+ <u-picker @confirm='fleetpicker($event)' :range="fleetNameList" range-key="fleetName" v-model="show5"
|
|
|
+ mode="selector">
|
|
|
+ </u-picker>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==1' class="c-row ">
|
|
|
+ <view class="title">运输方式</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <view @click='show7=true'>{{gridList.outType?gridList.outType:'请选择运输方式'}}</view>
|
|
|
+ <u-picker :range="multiSelector" range-key="name" @confirm='outtypepicker($event,0)' v-model="show7"
|
|
|
+ mode="selector">
|
|
|
+ </u-picker>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if='typevalue==3' class="c-row ">
|
|
|
+ <view class="title">运输方式</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <view @click='show8=true'>{{outType?outType:'请选择运输方式'}}</view>
|
|
|
+ <u-picker :range="multiSelector1" range-key="name" @confirm='outtypepicker($event,1)' v-model="show8"
|
|
|
+ mode="selector">
|
|
|
+ </u-picker>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
|
|
|
+ <view class="title">箱号-1</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
|
|
|
+ <view class="title">封号-1</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
|
|
|
+ <view class="title">箱号-2</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
|
|
|
+ <view class="title">封号-2</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if="gridList.paramType != '1'" class="c-row ">
|
|
|
+ <view class="title">扣重比</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<view class="c-row ">
|
|
|
<view class="title">货名</view>
|
|
|
<view class="con-list">
|
|
|
- <view @click='show2=true'>{{gridList.goodsName}}</view>
|
|
|
+ <view v-if='goodsdisabled'>{{gridList.goodsName}}</view>
|
|
|
+ <view v-if='!goodsdisabled' @click='show2=true'>{{gridList.goodsName}}</view>
|
|
|
<u-picker :range="goodsList" range-key="goodsName" @confirm='goodspicker($event)' v-model="show2"
|
|
|
mode="selector">
|
|
|
</u-picker>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="c-row ">
|
|
|
+ <view v-if='typevalue==3' class="c-row ">
|
|
|
<view class="title">客户</view>
|
|
|
<view class="con-list">
|
|
|
<view @click='gocustomer' v-if='gridList.customerName'>
|
|
|
@@ -47,7 +182,7 @@
|
|
|
<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view v-else class="c-row ">
|
|
|
+ <!-- <view v-else class="c-row ">
|
|
|
<view class="title">扣杂</view>
|
|
|
<view class="con-list">
|
|
|
<input v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂" @input="waterContentChange"
|
|
|
@@ -55,8 +190,8 @@
|
|
|
<input v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂" @input="waterContentChange"
|
|
|
name="input" type="digit"></input>
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <view class="c-row ">
|
|
|
+ </view> -->
|
|
|
+ <view v-if='typevalue==3' class="c-row ">
|
|
|
<view class="title">购粮性质</view>
|
|
|
<view class="con-list">
|
|
|
<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质" name="input"></input>
|
|
|
@@ -90,10 +225,9 @@
|
|
|
<view class="title">净重单价（元/公斤）</view>
|
|
|
<view class="con-list">
|
|
|
<input v-model='gridList.tidalGrainPrice' :disabled='pricedisabled' @blur='inputprice' placeholder="自动获取，不可编辑" name="input"
|
|
|
- type="digit"></input>
|
|
|
+ type="digit"></input>
|
|
|
</view>
|
|
|
<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
|
|
|
-
|
|
|
</view>
|
|
|
<view v-if="gridList.type == '干粮'" class="c-row">
|
|
|
<view class="title">干粮单价（元/公斤）</view>
|
|
|
@@ -101,7 +235,30 @@
|
|
|
<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled' @blur='inputprice' placeholder="请输入干粮单价" name="input" type="digit"></input>
|
|
|
</view>
|
|
|
<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
|
|
|
-
|
|
|
+ </view>
|
|
|
+ <view v-if="typevalue==3" class="c-row">
|
|
|
+ <view class="title">箱号-1</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if="typevalue==3" class="c-row">
|
|
|
+ <view class="title">封号-1</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if="typevalue==3" class="c-row">
|
|
|
+ <view class="title">箱号-2</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-if="typevalue==3" class="c-row">
|
|
|
+ <view class="title">封号-2</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view style='padding-bottom:300rpx;'>
|
|
|
@@ -199,15 +356,31 @@
|
|
|
isShowAlert: false,
|
|
|
content: '确认初检信息后，初检员不需要再次确认质检信息，是否确定提交?',
|
|
|
inputShow: false,
|
|
|
+ params:{year: true,
|
|
|
+ month: true,
|
|
|
+ day: true,},
|
|
|
modalName: '',
|
|
|
+ pricetext:'锁定',
|
|
|
+ pricedisabled:false,
|
|
|
+ show8:false,
|
|
|
mycarStyle: '',
|
|
|
feild: undefined,
|
|
|
id: 0,
|
|
|
+ outType:'他运',
|
|
|
show: false,
|
|
|
+ show4:false,
|
|
|
+ show5:false,
|
|
|
+ show6:false,
|
|
|
+ show7:false,
|
|
|
edit: true,
|
|
|
+ goodsdisabled:false,
|
|
|
+ freighttext:'手动填写',
|
|
|
+ costtext:'手动填写',
|
|
|
selector: [],
|
|
|
show1: false,
|
|
|
inputContent: '',
|
|
|
+ multiSelector1:[{name:'他运',value:'他运'}],
|
|
|
+ typevalue:'3',
|
|
|
coverTransform: 'translateY(0px)',
|
|
|
coverTransition: '0s',
|
|
|
moving: false,
|
|
|
@@ -218,12 +391,13 @@
|
|
|
inputStatus: 'none',
|
|
|
carInfo: [],
|
|
|
gridCol: 4,
|
|
|
+ freightstatus:false,
|
|
|
+ coststatus:false,
|
|
|
pageSize: 10,
|
|
|
show3: false,
|
|
|
show2: false,
|
|
|
goodsList: [],
|
|
|
currentPage: 1,
|
|
|
- pricetext:'锁定',
|
|
|
value:false,
|
|
|
gridBorder: false,
|
|
|
headUrl: "../../static/img/myimg/YongHu@3x.png",
|
|
|
@@ -245,7 +419,58 @@
|
|
|
impurity:"",
|
|
|
mildewGrain:"",
|
|
|
compName:"",
|
|
|
-
|
|
|
+ type: '',
|
|
|
+ freight: 0,
|
|
|
+ cost: '',
|
|
|
+ addressUrl: '',
|
|
|
+ tidalGrainPrice: 0,
|
|
|
+ buckleWeightRatio: 0,
|
|
|
+ buckleMiscellaneous: 0,
|
|
|
+ paramType: 1,
|
|
|
+ warehouseInOutDetail: {
|
|
|
+ grade:'',
|
|
|
+ reGrade:'',
|
|
|
+ imperfectGrain:'',
|
|
|
+ reImperfectGrain:'',
|
|
|
+ impurity:'',
|
|
|
+ reImpurity:'',
|
|
|
+ jiaorenli:'',
|
|
|
+ reJiaorenli:'',
|
|
|
+ bulkDensity:'',
|
|
|
+ reBulkDensity:'',
|
|
|
+ mildewGrain:'',
|
|
|
+ reMildewGrain:'',
|
|
|
+ },
|
|
|
+ disablednotarize:false,
|
|
|
+ deductionAmount: 0,
|
|
|
+ deductionWeight: 0,
|
|
|
+ grossWeight: 0,
|
|
|
+ tare: 0,
|
|
|
+ grade:'',
|
|
|
+ inOutDate: new Date().toISOString().slice(0, 10),
|
|
|
+ netWeight:0,
|
|
|
+ pureWeight:0,
|
|
|
+ deductionWeight:0,
|
|
|
+ waterContent:'',
|
|
|
+ reWaterContent:'',
|
|
|
+ reGrade:'',
|
|
|
+ imperfectGrain:'',
|
|
|
+ reImperfectGrain:'',
|
|
|
+ impurity:'',
|
|
|
+ reImpurity:'',
|
|
|
+ jiaorenli:'',
|
|
|
+ reJiaorenli:'',
|
|
|
+ bulkDensity:'',
|
|
|
+ reBulkDensity:'',
|
|
|
+ reMemo:'',
|
|
|
+ storageTagNo:'',
|
|
|
+ mildewGrain:'',
|
|
|
+ reMildewGrain:'',
|
|
|
+ boxNo:'',
|
|
|
+ boxNoOther:'',
|
|
|
+ titleNo:'',
|
|
|
+ titleNoOther:'',
|
|
|
+ statusFlag:1
|
|
|
},
|
|
|
typeList: ['潮粮', '干粮'],
|
|
|
managementType: '',
|
|
|
@@ -253,11 +478,30 @@
|
|
|
warehouseList: [],
|
|
|
warehouseCount: '',
|
|
|
commonWarehouseNo: '',
|
|
|
+ tranCarInfoList:[],
|
|
|
+ warehouseTradeCount:0,
|
|
|
showTran: true,
|
|
|
companyId: 1,
|
|
|
- current: 4,
|
|
|
- pricedisabled:false,
|
|
|
-
|
|
|
+ contractNolist:[],
|
|
|
+ current: 4,taskNolist:[],
|
|
|
+ fleetNameList:[],
|
|
|
+ multiSelector: [{
|
|
|
+ name: '汽运',
|
|
|
+ value: '0',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '火运',
|
|
|
+ value: '1',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '集装箱船',
|
|
|
+ value: '2',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '散船',
|
|
|
+ value: '3',
|
|
|
+ },
|
|
|
+ ],
|
|
|
gradeList: [{
|
|
|
key: 1,
|
|
|
value: '一等品'
|
|
|
@@ -311,6 +555,7 @@
|
|
|
onLoad(options) {
|
|
|
this.commonWarehouseNo = options.commonWarehouseNo
|
|
|
this.warehouseCount = Number(options.warehouseCount) + 1
|
|
|
+ this.warehouseTradeCount = Number(options.warehouseTradeCount) + 1
|
|
|
let number = '000' + this.warehouseCount
|
|
|
number = number.substring(number.length - 4, number.length)
|
|
|
this.gridList.warehouseName = options.warehouseName
|
|
|
@@ -362,7 +607,7 @@
|
|
|
that.goodsList = res.data.data
|
|
|
if (that.goodsList.length > 0) {
|
|
|
that.gridList.goodsName = that.goodsList[0].goodsName
|
|
|
- this.setGoodName([0])
|
|
|
+ this.setGoodName([0],1)
|
|
|
uni.setStorageSync('purchasePriceList', that.goodsList)
|
|
|
that.purchasePriceList = uni.getStorageSync('purchasePriceList')
|
|
|
}
|
|
|
@@ -381,6 +626,39 @@
|
|
|
})
|
|
|
},
|
|
|
onShow(){
|
|
|
+ uni.showLoading({title: '加载中',mask:true})
|
|
|
+ this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
|
|
|
+ flag: 2,
|
|
|
+ warehouseName:this.gridList.warehouseName
|
|
|
+ }).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ this.taskNolist=res.data.data
|
|
|
+ })
|
|
|
+ this.multiSelector1=[]
|
|
|
+ this.$api.doRequest('get', '/inOutWarehouseTask/getContractNo', {
|
|
|
+ warehouseName:this.gridList.warehouseName
|
|
|
+ }).then(res => {
|
|
|
+ // console.log(res)
|
|
|
+ if(res.data.data.contractManagementInfoList){
|
|
|
+ for (let i = 0; i < res.data.data.contractManagementInfoList.length; i++) {
|
|
|
+ res.data.data.contractMangementInfoList[i].name='自运 （'+
|
|
|
+ res.data.data.contractMangementInfoList[i].contractNo+' '+res.data.data.contractMangementInfoList[i].seller+'）'
|
|
|
+ this.multiSelector1.push(res.data.data.contractManagementInfoList[i])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // this.taskNolist=res.data.data
|
|
|
+ })
|
|
|
+ this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
|
|
|
+ flag: 7,
|
|
|
+
|
|
|
+ }).then(res => {
|
|
|
+ if(res.data.data){
|
|
|
+ console.log(res.data.data)
|
|
|
+ uni.hideLoading();
|
|
|
+ }
|
|
|
+ this.contractNolist=res.data.data
|
|
|
+ })
|
|
|
+
|
|
|
if (uni.getStorageSync('checkcustomer')) {
|
|
|
|
|
|
let _customerInfo = uni.getStorageSync('checkcustomer')
|
|
|
@@ -400,14 +678,6 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- change(e){
|
|
|
- if(e){
|
|
|
- this.gridList.supplementaryRecording=1
|
|
|
- }else{
|
|
|
- this.gridList.supplementaryRecording=0
|
|
|
- }
|
|
|
-
|
|
|
- },
|
|
|
changeprice(){
|
|
|
if(this.pricetext='解锁'){
|
|
|
this.pricedisabled=false
|
|
|
@@ -420,9 +690,159 @@
|
|
|
inputprice(){
|
|
|
if(this.pricetext='锁定'){
|
|
|
this.pricedisabled=true
|
|
|
+
|
|
|
this.pricetext='解锁'
|
|
|
}
|
|
|
},
|
|
|
+ groupChange(e){
|
|
|
+ console.log(e)
|
|
|
+ this.gridList.serviceManagementType=e
|
|
|
+ if(e==1){
|
|
|
+ this.gridList.qualityNo=''
|
|
|
+ }else{
|
|
|
+ let number = '000' + this.warehouseCount
|
|
|
+ number = number.substring(number.length - 4, number.length)
|
|
|
+ this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
|
|
|
+ }
|
|
|
+ },
|
|
|
+ outtypepicker(e,status){
|
|
|
+ if(status==0){
|
|
|
+ this.gridList.outType=this.multiSelector[e[0]].name
|
|
|
+ }else{
|
|
|
+ if(this.multiSelector[e[0]].name=='他运'){
|
|
|
+ this.goodsdisabled=false
|
|
|
+ this.gridList.outType=this.multiSelector1[e[0]].name
|
|
|
+ }else{
|
|
|
+ this.gridList.outType='自运'
|
|
|
+ this.goodsdisabled=true
|
|
|
+ this.outType=this.multiSelector[e[0]].name
|
|
|
+ this.gridList.contractNo=this.multiSelector1[i].contractNo
|
|
|
+ for (let i = 0; i < this.contractNolist.length; i++) {
|
|
|
+ if(this.gridList.contractNo==this.contractNolist[i].contractNo){
|
|
|
+ this.gridList.goodsName=this.outContractNo[q].goodsName
|
|
|
+ this.gridList.goodsNameKey=this.outContractNo[q].goodsNameKey
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.waterContentChange()
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ console.log(this.gridList.outType)
|
|
|
+ },
|
|
|
+ changefreight(){
|
|
|
+ this.freightstatus=!this.freightstatus
|
|
|
+ if(this.freightstatus){
|
|
|
+ this.freighttext='自动获取'
|
|
|
+ }else{
|
|
|
+ this.freighttext='手动填写'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ changecost(){
|
|
|
+ this.coststatus=!this.coststatus
|
|
|
+ if(this.coststatus){
|
|
|
+ this.costtext='自动获取'
|
|
|
+ }else{
|
|
|
+ this.costtext='手动填写'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ inOutDatepicker(e){
|
|
|
+ this.gridList.inOutDate=e.year+'-'+e.month+'-'+e.day
|
|
|
+ console.log(e)
|
|
|
+ },
|
|
|
+ fleetpicker(e){
|
|
|
+ this.gridList.fleet=this.fleetNameList[e[0]].fleetName
|
|
|
+ },
|
|
|
+ change(e){
|
|
|
+ if(e){
|
|
|
+ this.gridList.supplementaryRecording=1
|
|
|
+ }else{
|
|
|
+ this.gridList.supplementaryRecording=0
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
+ tasknopicker(e){
|
|
|
+ console.log(e)
|
|
|
+ this.gridList.inOutTaskNo=this.taskNolist[e[0]].inOutTaskNo
|
|
|
+ var data = this.taskNolist[e[0]]
|
|
|
+ if (this.taskNolist[e[0]].contractNo) {
|
|
|
+ this.gridList.contractNo = this.taskNolist[e[0]].contractNo
|
|
|
+ }else {
|
|
|
+ this.gridList.contractNo = this.taskNolist[e[0]].moveTaskNo
|
|
|
+ }
|
|
|
+ for (let i = 0; i < this.contractNolist.length; i++) {
|
|
|
+
|
|
|
+ if(this.gridList.contractNo==this.contractNolist[i].contractNo){
|
|
|
+ console.log(this.contractNolist[i])
|
|
|
+ this.gridList.goodsName = this.contractNolist[i].goodsName
|
|
|
+ this.gridList.goodsNameKey = this.contractNolist[i].goodsNameKey
|
|
|
+ this.gridList.grade = this.contractNolist[i].grade
|
|
|
+ this.gridList.inOutType = this.contractNolist[i].inOutType
|
|
|
+ if(this.gridList.inOutType=='采购入库'){
|
|
|
+ this.warehouseTradeCount = '000' + this.warehouseTradeCount
|
|
|
+ this.gridList.qualityNo='CGRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
|
|
|
+ if (!this.contractNolist[i].unitContractPrice) {
|
|
|
+ this.gridList.tips = '卖方' + this.contractNolist[i].seller
|
|
|
+ } else {
|
|
|
+ this.gridList.tips ='卖方' +this.contractNolist[i].seller +'（ ' + this.contractNolist[i].unitContractPrice +'元/吨）'
|
|
|
+ }
|
|
|
+
|
|
|
+ this.gridList.inOutTypeKey = 1
|
|
|
+ }else if(this.gridList.inOutType=='移库入库'){
|
|
|
+ this.warehouseTradeCount = '000' + this.warehouseTradeCount
|
|
|
+ this.gridList.qualityNo='YKRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
|
|
|
+ if (this.contractNolist[i].unitContractPrice) {
|
|
|
+ this.gridList.tips ='出货库' +data.sendWarehouse +' （' +this.contractNolist[i].unitContractPrice +'元/吨）'
|
|
|
+ } else {
|
|
|
+ this.gridList.tips = '出货库' + data.sendWarehouse
|
|
|
+ }
|
|
|
+ this.gridList.inOutTypeKey = 3
|
|
|
+ }else if (this.contractNolist[i].inOutType == '移库出库') {
|
|
|
+ this.gridList.tips = '入货库' + data.receiveWarehouse
|
|
|
+ } else if (this.contractNolist[i].inOutType == '暂存入库') {
|
|
|
+ this.gridList.inOutTypeKey = 4
|
|
|
+ } else if (this.contractNolist[i].inOutType == '贸易服务入库') {
|
|
|
+ this.gridList.inOutTypeKey = 5
|
|
|
+ } else if (this.contractNolist[i].inOutType == '退库') {
|
|
|
+ if (this.contractNolist[i].contractNo) {
|
|
|
+ this.gridList.tips = '买方' + this.contractNolist[i].buyer
|
|
|
+ } else {
|
|
|
+ this.gridList.tips = '出货库' + data.sendWarehouse
|
|
|
+ }
|
|
|
+ this.gridList.inOutTypeKey = 6
|
|
|
+ }
|
|
|
+ this.cost = this.contractNolist[i].contractPrice
|
|
|
+ if (this.cost) {
|
|
|
+ this.isGetCost = true
|
|
|
+ this.gridList.cost =this.cost - this.gridList.deductionAmount
|
|
|
+ } else {
|
|
|
+ this.isGetCost = false
|
|
|
+ this.gridList.cost = this.gridList.cost
|
|
|
+ }
|
|
|
+ if (this.contractNolist[i].inOutType == '移库入库') {
|
|
|
+ this.isSelectType = false
|
|
|
+ } else {
|
|
|
+ this.isSelectType = true
|
|
|
+ }
|
|
|
+ if (this.contractNolist[i].priceType == '随行就市') {
|
|
|
+ this.disabled1 = !this.disabled1
|
|
|
+ }
|
|
|
+ if (this.contractNolist[i].deliverType == '1') {
|
|
|
+ this.carstatus = true
|
|
|
+ } else {
|
|
|
+ this.carstatus = false
|
|
|
+ }
|
|
|
+ if (this.contractNolist[i].tranCarInfoList) {
|
|
|
+ this.tranCarInfoList = this.contractNolist[i].tranCarInfoList
|
|
|
+ // this.carstatus = true
|
|
|
+ }else{
|
|
|
+ this.options2 =[]
|
|
|
+ }
|
|
|
+ this.fleetNameList=this.contractNolist[i].tranCarInfoList1
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ console.log(this.gridList)
|
|
|
+ },
|
|
|
print(){
|
|
|
uni.navigateTo({
|
|
|
url: '/pages/erpbusiness/bleConnect'
|
|
|
@@ -465,58 +885,59 @@
|
|
|
},
|
|
|
waterContentChange() {
|
|
|
var that = this
|
|
|
- if(!this.pricedisabled){
|
|
|
- if (this.gridList.goodsName && this.cangid) {
|
|
|
- this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
|
|
|
- warehouseId: this.cangid,
|
|
|
- goodsName: this.gridList.goodsName
|
|
|
- }).then(res => {
|
|
|
- that.gridList.dryGrainPrice = res.data.data
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
- if (this.gridList.goodsName) {
|
|
|
- for (var i = 0; i < this.purchasePriceList.length; i++) {
|
|
|
- if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
|
|
|
- this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
|
|
|
- this.gridList.paramType = this.purchasePriceList[i].paramType
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- var numReg = /^[0-9]*$/
|
|
|
- var numRe = new RegExp(numReg)
|
|
|
- //潮粮单价改变事件
|
|
|
- if (
|
|
|
- this.gridList.goodsName &&
|
|
|
- this.gridList.waterContent &&
|
|
|
- this.gridList.grade &&
|
|
|
- numRe.test(this.gridList.waterContent)
|
|
|
- ) {
|
|
|
- this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
|
|
|
+ if (this.gridList.goodsName && this.cangid) {
|
|
|
+ if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
|
|
|
+ this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
|
|
|
warehouseId: this.cangid,
|
|
|
- goodsName: this.gridList.goodsName,
|
|
|
- waterContent: this.gridList.waterContent,
|
|
|
- grade: this.gridList.grade,
|
|
|
+ goodsName: this.gridList.goodsName
|
|
|
}).then(res => {
|
|
|
- if (that.gridList.paramType == '1') {
|
|
|
- that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
|
|
|
- .gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
|
|
|
- .dryGrainPrice)).toFixed(4)
|
|
|
- if (!that.gridList.tidalGrainPrice) {
|
|
|
- that.gridList.tidalGrainPrice = ''
|
|
|
- }
|
|
|
- } else {
|
|
|
- if(that.gridList.type == '干粮'){
|
|
|
- that.gridList.dryGrainPrice = res.data.data
|
|
|
- }
|
|
|
- else{
|
|
|
- that.gridList.tidalGrainPrice = res.data.data
|
|
|
- }
|
|
|
- }
|
|
|
+ that.gridList.dryGrainPrice = res.data.data
|
|
|
})
|
|
|
}
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ if (this.gridList.goodsName) {
|
|
|
+ for (var i = 0; i < this.purchasePriceList.length; i++) {
|
|
|
+ if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
|
|
|
+ this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
|
|
|
+ this.gridList.paramType = this.purchasePriceList[i].paramType
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var numReg = /^[0-9]*$/
|
|
|
+ var numRe = new RegExp(numReg)
|
|
|
+ //潮粮单价改变事件
|
|
|
+ if (
|
|
|
+ this.gridList.goodsName &&
|
|
|
+ this.gridList.waterContent &&
|
|
|
+ this.gridList.grade &&
|
|
|
+ numRe.test(this.gridList.waterContent)
|
|
|
+ ) {
|
|
|
+ this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
|
|
|
+ warehouseId: this.cangid,
|
|
|
+ goodsName: this.gridList.goodsName,
|
|
|
+ waterContent: this.gridList.waterContent,
|
|
|
+ grade: this.gridList.grade,
|
|
|
+ }).then(res => {
|
|
|
+ if (that.gridList.paramType == '1') {
|
|
|
+ that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
|
|
|
+ .gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
|
|
|
+ .dryGrainPrice)).toFixed(4)
|
|
|
+ if (!that.gridList.tidalGrainPrice) {
|
|
|
+ that.gridList.tidalGrainPrice = ''
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if(that.gridList.type == '干粮'){
|
|
|
+
|
|
|
+ that.gridList.dryGrainPrice = res.data.data
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ that.gridList.tidalGrainPrice = res.data.data
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
gocustomer() {
|
|
|
uni.navigateTo({
|
|
|
@@ -537,7 +958,15 @@
|
|
|
return year + '' + mouth + '' + datetime
|
|
|
},
|
|
|
submit() {
|
|
|
+ if(this.typevalue==3){
|
|
|
+ if(this.outType){
|
|
|
+ this.gridList.outType=this.outType
|
|
|
+ }
|
|
|
+ }
|
|
|
var that = this
|
|
|
+ this.gridList.carNo=this.gridList.carNumber
|
|
|
+ this.gridList.baseId=this.cangid
|
|
|
+ this.gridList.warehouseId=this.cangid
|
|
|
if (!this.gridList.qualityNo) {
|
|
|
this.$api.msg('编号不能为空')
|
|
|
return
|
|
|
@@ -546,18 +975,25 @@
|
|
|
this.$api.msg('仓位不能为空')
|
|
|
return
|
|
|
}
|
|
|
- if (!this.gridList.customerName) {
|
|
|
- this.$api.msg('客户不能为空')
|
|
|
- return
|
|
|
- }
|
|
|
- if (!this.gridList.storageTagNo) {
|
|
|
- this.$api.msg('囤位号不能为空')
|
|
|
- return
|
|
|
- }
|
|
|
- if (this.gridList.storageTagNo.length > 10) {
|
|
|
- this.$api.msg('囤位号不能为空')
|
|
|
- return
|
|
|
+ if(this.typevalue==3){
|
|
|
+ if (!this.gridList.customerName) {
|
|
|
+ this.$api.msg('客户不能为空')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (!this.gridList.natureOfGrainPurchase) {
|
|
|
+ this.$api.msg('购粮性质不能为空')
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+ // if (!this.gridList.storageTagNo) {
|
|
|
+ // this.$api.msg('囤位号不能为空')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // if (this.gridList.storageTagNo&&this.gridList.storageTagNo.length > 10) {
|
|
|
+ // this.$api.msg('囤位号不能为空')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
if (!this.gridList.carNumber) {
|
|
|
this.$api.msg('车牌号不能为空')
|
|
|
return
|
|
|
@@ -570,25 +1006,22 @@
|
|
|
this.$api.msg('货名不能为空')
|
|
|
return
|
|
|
}
|
|
|
- if (this.gridList.buckleWeightRatio < 0 || this.gridList.buckleWeightRatio > 2) {
|
|
|
- this.$api.msg('扣重比输入错误')
|
|
|
- return
|
|
|
- }
|
|
|
- if (
|
|
|
- String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
|
|
|
- String(this.gridList.buckleWeightRatio).length -
|
|
|
- (String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) {
|
|
|
- this.$api.msg('扣重比输入错误')
|
|
|
- return
|
|
|
- }
|
|
|
+ // if (this.gridList.buckleWeightRatio < 0 || this.gridList.buckleWeightRatio > 2) {
|
|
|
+ // this.$api.msg('扣重比输入错误')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // if (
|
|
|
+ // String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
|
|
|
+ // String(this.gridList.buckleWeightRatio).length -
|
|
|
+ // (String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) {
|
|
|
+ // this.$api.msg('扣重比输入错误')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
if (!this.gridList.type) {
|
|
|
this.$api.msg('类型不能为空')
|
|
|
return
|
|
|
}
|
|
|
- if (!this.gridList.natureOfGrainPurchase) {
|
|
|
- this.$api.msg('购粮性质不能为空')
|
|
|
- return
|
|
|
- }
|
|
|
+
|
|
|
if(this.value==false){
|
|
|
if (!this.gridList.grade) {
|
|
|
this.$api.msg('等级不能为空')
|
|
|
@@ -629,7 +1062,9 @@
|
|
|
confirmText: '提交',
|
|
|
success: function(res) {
|
|
|
if (res.confirm) {
|
|
|
- that.$api.doRequest('get', '/paymentManagement/cumulant', {
|
|
|
+ that.gridList.serviceManagementType=that.typevalue
|
|
|
+ if(that.typevalue==3){
|
|
|
+ that.$api.doRequest('get', '/paymentManagement/cumulant', {
|
|
|
compId: uni.getStorageSync('pcUserInfo').compId,
|
|
|
customerNumberCard: that.gridList.customerNumberCard,
|
|
|
goodsName: that.gridList.goodsName,
|
|
|
@@ -654,6 +1089,11 @@
|
|
|
count + '吨', )
|
|
|
|
|
|
} else {
|
|
|
+ that.$api.doRequest('post',
|
|
|
+ '/warehouseInOutInfo/InOutWarehouse',
|
|
|
+ that.gridList)
|
|
|
+ .then(res => {
|
|
|
+ that.gridList.warehouseInOutId=res.data.data
|
|
|
that.$api.doRequest('post',
|
|
|
'/qualityInspectionManagement/api/addQualityInspection',
|
|
|
that.gridList)
|
|
|
@@ -667,14 +1107,40 @@
|
|
|
console.log('that.gridList',that.gridList)
|
|
|
// uni.navigateBack({})
|
|
|
} else {
|
|
|
- hat.$api.msg('提交失败')
|
|
|
+ that.$api.msg('提交失败')
|
|
|
}
|
|
|
})
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
+ }else{
|
|
|
+ that.$api.doRequest('post',
|
|
|
+ '/warehouseInOutInfo/InOutWarehouse',
|
|
|
+ that.gridList)
|
|
|
+ .then(res => {
|
|
|
+ that.gridList.warehouseInOutId=res.data.data
|
|
|
+ that.$api.doRequest('post',
|
|
|
+ '/qualityInspectionManagement/api/addQualityInspection',
|
|
|
+ that.gridList)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ that.$api.msg('提交成功')
|
|
|
+ that.isShowPrint = true
|
|
|
+ that.gridList.warehouseId = that.cangid
|
|
|
+ that.gridList.compId = uni.getStorageSync('pcUserInfo').compId
|
|
|
+ uni.setStorageSync("quality_print",that.gridList)
|
|
|
+ console.log('that.gridList',that.gridList)
|
|
|
+ // uni.navigateBack({})
|
|
|
+ } else {
|
|
|
+ hat.$api.msg('提交失败')
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
@@ -684,11 +1150,9 @@
|
|
|
// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
|
|
|
this.gridList.grade = this.gradeList[e[0]].value
|
|
|
this.gridList.gradeKey = this.gradeList[e[0]].key
|
|
|
- if(!this.pricedisabled){
|
|
|
- this.waterContentChange()
|
|
|
- }
|
|
|
+ this.waterContentChange()
|
|
|
},
|
|
|
- setGoodName(e) {
|
|
|
+ setGoodName(e,status) {
|
|
|
//
|
|
|
// [e[0]] = 0
|
|
|
// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
|
|
|
@@ -716,13 +1180,18 @@
|
|
|
// })
|
|
|
uni.setStorageSync('goodsName', this.gridList.goodsName)
|
|
|
if (this.gridList.type == "干粮" && this.gridList.goodsName) {
|
|
|
- uni.showLoading({title: '加载中',mask:true})
|
|
|
+ if(!status){
|
|
|
+ uni.showLoading({title: '加载中',mask:true})
|
|
|
+ }
|
|
|
+
|
|
|
this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
|
|
|
warehouseId: this.cangid,
|
|
|
goodsName: this.gridList.goodsName
|
|
|
}).then(res => {
|
|
|
this.gridList.dryGrainPrice = res.data.data
|
|
|
- uni.hideLoading()
|
|
|
+ if(!status){
|
|
|
+ uni.hideLoading()
|
|
|
+ }
|
|
|
})
|
|
|
}
|
|
|
this.waterContentChange()
|
|
|
@@ -745,7 +1214,9 @@
|
|
|
}
|
|
|
},
|
|
|
binNumberpicker(e) {
|
|
|
+ console.log(this.warehouseList[e[0]])
|
|
|
this.gridList.binNumber = this.warehouseList[e[0]].binNumber
|
|
|
+ this.gridList.positionId = this.warehouseList[e[0]].id
|
|
|
},
|
|
|
del(item) {
|
|
|
this.$api.doRequest('get', '/qualityInspectionManagement/api/deleteQualityInspection', {
|
|
|
@@ -941,4 +1412,7 @@
|
|
|
text-align: center;
|
|
|
border-radius: 20rpx;
|
|
|
}
|
|
|
-</style>
|
|
|
+ /deep/.u-radio-group{
|
|
|
+ flex-direction: row-reverse;
|
|
|
+ }
|
|
|
+</style>
|
