|
|
@@ -21,7 +21,7 @@
|
|
|
<div class="car-no">{{ carWeightInfo.carNumber }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
<div class="bottom">
|
|
|
<div class="bg-left titleup"><span class="word_css">实时监控</span></div>
|
|
|
<div v-if="!monitorUrl1" class="video1">
|
|
|
@@ -47,7 +47,7 @@
|
|
|
<div class="left1">
|
|
|
<div class="titlesign weightTitle">
|
|
|
<span class="word_css">检斤信息</span>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
<div class="weightInfo">
|
|
|
<div class="tab">
|
|
|
@@ -55,79 +55,79 @@
|
|
|
<div :class="inWarehouseType == 3 ? 'in_css':'in_cssno'" @click="WarehousingType(3)">收购入库</div>
|
|
|
</div>
|
|
|
<div class="tab weigh_btn">
|
|
|
- <el-badge :value="mListTop.length" class="badge_item">
|
|
|
- <div :class="tpyeNo == 1 ? 'in_css1':'in_cssno1'" @click="tabClick(0)">称毛重</div>
|
|
|
- </el-badge>
|
|
|
- <el-badge :value="pListTop.length" class="badge_item">
|
|
|
- <div :class="tpyeNo == 2 ? 'in_css1':'in_cssno1'" @click="tabClick(1)">称皮重</div>
|
|
|
- </el-badge>
|
|
|
+ <el-badge :value="mListTop.length" class="badge_item">
|
|
|
+ <div :class="tpyeNo == 1 ? 'in_css1':'in_cssno1'" @click="tabClick(0)">称毛重</div>
|
|
|
+ </el-badge>
|
|
|
+ <el-badge :value="pListTop.length" class="badge_item">
|
|
|
+ <div :class="tpyeNo == 2 ? 'in_css1':'in_cssno1'" @click="tabClick(1)">称皮重</div>
|
|
|
+ </el-badge>
|
|
|
</div>
|
|
|
- <ws-info-table>
|
|
|
- <ws-form-item label="业务编号" span="1" prop="number">
|
|
|
- <ws-input v-model="weighingList.number" placeholder="自动获取，不可编辑" maxlength="100" disabled size="small" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="合同编号" span="1" prop="contractNo" v-show="inWarehouseType == 1" v-if="weighingList.contractNo">
|
|
|
- <ws-input v-model="weighingList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled size="small" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="移库编号" span="1" prop="moveTaskNo" v-show="inWarehouseType == 1" v-else>
|
|
|
- <ws-input v-model="weighingList.moveTaskNo" placeholder="自动获取，不可编辑" maxlength="100" size="small" disabled />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="客户" span="1" prop="customer" v-if="inWarehouseType == 3">
|
|
|
- <ws-input v-model="weighingList.customer" placeholder="自动获取，不可编辑" maxlength="100" disabled
|
|
|
- size="small" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="货名" span="1" prop="goodsName">
|
|
|
- <ws-input v-model="weighingList.goodsName" placeholder="自动获取，不可编辑" maxlength="100" disabled
|
|
|
- size="small" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="车牌号" span="1" prop="carNumber">
|
|
|
- <ws-input v-model="weighingList.carNumber" placeholder="自动获取，不可编辑" maxlength="100" size="small"
|
|
|
- disabled />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="运输方式" span="1" prop="outType" v-if="inWarehouseType == 1">
|
|
|
- <ws-input v-model="weighingList.outType" placeholder="自动获取，不可编辑" maxlength="100" size="small"
|
|
|
- disabled />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="箱号-1" span="1" prop="boxNo">
|
|
|
- <ws-input disabled v-model="weighingList.boxNo" placeholder="暂无"
|
|
|
- maxlength="20" size="small" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
|
|
|
- <ws-input disabled v-model="weighingList.boxNoOther" placeholder="暂无"
|
|
|
- maxlength="20" size="small" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="封号-1" span="1" prop="titleNo">
|
|
|
- <ws-input disabled v-model="weighingList.titleNo" placeholder="暂无"
|
|
|
- maxlength="20" size="small" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="封号-2" span="1" prop="titleNoOther">
|
|
|
- <ws-input disabled v-model="weighingList.titleNoOther" placeholder="暂无"
|
|
|
- maxlength="20" size="small" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="毛重(KG)" span="1" prop="grossWeight">
|
|
|
- <ws-input type="number" @mousewheel.native.prevent v-if="index == 0"
|
|
|
- v-model="weighingList.grossWeight" @input="calculation(status)" placeholder="未获取到毛重" maxlength="100"
|
|
|
- size="small" :disabled="disabled" />
|
|
|
- <ws-input type="number" @mousewheel.native.prevent v-else v-model="weighingList.grossWeight"
|
|
|
- @input="calculation" placeholder="未获取到毛重" maxlength="100" size="small" disabled />
|
|
|
- <el-button class="butCss" @click="openPort" v-if="index == 0">重新获取</el-button>
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="information == '皮重'">
|
|
|
- <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation"
|
|
|
- placeholder="未获取到皮重" maxlength="100" size="small" :disabled="disabled" />
|
|
|
- <el-button class="butCss" v-if="index != 0" @click="openPort">重新获取</el-button>
|
|
|
- </ws-form-item>
|
|
|
- <div class="formItem">
|
|
|
- <ws-form-item label="扣重(KG)" span="1" prop="buckleMiscellaneous"
|
|
|
- v-if="information == '皮重' && (paramType == '2' || inWarehouseType == 1)">
|
|
|
- <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous"
|
|
|
- @input="calculation" placeholder="请输入扣重" maxlength="100" size="small" />
|
|
|
+ <ws-info-table>
|
|
|
+ <ws-form-item label="业务编号" span="1" prop="number">
|
|
|
+ <ws-input v-model="weighingList.number" placeholder="自动获取，不可编辑" maxlength="100" disabled
|
|
|
+ size="small" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="合同编号" span="1" prop="contractNo" v-show="inWarehouseType == 1"
|
|
|
+ v-if="weighingList.contractNo">
|
|
|
+ <ws-input v-model="weighingList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
|
|
|
+ size="small" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="移库编号" span="1" prop="moveTaskNo" v-show="inWarehouseType == 1" v-else>
|
|
|
+ <ws-input v-model="weighingList.moveTaskNo" placeholder="自动获取，不可编辑" maxlength="100" size="small"
|
|
|
+ disabled />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="客户" span="1" prop="customer" v-if="inWarehouseType == 3">
|
|
|
+ <ws-input v-model="weighingList.customer" placeholder="自动获取，不可编辑" maxlength="100" disabled
|
|
|
+ size="small" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="货名" span="1" prop="goodsName">
|
|
|
+ <ws-input v-model="weighingList.goodsName" placeholder="自动获取，不可编辑" maxlength="100" disabled
|
|
|
+ size="small" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="车牌号" span="1" prop="carNumber">
|
|
|
+ <ws-input v-model="weighingList.carNumber" placeholder="自动获取，不可编辑" maxlength="100" size="small"
|
|
|
+ disabled />
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item label="净重(KG)" span="1" prop="netWeight" v-if="information == '皮重'">
|
|
|
- <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight"
|
|
|
- placeholder="自动计算，不可编辑" maxlength="100" size="small" disabled />
|
|
|
+ <ws-form-item label="运输方式" span="1" prop="outType" v-if="inWarehouseType == 1">
|
|
|
+ <ws-input v-model="weighingList.outType" placeholder="自动获取，不可编辑" maxlength="100" size="small"
|
|
|
+ disabled />
|
|
|
</ws-form-item>
|
|
|
- <!-- <ws-form-item label="应收卸车过磅费（元）" span="1" prop="receivableWeighingFee" v-if="index == 1">
|
|
|
+ <ws-form-item label="箱号-1" span="1" prop="boxNo">
|
|
|
+ <ws-input disabled v-model="weighingList.boxNo" placeholder="暂无" maxlength="20" size="small" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
|
|
|
+ <ws-input disabled v-model="weighingList.boxNoOther" placeholder="暂无" maxlength="20" size="small" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="封号-1" span="1" prop="titleNo">
|
|
|
+ <ws-input disabled v-model="weighingList.titleNo" placeholder="暂无" maxlength="20" size="small" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="封号-2" span="1" prop="titleNoOther">
|
|
|
+ <ws-input disabled v-model="weighingList.titleNoOther" placeholder="暂无" maxlength="20" size="small" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="毛重(KG)" span="1" prop="grossWeight">
|
|
|
+ <ws-input type="number" @mousewheel.native.prevent v-if="index == 0"
|
|
|
+ v-model="weighingList.grossWeight" @input="calculation(status)" placeholder="未获取到毛重" maxlength="100"
|
|
|
+ size="small" :disabled="disabled" />
|
|
|
+ <ws-input type="number" @mousewheel.native.prevent v-else v-model="weighingList.grossWeight"
|
|
|
+ @input="calculation" placeholder="未获取到毛重" maxlength="100" size="small" disabled />
|
|
|
+ <el-button class="butCss" @click="openPort" v-if="index == 0">重新获取</el-button>
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="information == '皮重'">
|
|
|
+ <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation"
|
|
|
+ placeholder="未获取到皮重" maxlength="100" size="small" :disabled="disabled" />
|
|
|
+ <el-button class="butCss" v-if="index != 0" @click="openPort">重新获取</el-button>
|
|
|
+ </ws-form-item>
|
|
|
+ <div class="formItem">
|
|
|
+ <ws-form-item label="扣重(KG)" span="1" prop="buckleMiscellaneous"
|
|
|
+ v-if="information == '皮重' && (paramType == '2' || inWarehouseType == 1)">
|
|
|
+ <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous"
|
|
|
+ @input="calculation" placeholder="请输入扣重" maxlength="100" size="small" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="净重(KG)" span="1" prop="netWeight" v-if="information == '皮重'">
|
|
|
+ <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight"
|
|
|
+ placeholder="自动计算，不可编辑" maxlength="100" size="small" disabled />
|
|
|
+ </ws-form-item>
|
|
|
+ <!-- <ws-form-item label="应收卸车过磅费（元）" span="1" prop="receivableWeighingFee" v-if="index == 1">
|
|
|
<ws-input type="number" v-model="weighingList.receivableWeighingFee" placeholder="未获取到卸车过磅费金额"
|
|
|
maxlength="100" size="small" disabled />
|
|
|
</ws-form-item>
|
|
|
@@ -135,15 +135,16 @@
|
|
|
<ws-input type="number" v-model="weighingList.actualWeighingFee" placeholder="输入卸车过磅费" maxlength="100"
|
|
|
size="small" />
|
|
|
</ws-form-item> -->
|
|
|
+ </div>
|
|
|
+ </ws-info-table>
|
|
|
+ <div class="but">
|
|
|
+ <!-- <el-button @click="print" type="primary" :disabled="submitAllow">提交</el-button> -->
|
|
|
+ <el-button @click="print" v-if="information == '毛重'" type="primary">保存</el-button>
|
|
|
+ <el-button @click="print" v-if="information == '皮重'" type="primary" :disabled="submitAllow">保存并打印
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
- </ws-info-table>
|
|
|
- <div class="but">
|
|
|
- <!-- <el-button @click="print" type="primary" :disabled="submitAllow">提交</el-button> -->
|
|
|
- <el-button @click="print" v-if="information == '毛重'" type="primary">保存</el-button>
|
|
|
- <el-button @click="print" v-if="information == '皮重'" type="primary" >保存并打印</el-button>
|
|
|
</div>
|
|
|
- </div>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
<div class="car-right">
|
|
|
<div class="screen">
|
|
|
@@ -156,15 +157,18 @@
|
|
|
</div>
|
|
|
<div class="screen frame">
|
|
|
<div class="screen_left">
|
|
|
- <div @click="cutstatus(1)" :class="status==1?'select_css':'noselect_css'" v-if="!(inWarehouseType == 1 && tpyeNo == 2)">未称{{information}}</div>
|
|
|
- <div @click="cutstatus(2)" :class="status==2?'select_css':'noselect_css'" v-if="!(inWarehouseType == 1 && tpyeNo == 2)">已称{{information}}</div>
|
|
|
+ <div @click="cutstatus(1)" :class="status==1?'select_css':'noselect_css'"
|
|
|
+ v-if="!(inWarehouseType == 1 && tpyeNo == 2)">未称{{information}}</div>
|
|
|
+ <div @click="cutstatus(2)" :class="status==2?'select_css':'noselect_css'"
|
|
|
+ v-if="!(inWarehouseType == 1 && tpyeNo == 2)">已称{{information}}</div>
|
|
|
</div>
|
|
|
- <div class="screen_right">
|
|
|
- <div @click="record" v-hasPermission="`acquisitionManagement.acquisitionWeight.view`" class="jilu">记录</div>
|
|
|
- </div>
|
|
|
-
|
|
|
+ <div class="screen_right">
|
|
|
+ <div @click="record" v-hasPermission="`acquisitionManagement.acquisitionWeight.view`" class="jilu">记录
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
<el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
|
|
|
style="width: 100%; overflow-y: scroll !important;; height: calc(100vh - 54vh);margin-top:20px">
|
|
|
<el-table-column property="number" label="业务编号">
|
|
|
@@ -224,8 +228,11 @@
|
|
|
getweighingList,
|
|
|
getinspectLookGoods,
|
|
|
selectWarehouseSelf,
|
|
|
+ getsettleaccout,
|
|
|
} from '@/model/houseSelfCollect/index'
|
|
|
- import {addstorageputList} from '@/model/warehouse/index'
|
|
|
+ import {
|
|
|
+ addstorageputList
|
|
|
+ } from '@/model/warehouse/index'
|
|
|
import weightCheckPrint from './component/weightCheckPrint.vue'
|
|
|
import BalanceAlert from '@/components/balanceAlert'
|
|
|
import html2canvas from 'html2canvas'
|
|
|
@@ -298,10 +305,10 @@
|
|
|
tableData: {},
|
|
|
reader: null,
|
|
|
param: 9600,
|
|
|
- monitorUrl1: '',//监控地址
|
|
|
- monitorUrl2: '',//监控地址
|
|
|
+ monitorUrl1: '', //监控地址
|
|
|
+ monitorUrl2: '', //监控地址
|
|
|
cangid: '',
|
|
|
- paramType: '1',//参数类型 1 扣重比 2 降幅
|
|
|
+ paramType: '1', //参数类型 1 扣重比 2 降幅
|
|
|
warehouseName: '',
|
|
|
result1: '00',
|
|
|
allowEdit: 0,
|
|
|
@@ -315,8 +322,9 @@
|
|
|
inWarehouseType: 1, //入库类型
|
|
|
mListTotal: [],
|
|
|
pListTotal: [],
|
|
|
- submitAllow:false,
|
|
|
- id:"",
|
|
|
+ submitAllow: false,
|
|
|
+ id: "",
|
|
|
+ inOutDate: {},
|
|
|
}
|
|
|
},
|
|
|
activated() {
|
|
|
@@ -333,7 +341,7 @@
|
|
|
// }
|
|
|
// if (this.$route.query.automaticWeightAcquisition == '1') {
|
|
|
this.isShowBalance = true
|
|
|
- var _saomaData = JSON.parse(localStorage.getItem("saoma_data"))//判断是否扫码进来的
|
|
|
+ var _saomaData = JSON.parse(localStorage.getItem("saoma_data")) //判断是否扫码进来的
|
|
|
// }
|
|
|
//仓库
|
|
|
selectWarehouseSelf({
|
|
|
@@ -342,17 +350,17 @@
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.warehouseList = response
|
|
|
- if(_saomaData){//缓存中有值，证明扫码进来的
|
|
|
+ if (_saomaData) { //缓存中有值，证明扫码进来的
|
|
|
this.warehouseName = _saomaData.warehouseName
|
|
|
- this.cangid = _saomaData.cangid
|
|
|
- this.monitorUrl1 = _saomaData.monitorUrl1
|
|
|
- this.monitorUrl2 = _saomaData.monitorUrl2
|
|
|
- this.allowEdit = _saomaData.allowEdit
|
|
|
- this.id = _saomaData.id
|
|
|
- this.tpyeNo = _saomaData.typeNo
|
|
|
- this.inWarehouseType = _saomaData.managementType
|
|
|
- localStorage.removeItem("saoma_data");//第一次进来结束后清除缓存
|
|
|
- }else if (localStorage.getItem('ck')) {
|
|
|
+ this.cangid = _saomaData.cangid
|
|
|
+ this.monitorUrl1 = _saomaData.monitorUrl1
|
|
|
+ this.monitorUrl2 = _saomaData.monitorUrl2
|
|
|
+ this.allowEdit = _saomaData.allowEdit
|
|
|
+ this.id = _saomaData.id
|
|
|
+ this.tpyeNo = _saomaData.typeNo
|
|
|
+ this.inWarehouseType = _saomaData.managementType
|
|
|
+ localStorage.removeItem("saoma_data"); //第一次进来结束后清除缓存
|
|
|
+ } else if (localStorage.getItem('ck')) {
|
|
|
this.warehouseName = localStorage.getItem('ck')
|
|
|
for (var i = 0; i < response.length; i++) {
|
|
|
if (this.warehouseName == this.warehouseList[i].warehouseName) {
|
|
|
@@ -376,7 +384,7 @@
|
|
|
} else if (this.allowEdit == 1) {
|
|
|
this.disabled = false
|
|
|
}
|
|
|
- if (this.tpyeNo == 1) {
|
|
|
+ if (this.tpyeNo == 1) {
|
|
|
this.information = '毛重'
|
|
|
this.weighingList.tare = 0
|
|
|
} else if (this.tpyeNo == 2) {
|
|
|
@@ -385,7 +393,7 @@
|
|
|
this.getList()
|
|
|
})
|
|
|
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
warehouseNameChange() {
|
|
|
@@ -410,12 +418,15 @@
|
|
|
record() {
|
|
|
this.$router.push({
|
|
|
path: 'weightCheckRecord',
|
|
|
- query:{inWarehouseType:this.inWarehouseType,warehouseName:this.warehouseName}
|
|
|
+ query: {
|
|
|
+ inWarehouseType: this.inWarehouseType,
|
|
|
+ warehouseName: this.warehouseName
|
|
|
+ }
|
|
|
})
|
|
|
},
|
|
|
WarehousingType(num) {
|
|
|
this.inWarehouseType = num
|
|
|
- if(this.inWarehouseType == 1 && this.status == 2){
|
|
|
+ if (this.inWarehouseType == 1 && this.status == 2) {
|
|
|
this.status = 1
|
|
|
}
|
|
|
this.getList()
|
|
|
@@ -454,7 +465,7 @@
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
-this.deptBudgetTotal = this.carList.length
|
|
|
+ this.deptBudgetTotal = this.carList.length
|
|
|
},
|
|
|
handleSizeChange(val) {
|
|
|
console.log(`每页 ${val} 条`)
|
|
|
@@ -537,13 +548,13 @@ this.deptBudgetTotal = this.carList.length
|
|
|
this.carList = this.mList
|
|
|
this.carList1 = this.mListTotal
|
|
|
if (this.mList.length != 0) {
|
|
|
- this.setCurrent(this.mList[0])
|
|
|
+ this.setCurrent(this.mList[0])
|
|
|
|
|
|
- this.weighingList = this.mList[0]
|
|
|
- this.carWeightInfo = {
|
|
|
- carNumber: this.mList[0].carNumber,
|
|
|
- type: this.information,
|
|
|
- weight: this.weighingList.grossWeight,
|
|
|
+ this.weighingList = this.mList[0]
|
|
|
+ this.carWeightInfo = {
|
|
|
+ carNumber: this.mList[0].carNumber,
|
|
|
+ type: this.information,
|
|
|
+ weight: this.weighingList.grossWeight,
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
@@ -551,14 +562,14 @@ this.deptBudgetTotal = this.carList.length
|
|
|
this.carList = this.pList
|
|
|
this.carList1 = this.pListTotal
|
|
|
if (this.pList.length != 0) {
|
|
|
- this.setCurrent(this.pList[0])
|
|
|
+ this.setCurrent(this.pList[0])
|
|
|
|
|
|
- this.weighingList = this.pList[0]
|
|
|
- this.carWeightInfo = {
|
|
|
- carNumber: this.pList[0].carNumber,
|
|
|
- type: this.information,
|
|
|
- weight: this.weighingList.tare
|
|
|
- }
|
|
|
+ this.weighingList = this.pList[0]
|
|
|
+ this.carWeightInfo = {
|
|
|
+ carNumber: this.pList[0].carNumber,
|
|
|
+ type: this.information,
|
|
|
+ weight: this.weighingList.tare
|
|
|
+ }
|
|
|
}
|
|
|
this.deptBudgetTotal = this.pList.length
|
|
|
}
|
|
|
@@ -784,7 +795,7 @@ this.deptBudgetTotal = this.carList.length
|
|
|
this.tpyeNo = '2'
|
|
|
this.information = '皮重'
|
|
|
}
|
|
|
- if(this.tpyeNo == 2 && this.inWarehouseType == 1){//贸易入库不能二次称皮重（没有已称皮重按钮）
|
|
|
+ if (this.tpyeNo == 2 && this.inWarehouseType == 1) { //贸易入库不能二次称皮重（没有已称皮重按钮）
|
|
|
this.status = 1 //手动更改未称皮重状态
|
|
|
}
|
|
|
this.getList()
|
|
|
@@ -794,28 +805,28 @@ this.deptBudgetTotal = this.carList.length
|
|
|
},
|
|
|
handleCurrentChange(val) {
|
|
|
this.submitAllow = false
|
|
|
- if(this.tpyeNo == 2 && this.status == 1 && val && val.qualityInspectionManagement.confirm == 0){
|
|
|
- this.submitAllow = true
|
|
|
- this.$message({
|
|
|
- message: '该条质检信息未确认',
|
|
|
- type: 'warning'
|
|
|
- });
|
|
|
+ if (this.tpyeNo == 2 && this.status == 1 && val && val.qualityInspectionManagement.confirm == 0) {
|
|
|
+ this.submitAllow = true
|
|
|
+ this.$message({
|
|
|
+ message: '该条质检信息未确认',
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
}
|
|
|
- if(val){
|
|
|
+ if (val) {
|
|
|
this.currentRow = val
|
|
|
this.carWeightInfo = {
|
|
|
- carNumber: val.carNumber,
|
|
|
- type: this.information,
|
|
|
- weight: val.grossWeight,
|
|
|
- }
|
|
|
- this.weighingList = val
|
|
|
- if(val.qualityInspectionManagement){
|
|
|
- this.weighingList.boxNo = val.qualityInspectionManagement.boxNo
|
|
|
- this.weighingList.boxNoOther = val.qualityInspectionManagement.boxNoOther
|
|
|
- this.weighingList.titleNo = val.qualityInspectionManagement.titleNo
|
|
|
- this.weighingList.titleNoOther = val.qualityInspectionManagement.titleNoOther
|
|
|
- }
|
|
|
- this.paramType = val.qualityInspectionManagement.paramType
|
|
|
+ carNumber: val.carNumber,
|
|
|
+ type: this.information,
|
|
|
+ weight: val.grossWeight,
|
|
|
+ }
|
|
|
+ this.weighingList = val
|
|
|
+ if (val.qualityInspectionManagement) {
|
|
|
+ this.weighingList.boxNo = val.qualityInspectionManagement.boxNo
|
|
|
+ this.weighingList.boxNoOther = val.qualityInspectionManagement.boxNoOther
|
|
|
+ this.weighingList.titleNo = val.qualityInspectionManagement.titleNo
|
|
|
+ this.weighingList.titleNoOther = val.qualityInspectionManagement.titleNoOther
|
|
|
+ }
|
|
|
+ this.paramType = val.qualityInspectionManagement.paramType
|
|
|
}
|
|
|
},
|
|
|
cancel() {
|
|
|
@@ -880,7 +891,13 @@ this.deptBudgetTotal = this.carList.length
|
|
|
data: formdata,
|
|
|
}).then((response) => {
|
|
|
//编辑接口
|
|
|
- this.weighingList.pictureAddress = response.data.url
|
|
|
+ if (this.inWarehouseType == 1) {
|
|
|
+ this.weighingList = this.inOutDate
|
|
|
+ this.weighingList.pictureAddress = response.data.url
|
|
|
+ } else {
|
|
|
+ this.weighingList.pictureAddress = response.data.url
|
|
|
+ }
|
|
|
+
|
|
|
tare(this.weighingList)
|
|
|
.toPromise()
|
|
|
.then((response) => {})
|
|
|
@@ -941,7 +958,7 @@ this.deptBudgetTotal = this.carList.length
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (this.weighingList.tare > this.weighingList.grossWeight) {
|
|
|
+ if (Number(this.weighingList.tare) > Number(this.weighingList.grossWeight)) {
|
|
|
this.$message({
|
|
|
message: '皮重不能大于毛重',
|
|
|
type: 'warning',
|
|
|
@@ -968,7 +985,7 @@ this.deptBudgetTotal = this.carList.length
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- if (this.weighingList.netWeight < 0) {
|
|
|
+ if (Number(this.weighingList.netWeight < 0)) {
|
|
|
this.$message({
|
|
|
message: '净重不能小于0',
|
|
|
type: 'warning',
|
|
|
@@ -982,27 +999,28 @@ this.deptBudgetTotal = this.carList.length
|
|
|
type: 'warning',
|
|
|
})
|
|
|
.then(() => {
|
|
|
+ var that = this
|
|
|
var warehousing = {}
|
|
|
//贸易入库保存需要再走入库接口
|
|
|
- if(this.inWarehouseType == 1){
|
|
|
- warehousing = this.weighingList
|
|
|
- warehousing.secretaryWeigher = localStorage.getItem('ws-pf_staffName')
|
|
|
- warehousing.compId = localStorage.getItem('ws-pf_compId')
|
|
|
- warehousing.inOutFlag = 2
|
|
|
- let _data = JSON.parse(
|
|
|
- localStorage.getItem('winseaview-userInfo')
|
|
|
- )
|
|
|
- warehousing.backOffice = _data.content.showCompName + '-' + _data.content.staffName
|
|
|
- warehousing.grossWeight = this.weighingList.grossWeight
|
|
|
- warehousing.tare = this.weighingList.tare
|
|
|
- warehousing.netWeight = this.weighingList.netWeight
|
|
|
- warehousing.pureWeight = this.weighingList.pureWeight
|
|
|
- warehousing.deductionAmount = this.weighingList.deductionAmount
|
|
|
- warehousing.deductionWeight = this.weighingList.deductionWeight
|
|
|
- warehousing.warehouseInOutDetail = {}
|
|
|
- warehousing.baseId =warehousing.warehouseId
|
|
|
- delete warehousing.qualityInspectionManagement
|
|
|
- }
|
|
|
+ if (this.inWarehouseType == 1) {
|
|
|
+ warehousing = this.weighingList
|
|
|
+ warehousing.secretaryWeigher = localStorage.getItem('ws-pf_staffName')
|
|
|
+ warehousing.compId = localStorage.getItem('ws-pf_compId')
|
|
|
+ warehousing.inOutFlag = 2
|
|
|
+ let _data = JSON.parse(
|
|
|
+ localStorage.getItem('winseaview-userInfo')
|
|
|
+ )
|
|
|
+ warehousing.backOffice = _data.content.showCompName + '-' + _data.content.staffName
|
|
|
+ warehousing.grossWeight = this.weighingList.grossWeight
|
|
|
+ warehousing.tare = this.weighingList.tare
|
|
|
+ warehousing.netWeight = this.weighingList.netWeight
|
|
|
+ warehousing.pureWeight = this.weighingList.pureWeight
|
|
|
+ warehousing.deductionAmount = this.weighingList.deductionAmount
|
|
|
+ warehousing.deductionWeight = this.weighingList.deductionWeight
|
|
|
+ warehousing.warehouseInOutDetail = {}
|
|
|
+ warehousing.baseId = this.cangid
|
|
|
+ delete warehousing.qualityInspectionManagement
|
|
|
+ }
|
|
|
if (this.tpyeNo == 1) {
|
|
|
//毛检保存前进行校验
|
|
|
getamount({
|
|
|
@@ -1056,22 +1074,22 @@ this.deptBudgetTotal = this.carList.length
|
|
|
message: '保存成功',
|
|
|
})
|
|
|
this.getList()
|
|
|
- //贸易入库需要走再入库接口
|
|
|
- if(this.inWarehouseType == 1){
|
|
|
+ //贸易入库需要再走入库接口
|
|
|
+ if (this.inWarehouseType == 1) {
|
|
|
warehousing.grossWeight /= 1000
|
|
|
warehousing.tare /= 1000
|
|
|
- warehousing.netWeight /= 1000
|
|
|
- warehousing.pureWeight = 1000
|
|
|
+ warehousing.netWeight /= 1000
|
|
|
+ warehousing.pureWeight = 1000
|
|
|
warehousing.deductionAmount *= 1000
|
|
|
- warehousing.deductionWeight /= 1000
|
|
|
+ warehousing.deductionWeight /= 1000
|
|
|
warehousing.statusFlag = 1
|
|
|
- warehousing.inOutFlag =2
|
|
|
- addstorageputList(warehousing).toPromise().then((response) => {
|
|
|
- // if(response == "OK"){
|
|
|
- // this.getList()
|
|
|
- // }
|
|
|
- })
|
|
|
- }
|
|
|
+ warehousing.inOutFlag = 2
|
|
|
+ addstorageputList(warehousing).toPromise().then((response) => {
|
|
|
+ // if(response == "OK"){
|
|
|
+ // this.getList()
|
|
|
+ // }
|
|
|
+ })
|
|
|
+ }
|
|
|
})
|
|
|
.catch((response) => {
|
|
|
// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
@@ -1082,8 +1100,8 @@ this.deptBudgetTotal = this.carList.length
|
|
|
})
|
|
|
} else if (this.tpyeNo == 2) {
|
|
|
this.weighingList.warehouseId = this.cangid;
|
|
|
- (this.weighingList.skinInspector =
|
|
|
- localStorage.getItem('ws-pf_staffName')),
|
|
|
+ this.weighingList.skinInspector = localStorage.getItem('ws-pf_staffName')
|
|
|
+ console.log(this.weighingList)
|
|
|
tare(this.weighingList)
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
@@ -1096,17 +1114,24 @@ this.deptBudgetTotal = this.carList.length
|
|
|
})
|
|
|
this.getList()
|
|
|
//贸易入库需要再走入库接口
|
|
|
- if(this.inWarehouseType == 1){
|
|
|
- warehousing.statusFlag = 3
|
|
|
- warehousing.grossWeight /= 1000
|
|
|
- warehousing.tare /= 1000
|
|
|
- warehousing.netWeight /= 1000
|
|
|
- warehousing.pureWeight = 1000
|
|
|
- warehousing.deductionAmount *= 1000
|
|
|
- warehousing.deductionWeight /= 1000
|
|
|
- warehousing.inOutFlag =2
|
|
|
- addstorageputList(warehousing).toPromise().then((response) => {})
|
|
|
- }
|
|
|
+ if (this.inWarehouseType == 1) {
|
|
|
+
|
|
|
+ getsettleaccout({
|
|
|
+ id: this.weighingList.warehouseInOutId
|
|
|
+ }).toPromise().then((response) => {
|
|
|
+ that.inOutDate = response
|
|
|
+ warehousing.statusFlag = 3
|
|
|
+ warehousing.grossWeight /= 1000
|
|
|
+ warehousing.tare /= 1000
|
|
|
+ warehousing.netWeight /= 1000
|
|
|
+ warehousing.pureWeight = 1000
|
|
|
+ warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
|
|
|
+ warehousing.deductionWeight /= 1000
|
|
|
+ warehousing.inOutFlag = 2
|
|
|
+ that.inOutDate = Object.assign(inOutDate, warehousing)
|
|
|
+ addstorageputList(inOutDate).toPromise().then((response) => {})
|
|
|
+ })
|
|
|
+ }
|
|
|
getPrint({
|
|
|
id: response,
|
|
|
})
|
|
|
@@ -1145,7 +1170,7 @@ this.deptBudgetTotal = this.carList.length
|
|
|
}
|
|
|
|
|
|
.center {
|
|
|
- background: #E8ECF6 ;
|
|
|
+ background: #E8ECF6;
|
|
|
}
|
|
|
|
|
|
.ws-info-table {
|
|
|
@@ -1200,7 +1225,7 @@ this.deptBudgetTotal = this.carList.length
|
|
|
|
|
|
.left {
|
|
|
width: 30%;
|
|
|
- min-width: 500px;
|
|
|
+ min-width: 550px;
|
|
|
position: relative;
|
|
|
// padding:0 20px 20px 20px;
|
|
|
|
|
|
@@ -1273,7 +1298,8 @@ this.deptBudgetTotal = this.carList.length
|
|
|
.video-content {
|
|
|
width: 100%;
|
|
|
}
|
|
|
- .video1{
|
|
|
+
|
|
|
+ .video1 {
|
|
|
text-align: center;
|
|
|
}
|
|
|
}
|
|
|
@@ -1288,12 +1314,17 @@ this.deptBudgetTotal = this.carList.length
|
|
|
.tab {
|
|
|
display: flex;
|
|
|
margin-bottom: 5px;
|
|
|
+
|
|
|
.tab-item {
|
|
|
padding: 5px 10px;
|
|
|
margin-right: 20px;
|
|
|
border-radius: 10px;
|
|
|
}
|
|
|
- .in_css,.in_cssno,.in_cssno1,.in_css1{
|
|
|
+
|
|
|
+ .in_css,
|
|
|
+ .in_cssno,
|
|
|
+ .in_cssno1,
|
|
|
+ .in_css1 {
|
|
|
width: 80px;
|
|
|
height: 32px;
|
|
|
padding: 3px 10px;
|
|
|
@@ -1304,25 +1335,34 @@ this.deptBudgetTotal = this.carList.length
|
|
|
text-align: center;
|
|
|
font-weight: 600;
|
|
|
}
|
|
|
- .in_css:hover,.in_cssno:hover,.in_cssno1:hover,.in_css1:hover{
|
|
|
- cursor:pointer;
|
|
|
- }
|
|
|
- .in_css{
|
|
|
+
|
|
|
+ .in_css:hover,
|
|
|
+ .in_cssno:hover,
|
|
|
+ .in_cssno1:hover,
|
|
|
+ .in_css1:hover {
|
|
|
+ cursor: pointer;
|
|
|
+ }
|
|
|
+
|
|
|
+ .in_css {
|
|
|
color: #5878E8;
|
|
|
background: #F0F6FF;
|
|
|
}
|
|
|
- .in_css1{
|
|
|
- color: #5878E8;
|
|
|
+
|
|
|
+ .in_css1 {
|
|
|
+ color: #5878E8;
|
|
|
+ }
|
|
|
+
|
|
|
+ .in_cssno1 {
|
|
|
+ color: #8890B1;
|
|
|
}
|
|
|
- .in_cssno1{
|
|
|
- color: #8890B1 ;
|
|
|
+
|
|
|
+ /deep/.el-badge__content.is-fixed {
|
|
|
+ top: 3px;
|
|
|
+ right: 26px;
|
|
|
}
|
|
|
- /deep/.el-badge__content.is-fixed{
|
|
|
- top: 3px;
|
|
|
- right: 26px;
|
|
|
- }
|
|
|
}
|
|
|
- .weigh_btn{
|
|
|
+
|
|
|
+ .weigh_btn {
|
|
|
height: 35px;
|
|
|
border-bottom: 1px solid #D8DCE6;
|
|
|
}
|
|
|
@@ -1392,6 +1432,7 @@ this.deptBudgetTotal = this.carList.length
|
|
|
left: 0;
|
|
|
top: 14px;
|
|
|
}
|
|
|
+
|
|
|
.butCss {
|
|
|
// opacity: 0;
|
|
|
margin-left: 20px;
|
|
|
@@ -1435,16 +1476,19 @@ this.deptBudgetTotal = this.carList.length
|
|
|
margin-right: 17px;
|
|
|
bottom: 20px;
|
|
|
}
|
|
|
- .weightInfo{
|
|
|
+
|
|
|
+ .weightInfo {
|
|
|
padding: 10px;
|
|
|
}
|
|
|
- /deep/.el-input.is-disabled .el-input__inner{
|
|
|
+
|
|
|
+ /deep/.el-input.is-disabled .el-input__inner {
|
|
|
background: #F5F7FA !important;
|
|
|
border: none;
|
|
|
}
|
|
|
}
|
|
|
- .titlesign::before{
|
|
|
- content: '';
|
|
|
+
|
|
|
+ .titlesign::before {
|
|
|
+ content: '';
|
|
|
display: inline-block;
|
|
|
width: 5px;
|
|
|
height: 30px;
|
|
|
@@ -1453,7 +1497,8 @@ this.deptBudgetTotal = this.carList.length
|
|
|
left: 0;
|
|
|
top: 14px;
|
|
|
}
|
|
|
- .weightTitle{
|
|
|
+
|
|
|
+ .weightTitle {
|
|
|
width: 100%;
|
|
|
height: 60px;
|
|
|
background: #F6F7FC;
|
|
|
@@ -1478,57 +1523,69 @@ this.deptBudgetTotal = this.carList.length
|
|
|
margin-left: 20px;
|
|
|
border-radius: 4px;
|
|
|
}
|
|
|
- .screen{
|
|
|
+
|
|
|
+ .screen {
|
|
|
margin-bottom: 10px;
|
|
|
width: 100%;
|
|
|
display: flex;
|
|
|
- .screen_left{
|
|
|
+
|
|
|
+ .screen_left {
|
|
|
min-width: 215px;
|
|
|
width: 30%;
|
|
|
display: flex;
|
|
|
|
|
|
- .select_css,.noselect_css{
|
|
|
- width: 76px;
|
|
|
- height: 32px;
|
|
|
- padding: 3px 10px;
|
|
|
- border-radius: 4px;
|
|
|
- margin-right: 10px;
|
|
|
- font-size: 14px;
|
|
|
- line-height: 28px;
|
|
|
- text-align: center;
|
|
|
- }
|
|
|
- .select_css:hover,.noselect_css:hover{
|
|
|
- cursor:pointer;
|
|
|
- }
|
|
|
- .select_css{
|
|
|
- color: #5878E8 ;
|
|
|
- background: #F0F6FF;
|
|
|
- }
|
|
|
+ .select_css,
|
|
|
+ .noselect_css {
|
|
|
+ width: 76px;
|
|
|
+ height: 32px;
|
|
|
+ padding: 3px 10px;
|
|
|
+ border-radius: 4px;
|
|
|
+ margin-right: 10px;
|
|
|
+ font-size: 14px;
|
|
|
+ line-height: 28px;
|
|
|
+ text-align: center;
|
|
|
+ }
|
|
|
+
|
|
|
+ .select_css:hover,
|
|
|
+ .noselect_css:hover {
|
|
|
+ cursor: pointer;
|
|
|
+ }
|
|
|
+
|
|
|
+ .select_css {
|
|
|
+ color: #5878E8;
|
|
|
+ background: #F0F6FF;
|
|
|
+ }
|
|
|
}
|
|
|
- .screen_right{
|
|
|
+
|
|
|
+ .screen_right {
|
|
|
width: 70%;
|
|
|
justify-content: flex-end;
|
|
|
display: flex;
|
|
|
margin-right: 30px;
|
|
|
- .jilu{
|
|
|
- color: #5878E8 ;
|
|
|
+
|
|
|
+ .jilu {
|
|
|
+ color: #5878E8;
|
|
|
}
|
|
|
- .jilu:hover{
|
|
|
- cursor:pointer;
|
|
|
+
|
|
|
+ .jilu:hover {
|
|
|
+ cursor: pointer;
|
|
|
}
|
|
|
}
|
|
|
- /deep/.el-select{
|
|
|
+
|
|
|
+ /deep/.el-select {
|
|
|
width: 50%;
|
|
|
}
|
|
|
}
|
|
|
- .frame{
|
|
|
+
|
|
|
+ .frame {
|
|
|
border-bottom: 1px solid #D8DCE6;
|
|
|
height: 40px;
|
|
|
}
|
|
|
- .word_css{
|
|
|
- margin-left: 15px;
|
|
|
- font-size: 18px;
|
|
|
- font-weight: 600;
|
|
|
- text-align: left;
|
|
|
- }
|
|
|
+
|
|
|
+ .word_css {
|
|
|
+ margin-left: 15px;
|
|
|
+ font-size: 18px;
|
|
|
+ font-weight: 600;
|
|
|
+ text-align: left;
|
|
|
+ }
|
|
|
</style>
|
