|
|
@@ -24,7 +24,6 @@
|
|
|
|
|
|
<div class="bottom">
|
|
|
<div class="bg-left titleup"><span class="word_css">实时监控</span></div>
|
|
|
- <!-- <h2 class="bg-left titleup">实时监控</h2> -->
|
|
|
<div v-if="!monitorUrl1" class="video1">
|
|
|
<img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
|
|
|
<div>监控视频未连接</div>
|
|
|
@@ -57,27 +56,22 @@
|
|
|
</div>
|
|
|
<div class="tab weigh_btn">
|
|
|
<el-badge :value="mListTop.length" class="badge_item">
|
|
|
- <!-- <el-button :type="tpyeNo == 1 ? 'primary':''" @click="tabClick(0)" style="margin-left:10px">称毛重</el-button> -->
|
|
|
<div :class="tpyeNo == 1 ? 'in_css1':'in_cssno1'" @click="tabClick(0)">称毛重</div>
|
|
|
</el-badge>
|
|
|
<el-badge :value="pListTop.length" class="badge_item">
|
|
|
- <!-- <el-button :type="tpyeNo == 2 ? 'primary':''" @click="tabClick(1)" style="margin-left:10px">称皮重</el-button> -->
|
|
|
<div :class="tpyeNo == 2 ? 'in_css1':'in_cssno1'" @click="tabClick(1)">称皮重</div>
|
|
|
</el-badge>
|
|
|
</div>
|
|
|
-
|
|
|
- <!-- </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-if="inWarehouseType == 1">
|
|
|
- <ws-input v-model="weighingList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
|
|
|
- size="small" />
|
|
|
+ <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-if="inWarehouseType == 1">
|
|
|
+ <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>
|
|
|
<ws-form-item label="客户" span="1" prop="customer" v-if="inWarehouseType == 3">
|
|
|
<ws-input v-model="weighingList.customer" placeholder="自动获取，不可编辑" maxlength="100" disabled
|
|
|
size="small" />
|
|
|
@@ -110,27 +104,26 @@
|
|
|
<ws-input disabled v-model="weighingList.titleNoOther" placeholder="暂无"
|
|
|
maxlength="20" size="small" />
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
|
|
|
- <ws-input type="number" @mousewheel.native.prevent v-if="this.index == 0"
|
|
|
+ <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 type="primary" :class="index == 0 ? '' : 'butCss'" @click="openPort">重新获取</el-button>
|
|
|
+ <el-button class="butCss" @click="openPort" v-if="index == 0">重新获取</el-button>
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item label="皮重（公斤）" span="1" prop="tare" v-if="information == '皮重'">
|
|
|
+ <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 type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
|
|
|
+ <el-button class="butCss" v-if="index != 0" @click="openPort">重新获取</el-button>
|
|
|
</ws-form-item>
|
|
|
<div class="formItem">
|
|
|
- <ws-form-item label="扣重（公斤）" span="1" prop="buckleWeightRatio"
|
|
|
- v-if="information == '皮重' && paramType == '2'">
|
|
|
+ <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="净重（公斤）" span="1" prop="netWeight" v-if="information == '皮重'">
|
|
|
+ <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>
|
|
|
@@ -165,12 +158,9 @@
|
|
|
<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>
|
|
|
- <!-- <el-button @click="cutstatus(1)" :type="status==1?'primary':''" v-if="!(inWarehouseType == 1 && tpyeNo == 2)">未称{{information}}</el-button>
|
|
|
- <el-button @click="cutstatus(2)" :type="status==2?'primary':''" v-if="!(inWarehouseType == 1 && tpyeNo == 2)">已称{{information}}</el-button> -->
|
|
|
</div>
|
|
|
<div class="screen_right">
|
|
|
<div @click="record" v-hasPermission="`acquisitionManagement.acquisitionWeight.view`">记录</div>
|
|
|
- <!-- <el-button @click="record" v-hasPermission="`acquisitionManagement.acquisitionWeight.view`">记录</el-button> -->
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
@@ -475,18 +465,6 @@
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
- // for (let i = 0; i < response.records.length; i++) {
|
|
|
- // if (response.records[i].paymentManagement) {
|
|
|
- // if (response.records[i].paymentManagement.status == '待结算' && !response.records[i].paymentManagement
|
|
|
- // .approveStatus) {
|
|
|
- // response.records[i].allow = 1
|
|
|
- // } else {
|
|
|
- // response.records[i].allow = 2
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // response.records[i].allow = 1
|
|
|
- // }
|
|
|
- // }
|
|
|
this.weighingList = response.records
|
|
|
this.common.commonWeighingList = response.records
|
|
|
this.makeData()
|
|
|
@@ -542,24 +520,6 @@
|
|
|
this.carList = this.mList
|
|
|
this.carList1 = this.mListTotal
|
|
|
if (this.mList.length != 0) {
|
|
|
- // let _item = this.mList.filter(function(val) {
|
|
|
- // console.log(that.$route.query.id)
|
|
|
- // if (val.id == that.$route.query.id) {
|
|
|
- // return val
|
|
|
- // }
|
|
|
- // })
|
|
|
- // if (_item.length != 0) {
|
|
|
- // this.setCurrent(_item[0])
|
|
|
-
|
|
|
- // this.weighingList = _item[0]
|
|
|
- // this.carWeightInfo = {
|
|
|
- // carNumber: _item[0].carNumber,
|
|
|
- // type: this.information,
|
|
|
- // weight: this.weighingList.grossWeight,
|
|
|
- // }
|
|
|
-
|
|
|
- // this.weighingList = _item[0]
|
|
|
- // } else {
|
|
|
this.setCurrent(this.mList[0])
|
|
|
|
|
|
this.weighingList = this.mList[0]
|
|
|
@@ -567,7 +527,6 @@
|
|
|
carNumber: this.mList[0].carNumber,
|
|
|
type: this.information,
|
|
|
weight: this.weighingList.grossWeight,
|
|
|
- // }
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
@@ -575,20 +534,6 @@
|
|
|
this.carList = this.pList
|
|
|
this.carList1 = this.pListTotal
|
|
|
if (this.pList.length != 0) {
|
|
|
- // let _item = this.pList.filter(function(val1) {
|
|
|
- // if (val1.id == that.$route.query.id) {
|
|
|
- // return val1
|
|
|
- // }
|
|
|
- // })
|
|
|
- // if (_item.length != 0) {
|
|
|
- // this.setCurrent(_item[0])
|
|
|
- // this.weighingList = _item[0]
|
|
|
- // this.carWeightInfo = {
|
|
|
- // carNumber: _item[0].carNumber,
|
|
|
- // type: this.information,
|
|
|
- // weight: this.weighingList.tare
|
|
|
- // }
|
|
|
- // } else {
|
|
|
this.setCurrent(this.pList[0])
|
|
|
|
|
|
this.weighingList = this.pList[0]
|
|
|
@@ -597,27 +542,7 @@
|
|
|
type: this.information,
|
|
|
weight: this.weighingList.tare
|
|
|
}
|
|
|
- // }
|
|
|
}
|
|
|
- // if (_item.length != 0) {
|
|
|
- // this.setCurrent(_item[0])
|
|
|
- // this.weighingList = _item[0]
|
|
|
- // this.carWeightInfo = {
|
|
|
- // carNumber: _item[0].carNumber,
|
|
|
- // type: this.information,
|
|
|
- // weight: this.weighingList.tare,
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // 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.deptBudgetTotal = this.pList.length
|
|
|
}
|
|
|
this.weighingList.carModel = this.weighingList.qualityInspectionManagement.carModel
|
|
|
@@ -1105,8 +1030,6 @@
|
|
|
} else {
|
|
|
//累计售粮没有超上限完成毛检保存
|
|
|
// this.weighingList.relationId = this.relationId;
|
|
|
- debugger
|
|
|
- console.log(this.weighingList)
|
|
|
grossWeight(this.weighingList)
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
@@ -1137,12 +1060,6 @@
|
|
|
}
|
|
|
})
|
|
|
} else if (this.tpyeNo == 2) {
|
|
|
- // this.weighingList.grossWeight/=1000
|
|
|
- // this.weighingList.tare/=1000
|
|
|
- // if(this.weighingList.buckleMiscellaneous){
|
|
|
- // this.weighingList.buckleMiscellaneous/=1000
|
|
|
- // }
|
|
|
- // this.weighingList.netWeight/=1000
|
|
|
this.weighingList.warehouseId = this.cangid;
|
|
|
(this.weighingList.skinInspector =
|
|
|
localStorage.getItem('ws-pf_staffName')),
|
|
|
@@ -1242,19 +1159,6 @@
|
|
|
margin: 10px;
|
|
|
}
|
|
|
|
|
|
- // .titleup {
|
|
|
- // position: relative;
|
|
|
- // }
|
|
|
-
|
|
|
- // .title::before {
|
|
|
- // content: '';
|
|
|
- // display: inline-block;
|
|
|
- // width: 5px;
|
|
|
- // height: 15px;
|
|
|
- // background: #8890b1;
|
|
|
- // margin-right: 5px;
|
|
|
- // }
|
|
|
-
|
|
|
.substance {
|
|
|
padding-bottom: 20px;
|
|
|
overflow-x: scroll;
|
|
|
@@ -1325,6 +1229,7 @@
|
|
|
.weight {
|
|
|
width: 65%;
|
|
|
text-align: right;
|
|
|
+ color: red;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1461,7 +1366,10 @@
|
|
|
top: 14px;
|
|
|
}
|
|
|
.butCss {
|
|
|
- opacity: 0;
|
|
|
+ // opacity: 0;
|
|
|
+ margin-left: 20px;
|
|
|
+ color: #5473E8;
|
|
|
+ background: #ffffff;
|
|
|
}
|
|
|
|
|
|
/deep/.el-dialog__title {
|
|
|
@@ -1503,6 +1411,10 @@
|
|
|
.weightInfo{
|
|
|
padding: 10px;
|
|
|
}
|
|
|
+ /deep/.el-input.is-disabled .el-input__inner{
|
|
|
+ background: #F5F7FA !important;
|
|
|
+ border: none;
|
|
|
+ }
|
|
|
}
|
|
|
.titlesign::before{
|
|
|
content: '';
|
zhongtianhaoyuan