烘干入库

src/api/V2/warehouse/index.js

@@ -132,4 +132,20 @@ export const API_GET_ENABLEDINFO='/enabledInfo/getEnabledInfo'
 //入库单利率修改
 export const API_SET_ENABLEDINFO='/enabledInfo/api/setEnabledInfo'
 //获取扣重比
-export const API_GET_BYNAME='/purchasePrice/selectByName'
+export const API_GET_BYNAME='/purchasePrice/selectByName'
+//烘干入库  添加车辆
+export const API_POST_ADDCAR='/dryWarehouseCar/api/addDryWarehouseCar'
+//烘干入库  车辆下拉
+export const API_GET_CARXIALA='/dryWarehouseCar/selectCarNumber'
+//烘干入库  车辆列表
+export const API_GET_CARLIST='/dryWarehouseCar/selectCarPage'
+//烘干入库  删除车辆
+export const API_POST_CARDEL='/dryWarehouseCar/api/deleteDryWarehouseCar'
+//烘干入库  提交
+export const API_POST_SUBMIT='/dryWarehouse/api/addDryWarehouse'
+//烘干入库  记录
+export const API_GET_RECORD='/dryWarehouse/selectDryWarehousePage'
+//烘干入库  修改
+export const API_POST_EDITSUBMIT='/dryWarehouse/api/editDryWarehouse'
+//烘干入库  记录删除
+export const API_POST_DELETEINFO='/dryWarehouse/api/deleteDryWarehouse'

src/lang/zh.js

@@ -543,6 +543,10 @@ export default {
     warehouseManagementPutOutLook: '查看',
     transformation: '折转',
     warehouseManagement:'全部仓库',
+    dryWarehousing:'烘干入库',
+    addCar:"常用车辆",
+    dryRecord:"入库记录",
+
     //客户管理
     customerList: '客户管理',
     //客户管理
@@ -4910,7 +4914,10 @@ export default {
     warehouseManagementPutOut: '任务',
     warehouseManagementPutOutLook: '查看',
     transformation: '折转',
-    warehouseManagement:'全部仓库'
+    warehouseManagement:'全部仓库',
+    dryWarehousing:'烘干入库',
+    addCar:"常用车辆",
+    dryRecord:"入库记录",
   },
   //贸易服务
   tradeServicesManagement: {

src/model/warehouse/index.js

@@ -64,7 +64,15 @@ import {
     API_DRYOUT,
     API_GET_ENABLEDINFO,
     API_SET_ENABLEDINFO,
-    API_GET_BYNAME
+    API_GET_BYNAME,
+    API_POST_ADDCAR,
+    API_GET_CARXIALA,
+     API_GET_CARLIST,
+     API_POST_CARDEL,
+     API_POST_SUBMIT,
+     API_GET_RECORD,
+     API_POST_EDITSUBMIT,
+     API_POST_DELETEINFO
     // API_GET_EXPENSEINFO
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
@@ -198,4 +206,25 @@ export const getenabledinfo = appRx.get(API_GET_ENABLEDINFO,errorCatcher, errorH
 //入库单利率修改
 export const setenabledinfo = appRx.post(API_SET_ENABLEDINFO,errorCatcher, errorHandle, filter)
 //获取扣重比
-export const getbyname = appRx.get(API_GET_BYNAME,errorCatcher, errorHandle, filter)
+export const getbyname = appRx.get(API_GET_BYNAME,errorCatcher, errorHandle, filter)
+//烘干入库  添加车辆
+export const addCar = appRx.post(API_POST_ADDCAR,errorCatcher, errorHandle, filter)
+//烘干入库  车辆下拉
+export const carXiala = appRx.get(API_GET_CARXIALA,errorCatcher, errorHandle, filter)
+//烘干入库  车辆列表
+export const carList = appRx.get(API_GET_CARLIST,errorCatcher, errorHandle, filter)
+//烘干入库  删除车辆
+export const delCar = appRx.post(API_POST_CARDEL,errorCatcher, errorHandle, filter)
+//烘干入库  提交
+export const addDryWarehouse = appRx.post(API_POST_SUBMIT,errorCatcher, errorHandle, filter)
+//烘干入库  记录
+export const getRecord = appRx.get(API_GET_RECORD,errorCatcher, errorHandle, filter)
+//烘干入库  修改
+export const editDryWarehouse = appRx.post(API_POST_EDITSUBMIT,errorCatcher, errorHandle, filter)
+//烘干入库  记录删除
+export const delRecord= appRx.post(API_POST_DELETEINFO,errorCatcher, errorHandle, filter)
+
+
+
+
+

src/views/profitable/receipt.vue

@@ -30,7 +30,7 @@
             </ws-select>
           </el-form-item>
            <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="合同费用"' label="合同编号" span="1" prop="contractNo" class="readonly">
-            <el-select v-model="deptBudgetList.contractNo" placeholder="选择合同" class="typeselect" @change="selectcontract">
+            <el-select v-model="deptBudgetList.contractNo" filterable placeholder="选择合同" class="typeselect" @change="selectcontract">
               <el-option v-for="item in contractList" :key="item.contractNo" :label="item.contractNo" :value="item.contractNo"
                 style="color: #8890b1" />
             </el-select>

src/views/warehousenew/addCar.vue

@@ -0,0 +1,698 @@
+<template>
+    <div class="center">
+        <BaseHeaderLayout :leftSpan="12">
+            <template slot="left">
+            </template>
+            <template slot="right">
+                <el-select style="width:400px;" v-model="warehouseName" filterable placeholder="请选择仓库"
+                    @change="warehouseNameChange">
+                    <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
+                        :value="item.warehouseName" style="color: #8890b1" />
+                </el-select>
+            </template>
+        </BaseHeaderLayout>
+        <div style="display: flex;">
+            <div style="background: #f6f7fc; padding: 10px" class="grid-content bg-purple size_css">
+                <BalanceAlert v-if="isShowBalance" ref="weightChild" :deptBudgetList="deptBudgetList"
+                    :information="information" v-on:balanceListen="setVal" class="zujian">
+                </BalanceAlert>
+                <div class="top">
+                    <div class="confirmWeight">
+                        <div class="titleWeight">确认重量</div>
+                        <div v-if="index == 0" class="weight">
+                            {{ weighingList.tare }} <span class="kg-style">kg</span>
+                        </div>
+                        <div v-else class="weight">
+                            {{ weighingList.grossWeight }} <span class="kg-style">kg</span>
+                        </div>
+                    </div>
+                    <div class="confirmInfo">
+                        <div class="car-type">车牌号</div>
+                        <div class="car-no">{{ weighingList.carNo }}</div>
+                    </div>
+                </div>
+                <div class="bg-left titleup">
+                    <span class="word_css">实时监控</span>
+                </div>
+                <div class="bottom">
+                    <div v-if="!monitorUrl1" class="video1">
+                        <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
+                        <div>监控视频未连接</div>
+                    </div>
+                    <div v-else class="video1">
+                        <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen="true"
+                            webkitallowfullscreen="true" mozallowfullscreen="true"
+                            allow="autoplay; fullscreen; microphone;"></iframe>
+                    </div>
+                    <div v-if="!monitorUrl2" class="video1">
+                        <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
+                        <div>监控视频未连接</div>
+                    </div>
+                    <div v-else class="video2">
+                        <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true"
+                            webkitallowfullscreen="true" mozallowfullscreen="true"
+                            allow="autoplay; fullscreen; microphone;"></iframe>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <div class="grid-content bg-purple">
+                            <ws-form class="right-content">
+                                <div class="left1">
+                                    <div class="weightInfo">
+                                        <ws-info-table>
+                                            <ws-form-item label="车牌号" span="1" prop="carNo">
+                                                <ws-input v-model="weighingList.carNo" placeholder="请输入车牌号"
+                                                    maxlength="7" size="small" />
+                                            </ws-form-item>
+                                            <ws-form-item label="皮重(KG)" span="1" prop="tare">
+                                                <ws-input type="number" @mousewheel.native.prevent
+                                                    v-model="weighingList.tare" @input="calculation" placeholder="自动获取"
+                                                    maxlength="20" size="small" :disabled="disabled" />
+                                                <el-button @click="openPort">重新获取</el-button>
+                                            </ws-form-item>
+                                        </ws-info-table>
+                                        <div class="but">
+                                            <el-button @click="submit" type="primary">提交</el-button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </ws-form>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div class="list-info">
+                            <el-table @cell-click="listclick" :data="deliveryList" style="width: 100%; margin-top: 20px"
+                                ref="deliveryList" border>
+                                <el-table-column prop="carNo" width="120" label="车牌号"></el-table-column>
+                                <el-table-column prop="tare" label="皮重(kg)"></el-table-column>
+                                <el-table-column prop="status" label="操作">
+                                    <template scope="scope">
+                                        <span @click="carDel(scope.row)" style="color:#5878E8">删除</span>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                                :current-page="currentPage" :page-size="pageSize"
+                                layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+                            </el-pagination>
+                        </div>
+                    </el-col>
+                </el-row>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import {
+    getweighing,
+    selectWarehouseSelf,
+} from '@/model/outboundManagement/index'
+import {
+    pullDown,
+    addstorageputList,
+    xialaNo,
+    getstaff,
+    carList,
+    addCar,
+    delCar,
+} from '@/model/warehouse/index'
+
+// import axios from 'axios'
+// import html2canvas from 'html2canvas'
+import WsUpload from '@/components/WsUpload'
+import BalanceAlert from '@/components/balanceAlert'
+import {
+    EventBus
+} from 'base-core-lib'
+export default {
+    components: {
+        WsUpload,
+        BalanceAlert
+    },
+    data() {
+        return {
+            isShowBalance: false,
+            isShowPrint: false,
+            warehouseName: '',
+            currentPage: 1,
+            pageSize: 50,
+            disabled: true,
+            tpyeNo: 1,
+            information: '皮重',
+            carChange1: '手动填写',
+            // searchType: '',
+            taskNolist: [],
+            // storageType: [],
+            // carjudge: false,
+            // warehouseType: 1,
+            weighingList: {},
+            deptBudgetList: {},
+            warehouseList: [],
+            warehouseId: "",
+            deliveryList: [],
+            index: "",
+            monitorUrl1: "",
+            monitorUrl2: "",
+            deptBudgetTotal: 0,
+        }
+    },
+    mounted() {
+        this.selectWarehouse()
+        this.isShowBalance = true
+        this.openPort()
+        if (localStorage.getItem('houseSelfCollect_house1')) {
+            if (localStorage.getItem('houseSelfCollect_house1').allowEdit == 1) {
+                this.disabled = false
+            } else {
+                this.disabled = true
+            }
+        }
+    },
+    activated() { },
+    methods: {
+        record() { },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`)
+            this.pageSize = val
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.currentPage = val
+            console.log(`当前页: ${val}`)
+            this.getList()
+        },
+        setVal(data) {
+            if (this.information == '毛重') {
+                this.weighingList.grossWeight = data
+                this.weighingList.netWeight = Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
+            } else {
+                this.weighingList.tare = data
+            }
+        },
+        openPort() {
+            this.$refs.weightChild.openPort()
+        },
+        carDel(val) {
+            this.$confirm('确定删除车辆 ' + val.carNo + " ？", '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    delCar({
+                        id: val.id
+                    })
+                        .toPromise()
+                        .then((response) => {
+                            if (response.code == 200) {
+                                this.$message({
+                                    message: '删除成功！',
+                                    type: 'success'
+                                });
+                                this.getList()
+                            } else {
+                                this.$message({
+                                    message: response.message,
+                                    type: 'error'
+                                });
+                            }
+                        })
+                })
+                .catch(() => {
+                    return false
+                })
+
+        },
+
+        listclick(row) {
+            // this.weighingList = row
+        },
+
+        check(name, type) {
+            if (type == 1) {
+                for (var _tmp = 0; _tmp < this.ewCustomerOptions.length; _tmp++) {
+                    if (this.ewCustomerOptions[_tmp].label == name) {
+                        return false
+                    }
+                }
+                return true
+            } else if (type == 2) {
+                for (var _tmp = 0; _tmp < this.companyNameEWOptions.length; _tmp++) {
+                    if (this.companyNameEWOptions[_tmp].label == name) {
+                        return false
+                    }
+                }
+                return true
+            }
+        },
+        submit() {
+            if (!this.weighingList.carNo) {
+                this.$message({
+                    message: '车牌号不能为空',
+                    type: 'warning',
+                })
+                return
+            }
+            if (this.weighingList.carNo.length < 7) {
+                this.$message({
+                    message: '车牌号输入错误',
+                    type: 'warning',
+                })
+                return
+            }
+            if (!this.weighingList.tare) {
+                this.$message({
+                    message: '皮重不能为空',
+                    type: 'warning',
+                })
+                return
+            }
+            if (
+                isNaN(this.weighingList.tare) ||
+                (String(this.weighingList.tare).indexOf('.') != -1 &&
+                    String(this.weighingList.tare).length -
+                    (String(this.weighingList.tare).indexOf('.') + 1) >
+                    1) ||
+                this.weighingList.tare < 1 ||
+                this.weighingList.tare > 120000
+            ) {
+                this.$message({
+                    message: '皮重输入错误！',
+                    type: 'warning',
+                })
+                return
+            }
+            this.weighingList.warehouseName = this.warehouseName
+            this.$confirm('确定保存车辆信息？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    addCar(this.weighingList)
+                        .toPromise()
+                        .then((response) => {
+                            this.$message({
+                                message: '添加成功！',
+                                type: 'success'
+                            });
+                            this.weighingList.carNo = ""
+                            this.weighingList.tare = ""
+                            this.getList()
+                        })
+                })
+                .catch(() => {
+                    return false
+                })
+        },
+        carNoTypeChange() {
+            this.carjudge = !this.carjudge
+            if (this.carjudge) {
+                this.weighingList.selfLoading = '1'
+                this.carChange1 = '识别下拉'
+            } else {
+                this.weighingList.selfLoading = '0'
+                this.carChange1 = '手动填写'
+            }
+        },
+        tabClick(val) {
+            this.weighingList = {
+                grossWeight: '',
+                tare: '',
+                tips: '',
+                buckleMiscellaneous: 0,
+                netWeight: 0,
+                receivableWeighingFee: '',
+                warehouseInOutDetail: {
+                    grade: '',
+                    imperfectGrain: '',
+                    impurity: '',
+                    jiaorenli: '',
+                    bulkDensity: '',
+                    mildewGrain: '',
+                },
+                qualityInspectionManagement: {
+                    boxNo: '暂无',
+                    boxNoOther: '暂无',
+                    titleNo: '暂无',
+                    titleNoOther: '暂无',
+                },
+            }
+            this.index = val
+            // this.disabled=true
+            if (val == 0) {
+                this.information = '皮重'
+                this.tpyeNo = '1'
+                this.recheck1 = false
+            } else {
+                this.tpyeNo = '2'
+                this.information = '毛重'
+                this.recheck1 = true
+            }
+            this.getList()
+        },
+        warehouseNameChange(e) {
+            for (let i = 0; i < this.warehouseList.length; i++) {
+                if (this.warehouseList[i].warehouseName == e) {
+                    this.warehouseId = this.warehouseList[i].id
+                    this.weighingList.baseId = this.warehouseList[i].id
+                    this.weighingList.warehouseName = this.warehouseList[i].warehouseName
+                    if (this.warehouseList[i].allowEdit == 1) {
+                        this.disabled = false
+                    } else {
+                        this.disabled = true
+                    }
+                }
+            }
+            this.weighingList = {}
+            this.getList()
+        },
+        calculation() {//計算净重
+            if (this.weighingList.grossWeight && this.weighingList.tare) {
+                let count = 0
+                this.weighingList.netWeight =
+                    this.weighingList.grossWeight -
+                    this.weighingList.tare -
+                    Number(
+                        this.weighingList.buckleMiscellaneous ?
+                            this.weighingList.buckleMiscellaneous :
+                            0
+                    )
+            }
+        },
+        selectWarehouse() {
+            selectWarehouseSelf({
+                compId: localStorage.getItem('ws-pf_compId'),
+            })
+                .toPromise()
+                .then((response) => {
+                    var obj = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
+                    if (obj) {
+                        this.warehouseName = obj.value
+                        if (obj.allowEdit == 1) {
+                            this.disabled = false
+                        } else {
+                            this.disabled = true
+                        }
+                        this.warehouseId = obj.warehouseId
+                        this.weighingList.baseId = obj.warehouseId
+                        this.getList()
+                    } else {
+                        this.warehouseName = response[0].warehouseName
+                        this.warehouseId = response[0].id
+                        this.getList()
+                    }
+                    this.warehouseList = response
+                })
+
+        },
+        getList() {
+            carList({
+                baseId: this.warehouseId,
+                currentPage: this.currentPage,
+                pageSize: this.pageSize,
+            })
+                .toPromise()
+                .then((response) => {
+                    this.deliveryList = response.records
+                    this.deptBudgetTotal = response.total
+                })
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.center {
+    background: #fff;
+}
+
+.size_css {
+    width: 540px;
+    min-width: 540px;
+    overflow-x: scroll;
+    position: relative;
+}
+
+.ws-info-table {
+    border: none;
+}
+
+.base_header_layout {
+    padding: 10px;
+    margin-bottom: 10px;
+}
+
+.ws-info-table .el-form-item {
+    width: 50%;
+    border: none;
+}
+
+.formItem {
+    width: 100%;
+    display: inline;
+}
+
+.ws-info-table {
+    border: none;
+}
+
+.ws-info-table .el-form-item {
+    width: 100%;
+    border: none;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 30%;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+}
+
+/deep/.el-textarea__inner {
+    width: 92%;
+}
+
+/deep/.ws-info-table .el-form-item.rememo .el-form-item__content {
+    height: 76px;
+}
+
+.title {
+    font-size: 16px;
+    font-weight: 600;
+    margin: 10px;
+}
+
+.titleup {
+    position: relative;
+}
+
+.title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 15px;
+    background: #8890b1;
+    margin-right: 5px;
+}
+
+.substance {
+    background: #ffffff;
+    width: 100%;
+    border-radius: 4px;
+    margin: 0 auto;
+    padding-top: 20px;
+}
+
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+    text-align: center;
+}
+
+/deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+}
+
+.bg-left {
+    padding-left: 30px;
+}
+
+.bg-right {
+    padding-right: 10px;
+    text-align: right;
+}
+
+.bg-bottom {
+    margin: 15px 0px;
+}
+
+.titleup {
+    position: relative;
+}
+
+.el-upload--picture-card {
+    background-color: #fbfdff;
+    border: 1px dashed #c0ccda;
+    border-radius: 6px;
+    box-sizing: border-box;
+    width: 148px;
+    height: 148px;
+    line-height: 146px;
+    vertical-align: top;
+    margin-left: -289px;
+}
+
+.but {
+    text-align: center;
+    margin: 20px auto;
+}
+
+.top {
+    background: black;
+    color: #2aff7c;
+    font-size: 32px;
+    text-align: right;
+    padding: 0 10px 0 20px;
+    border-radius: 10px;
+    margin: 0 20px 20px 21px;
+    position: absolute;
+    top: 140px;
+    width: 465px;
+
+    .zujian {
+        position: relative;
+    }
+
+    .kg-style {
+        font-size: 30px;
+        color: red;
+    }
+
+    .confirmInfo {
+        display: flex;
+
+        .car-type {
+            text-align: left;
+            width: 50%;
+            min-width: 200px;
+        }
+
+        .car-no {
+            width: 50%;
+            text-align: right;
+        }
+    }
+
+    .confirmWeight {
+        display: flex;
+        align-items: center;
+
+        .titleWeight {
+            width: 35%;
+            min-width: 200px;
+            text-align: left;
+            line-height: 90px;
+            color: red;
+        }
+
+        .weight {
+            width: 65%;
+            text-align: right;
+            color: red;
+        }
+    }
+}
+
+.bottom {
+    // text-align: center;
+    background: white;
+    margin: 20px 20px 0 20px;
+    // border-radius: 10px;
+    padding-bottom: 20px;
+
+    .img1,
+    .img2 {
+        width: 200px;
+        padding: 20px;
+    }
+
+    .video-content {
+        width: 100%;
+    }
+
+    .video1 {
+        text-align: center;
+    }
+}
+
+/deep/.title_css .el-dialog__header {
+    text-align: center !important;
+}
+
+.bottom-btn {
+    display: flex;
+    margin-top: 20px;
+    justify-content: space-around;
+}
+
+/deep/.el-radio-group {
+    width: 100%;
+    display: flex;
+}
+
+/deep/.el-radio__label {
+    font-size: 20px;
+}
+
+/deep/.el-radio__inner {
+    // background: red;
+    height: 20px;
+    width: 20px;
+}
+
+.label-width {
+    width: 100%;
+    text-align: center;
+    font-size: 20px;
+}
+
+.show-excel {
+    opacity: 0;
+}
+
+/deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+}
+
+/deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+.sh-address {
+    display: flex;
+}
+
+.print-type-ew {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 20px;
+
+    /deep/.el-radio__label {
+        font-size: 14px;
+    }
+
+    margin-top: 10px;
+}
+.right-content{
+    margin-top: 20px;
+}
+</style>

src/views/warehousenew/component/router/index.js

@@ -462,6 +462,51 @@ const warehouseManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
       },
     },
+    {
+      path: 'dryWarehousing',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/dryWarehousing'),
+      name: 'dryWarehousing',
+      meta: {
+        title: 'dryWarehousing',
+        shortcutEntrance: 'dryWarehousing',
+        module: 'warehouseManagement.warehouse.warehouseInfo',
+        permissicon: [],
+        keepAlive: true,
+        _title:'烘干入库'
+      },
+      hidden: true
+    },
+    {
+      path: 'addCar',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/addCar'),
+      name: 'addCar',
+      meta: {
+        title: 'addCar',
+        shortcutEntrance: 'addCar',
+        module: 'warehouseManagement.warehouse.warehouseInfo',
+        permissicon: [],
+        keepAlive: true,
+        _title:'常用车辆'
+      },
+      hidden: true
+    },
+    {
+      path: 'dryRecord',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/dryRecord'),
+      name: 'dryRecord',
+      meta: {
+        title: 'dryRecord',
+        shortcutEntrance: 'dryRecord',
+        module: 'warehouseManagement.warehouse.warehouseInfo',
+        permissicon: [],
+        keepAlive: true,
+        _title:'入库记录'
+      },
+      hidden: true
+    },
   ],
 };
 export default warehouseManagementRouter;

src/views/warehousenew/dryRecord.vue

@@ -0,0 +1,506 @@
+// 烘干入库记录
+<template>
+    <div class="container">
+        <el-row class="toptitle">
+            <el-col :span="12">
+                <h2 class="bg-left title">检斤记录</h2>
+            </el-col>
+            <el-col :span="12" class="bg-right">
+                <el-button type="primary" size="small" @click="returnsales()">
+                    <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
+                        src="../../../public/img/lujing.png" alt="" />返回
+                </el-button>
+            </el-col>
+        </el-row>
+        <div class="center">
+            <el-row>
+                <el-col :span="6" style="height: 45px"></el-col>
+                <el-col :span="18" class="bg-right">
+                    <div style="display:flex">
+                        <el-select style='margin-right:5px; width:40%' v-model="warehouseName" placeholder="请选择仓库名"
+                            @change="warehouseNameChange">
+                            <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
+                                :value="item.warehouseName"></el-option>
+                        </el-select>
+                        <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels
+                            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                            :picker-options="pickerOptions">
+                        </el-date-picker>
+                        <el-input placeholder=" 可按车牌号和检斤员姓名查找" clearable v-model="searchKeyWord" class="search_css">
+                        </el-input>
+                        <el-button type="primary" size="small" @click="lookup">查找</el-button>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="18" style="height: 20px"></el-col>
+                <el-col :span="6">
+                    <div style="text-align:right;margin-right:20px">净重合计（吨）：{{ count }}</div>
+                </el-col>
+            </el-row>
+            <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="700"
+                @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column type="index" label="序号" width="80">
+                    <template scope="scope">
+                        <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+                        <span v-else>{{ scope.$index + 1 }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="dryNumber" label="业务编号"></el-table-column>
+                <el-table-column prop="carNo" label="车牌号" width="130"></el-table-column>
+                <el-table-column prop="goodsName" label="货名"></el-table-column>
+                <el-table-column prop="weigher" label="检斤员"></el-table-column>
+                <el-table-column prop="grossWeight" label="毛重（吨）" width="100"></el-table-column>
+                <el-table-column prop="tare" label="皮重（吨）" width="100"></el-table-column>
+                <el-table-column prop="netWeight" label="净重（吨）" width="100"></el-table-column>
+                <el-table-column prop="status" label="状态"></el-table-column>
+                <el-table-column prop="updateDate" label="检斤时间"></el-table-column>
+                <el-table-column label="操作">
+                    <template scope="scope">
+                        <el-button @click="deleteInfo(scope.row)" v-if="scope.row.status == '待称皮重'">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <div style="text-align: center; padding: 10px">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="currentPage" :page-size="deptCircularPage.pageSize"
+                layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import {
+    delRecord,
+    getRecord
+} from '@/model/warehouse/index'
+import {
+    selectWarehouseSelf,
+} from '@/model/outboundManagement/index'
+export default {
+    data() {
+        return {
+            weighingRecordList: [],
+            warehouseId: '',
+            warehouseName: '',
+            compId: '',
+            //分页
+            currentPage: 1,
+            pageSize: 10,
+            value2: [],
+            deptCircularPage: {},
+            deptBudgetTotal: 0,
+            warehouseList: [], //仓库
+            searchKeyWord: '',
+            title: '',
+            modification: [],
+            count: 0,//合计
+            startDate: '',
+            endDate: '',
+            pickerOptions: {
+                shortcuts: [{
+                    text: '本周',
+                    onClick(picker) {
+                        const end = new Date()
+                        const start = new Date()
+                        var thisDay = start.getDay()
+                        var thisDate = start.getDate()
+                        if (thisDay != 0) {
+                            start.setDate(thisDate - thisDay)
+                        }
+                        picker.$emit('pick', [start, end])
+                    },
+                },
+                {
+                    text: '本月',
+                    onClick(picker) {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setDate(1)
+                        picker.$emit('pick', [start, end])
+                    },
+                },
+                {
+                    text: '本季度',
+                    onClick(picker) {
+                        var oDate = new Date()
+
+                        var thisYear = oDate.getFullYear()
+                        var thisMonth = oDate.getMonth() + 1
+
+                        var n = Math.ceil(thisMonth / 3) // 季度
+
+                        var Month = n * 3 - 1
+
+                        var start = new Date(thisYear, Month - 2, 1)
+                        var end = new Date()
+
+                        picker.$emit('pick', [start, end])
+                    },
+                },
+                ],
+            },
+
+        }
+    },
+    activated() {
+        //仓库
+        selectWarehouseSelf({
+            compId: localStorage.getItem('ws-pf_compId'),
+        })
+            .toPromise()
+            .then((response) => {
+                this.warehouseList = response
+            })
+        this.compId = localStorage.getItem('ws-pf_compId')
+        this.warehouseName = this.$route.query.warehouseName //仓库名
+        this.warehouseId = this.$route.query.warehouseId //仓库Id
+        this.getList()
+    },
+    methods: {
+
+        deleteInfo(row) {
+            //删除
+            this.$confirm('确定删除检斤信息？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    delRecord({
+                        id: row.id,
+                    })
+                        .toPromise()
+                        .then((response) => {
+                            this.$notify.success({
+                                title: '成功',
+                                message: '删除成功',
+                            })
+                            this.getList()
+                        })
+                        .catch((response) => {
+                            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                        })
+                })
+                .catch(() => {
+                    return false
+                })
+        },
+        handleSelectionChange(val) {
+            this.modification = val;
+            this.count = 0
+            for (let i = 0; i < this.modification.length; i++) {
+                if (this.modification[i].netWeight) {
+                    this.count += this.modification[i].netWeight
+                }
+            }
+        },
+        dateFormat(fmt, date) {
+            let ret
+            const opt = {
+                'Y+': date.getFullYear().toString(), // 年
+                'm+': (date.getMonth() + 1).toString(), // 月
+                'd+': date.getDate().toString(), // 日
+                'H+': date.getHours().toString(), // 时
+                // "M+": date.getMinutes().toString(),         // 分
+                // "S+": date.getSeconds().toString()          // 秒
+                // 有其他格式化字符需求可以继续添加，必须转化成字符串
+            }
+            for (let k in opt) {
+                ret = new RegExp('(' + k + ')').exec(fmt)
+                if (ret) {
+                    fmt = fmt.replace(
+                        ret[1],
+                        ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+                    )
+                }
+            }
+            return fmt
+        },
+        lookup() {
+            if (this.value2.length > 0) {
+                this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+                this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+            } else {
+                this.startDate = ''
+                this.endDate = ''
+            }
+            this.currentPage = 1
+            this.getList()
+        },
+        returnsales() {
+            this.$router.go(-1)
+        },
+        warehouseNameChange(e) {
+            for (let i = 0; i < this.warehouseList.length; i++) {
+                if (e == this.warehouseList[i].warehouseName) {
+                    this.warehouseId = this.warehouseList[i].id
+                }
+            }
+            this.getList()
+        },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`)
+            this.pageSize = val
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.currentPage = val
+            console.log(`当前页: ${val}`)
+            this.getList()
+        },
+        getList() {
+            // 列表
+            getRecord({
+                baseId: this.warehouseId,
+                currentPage: this.currentPage,
+                pageSize: this.pageSize,
+                searchKeyWord: this.searchKeyWord,
+                searchType: "",
+                startDate: this.startDate,
+                endDate: this.endDate,
+            })
+                .toPromise()
+                .then((response) => {
+                    this.weighingRecordList = response.records
+                    for (let i = 0; i < this.weighingRecordList.length; i++) {
+                        if (this.weighingRecordList[i].grossWeight) {
+                            this.weighingRecordList[i].grossWeight /= 1000
+                        }
+                        if (this.weighingRecordList[i].tare) {
+                            this.weighingRecordList[i].tare /= 1000
+                        }
+                        if (this.weighingRecordList[i].netWeight) {
+                            this.weighingRecordList[i].netWeight /= 1000
+                        }
+                    }
+                    this.deptBudgetTotal = response.total
+                })
+                .catch((response) => {
+                    // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                })
+        },
+
+    },
+}
+</script>
+<style lang="scss" scoped>
+.toptitle {
+    background: #f6f7fc;
+}
+
+.bg-left {
+    padding-left: 30px;
+}
+
+.bg-right {
+    text-align: right;
+    padding: 16px 20px;
+}
+
+.top-title {
+    width: 50%;
+    display: flex;
+}
+
+.title {
+    position: relative;
+}
+
+.title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+}
+
+.container {
+    overflow: scroll;
+    height: 93vh;
+}
+
+.center {
+    margin: auto;
+}
+
+.centertitle {
+    display: flex;
+    margin: 10px 0;
+}
+
+.temporary {
+    line-height: 80px;
+    font-size: 20px;
+    color: #abaaaa;
+}
+
+/deep/.forData .cell {
+    text-align: center;
+}
+
+//弹出框
+.eject-warehouse {
+    font-size: 20px;
+    margin-left: 15px;
+    font-weight: 600;
+}
+
+.table_css {
+    margin: 20px auto;
+
+    tr {
+        height: 50px;
+    }
+
+    .table_item {
+        min-width: 70px;
+    }
+
+    td {
+        text-align: center;
+        font-size: 18px;
+        font-weight: 600;
+    }
+
+    .el-select {
+        width: 90%;
+    }
+}
+
+.btn_topcss {
+    margin-top: 15px;
+
+}
+
+.btn_css {
+    width: 90px;
+    margin-left: 10px;
+}
+
+.search_css {
+    margin: 0 20px;
+}
+
+.mask {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 99;
+    opacity: 0.3;
+}
+
+.print-type-title {
+    text-align: center;
+    font-size: 18px;
+    margin: 20px;
+}
+
+.bottom-btn {
+    display: flex;
+    margin-top: 20px;
+    justify-content: space-around;
+}
+
+.print-type-checkbox {
+    // padding-left: 20px;
+}
+
+.print-type {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 440px;
+    height: 320px;
+    background: white;
+    border-radius: 10px;
+    z-index: 999;
+}
+
+/deep/.el-radio-group {
+    width: 100%;
+    display: flex;
+}
+
+/deep/.el-radio__label {
+    font-size: 20px;
+}
+
+/deep/.el-radio__inner {
+    // background: red;
+    height: 20px;
+    width: 20px;
+}
+
+.label-width {
+    width: 100%;
+    text-align: center;
+    font-size: 20px;
+}
+
+.show-excel {
+    opacity: 0;
+}
+
+/deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+}
+
+/deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+.ew-print {
+    padding: 0 20px;
+    margin-top: 10px;
+
+    // display: flex;
+    // justify-content: space-between;
+    // align-content: center;
+    .row {
+        display: flex;
+        margin-top: 10px;
+        align-items: center;
+    }
+}
+
+.sh-address {
+    display: flex;
+}
+
+.print-type-ew {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 20px;
+
+    /deep/.el-radio__label {
+        font-size: 14px;
+    }
+
+    margin-top: 10px;
+}
+
+/deep/.el-table .cell {
+    text-align: center;
+}
+
+.shdw-style {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+    margin-top: 20px;
+}
+</style>

src/views/warehousenew/dryWarehousing.vue

@@ -0,0 +1,823 @@
+<template>
+    <div class="center">
+        <BaseHeaderLayout :leftSpan="12">
+            <template slot="left"> </template>
+            <template slot="right">
+                <el-select style="width: 400px" v-model="warehouseName" filterable placeholder="请选择仓库"
+                    @change="warehouseNameChange">
+                    <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
+                        :value="item.warehouseName" style="color: #8890b1" />
+                </el-select>
+            </template>
+        </BaseHeaderLayout>
+        <div style="display: flex">
+            <div style="background: #f6f7fc; padding: 10px" class="grid-content bg-purple size_css">
+                <BalanceAlert v-if="isShowBalance" ref="weightChild" :deptBudgetList="deptBudgetList"
+                    :information="information" v-on:balanceListen="setVal" class="zujian">
+                </BalanceAlert>
+                <div class="top">
+                    <div class="confirmWeight">
+                        <div class="titleWeight">确认重量</div>
+                        <div v-if="index == 0" class="weight">
+                            {{ weighingList.tare }} <span class="kg-style">kg</span>
+                        </div>
+                        <div v-else class="weight">
+                            {{ weighingList.grossWeight }} <span class="kg-style">kg</span>
+                        </div>
+                    </div>
+                    <div class="confirmInfo">
+                        <div class="car-type">车牌号</div>
+                        <div class="car-no">{{ weighingList.carNumber }}</div>
+                    </div>
+                </div>
+                <div class="bg-left titleup">
+                    <span class="word_css">实时监控</span>
+                </div>
+                <div class="bottom">
+                    <div v-if="!monitorUrl1" class="video1">
+                        <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
+                        <div>监控视频未连接</div>
+                    </div>
+                    <div v-else class="video1">
+                        <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen="true"
+                            webkitallowfullscreen="true" mozallowfullscreen="true"
+                            allow="autoplay; fullscreen; microphone;"></iframe>
+                    </div>
+                    <div v-if="!monitorUrl2" class="video1">
+                        <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
+                        <div>监控视频未连接</div>
+                    </div>
+                    <div v-else class="video2">
+                        <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true"
+                            webkitallowfullscreen="true" mozallowfullscreen="true"
+                            allow="autoplay; fullscreen; microphone;"></iframe>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <div class="grid-content bg-purple">
+                            <div class="tab weigh_btn">
+                                <el-button :type="tpyeNo == 2 ? 'primary' : ''">
+                                    <div @click="tabClick(1)">称毛重</div>
+                                </el-button>
+                                <el-button :type="tpyeNo == 1 ? 'primary' : ''">
+                                    <div @click="tabClick(0)">称皮重</div>
+                                </el-button>
+                            </div>
+                            <ws-form class="right-content">
+                                <div class="left1">
+                                    <div class="weightInfo">
+                                        <ws-info-table>
+                                            <ws-form-item label="货名" span="1" prop="tare">
+                                                <el-select style="width: 400px" v-model="weighingList.goodsName"
+                                                    filterable placeholder="请选择货名" @change="goodsNameChange"
+                                                    :disabled="tpyeNo == 1">
+                                                    <el-option v-for="item in goodsNameList" :key="item.constValue"
+                                                        :label="item.constValue" :value="item.constValue"
+                                                        style="color: #8890b1" />
+                                                </el-select>
+                                            </ws-form-item>
+                                            <ws-form-item label="车牌号" span="1" prop="carNo">
+                                                <ws-input @mousewheel.native.prevent v-if="cartips == '下拉选择'"
+                                                    v-model="weighingList.carNo" placeholder="请输入车牌号" maxlength="7"
+                                                    size="small" :disabled="tpyeNo == 1" />
+                                                <el-select style="width: 400px" v-model="weighingList.carNo" filterable
+                                                    v-else placeholder="请选择车牌号" @change="carNochange"
+                                                    :disabled="tpyeNo == 1">
+                                                    <el-option v-for="item in carList" :key="item.carNo"
+                                                        :label="item.carNo" :value="item.id" style="color: #8890b1" />
+                                                </el-select>
+                                                <el-button @click="carNoTypechange" v-if="tpyeNo == 2">{{ cartips }}
+                                                </el-button>
+                                            </ws-form-item>
+                                            <ws-form-item label="毛重(KG)" span="1" prop="grossWeight">
+                                                <ws-input type="number" @mousewheel.native.prevent
+                                                    v-model="weighingList.grossWeight" @input="calculation"
+                                                    placeholder="自动获取" maxlength="100" size="small"
+                                                    :disabled="disabled || tpyeNo == 1" />
+                                                <el-button v-if="tpyeNo == 2" @click="openPort">
+                                                    重新获取</el-button>
+                                            </ws-form-item>
+                                            <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="cartips == '手动输入'">
+                                                <ws-input type="number" @mousewheel.native.prevent
+                                                    v-model="weighingList.tare" @input="calculation" placeholder="自动获取"
+                                                    maxlength="100" size="small" :disabled="disabled" />
+                                                <el-button v-if="tpyeNo == 1" @click="openPort">
+                                                    重新获取</el-button>
+                                            </ws-form-item>
+                                            <ws-form-item label="净重(KG)" span="1" prop="tare" v-if="cartips == '手动输入'">
+                                                <ws-input type="number" @mousewheel.native.prevent
+                                                    v-model="weighingList.netWeight" @input="calculation"
+                                                    placeholder="自动计算" maxlength="100" size="small" disabled />
+                                            </ws-form-item>
+                                        </ws-info-table>
+                                        <div class="but">
+                                            <el-button @click="submit" type="primary">提交</el-button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </ws-form>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div class="list-info">
+                            <div style="justify-content: space-between" class="flex">
+                                <div style="display: flex;">
+                                    <el-button @click="record" type="primary">记录</el-button>
+                                    <el-button @click="addCar" type="primary">添加车辆</el-button>
+                                </div>
+                            </div>
+                            <el-table @cell-click="listclick" :data="deliveryList" style="width: 100%; margin-top: 20px"
+                                ref="deliveryList" border>
+                                <el-table-column prop="dryNumber" width="120" label="业务编号"></el-table-column>
+                                <el-table-column prop="carNo" label="车牌号"></el-table-column>
+                                <el-table-column prop="status" label="状态"></el-table-column>
+                            </el-table>
+                            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                                :current-page="currentPage" :page-size="pageSize"
+                                layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+                            </el-pagination>
+                        </div>
+                    </el-col>
+                </el-row>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import {
+    selectWarehouseSelf,
+} from '@/model/outboundManagement/index'
+import {
+    pullDown,
+    carXiala,
+    addDryWarehouse,
+    getRecord,
+    editDryWarehouse,
+} from '@/model/warehouse/index'
+import { hasPermission } from '../../utils/getHasPermission'
+import WsUpload from '@/components/WsUpload'
+import BalanceAlert from '@/components/balanceAlert'
+import { EventBus } from 'base-core-lib'
+export default {
+    components: {
+        WsUpload,
+        BalanceAlert,
+    },
+    data() {
+        return {
+            isShowBalance: false,
+            isShowPrint: false,
+            warehouseName: '',
+            currentPage: 1,
+            pageSize: 10,
+            disabled: true,
+            tpyeNo: 2,
+            information: '毛重',
+            carChange1: '手动填写',
+            taskNolist: [],
+            deliveryList: [],
+            warehouseType: 1,
+            weighingList: {},
+            deptBudgetList: {},
+            warehouseList: [],
+            goodsNameList: [],
+            carList: [],
+            index: '',
+            monitorUrl1: '',
+            monitorUrl2: '',
+            deptBudgetTotal: 0,
+            cartips: '手动输入',
+            warehouseId: '',
+        }
+    },
+    mounted() { },
+    activated() {
+        this.selectWarehouse()
+        this.getGoodsList()
+        this.isShowBalance = true
+        this.openPort()
+    },
+    methods: {
+        goodsNameChange(e) {
+            this.weighingList.goodsName = e
+            for (let i = 0; i < this.goodsNameList.length; i++) {
+                if (e == this.goodsNameList[i].constValue) {
+                    this.weighingList.goodsNameKey = this.goodsNameList[i].constKey
+                    break
+                }
+            }
+        },
+        getCarXiaLa() {
+            carXiala({
+                baseId: this.warehouseId,
+            })
+                .toPromise()
+                .then((response) => {
+                    this.carList = response
+                })
+        },
+        getGoodsList() {
+            pullDown({
+                constId: 'CON2',
+            })
+                .toPromise()
+                .then((response) => {
+                    for (let i = 0; i < response.length; i++) {
+                        if (response[i].constValue.indexOf('潮粮') == -1) {
+                            this.goodsNameList.push(response[i])
+                        }
+                    }
+                    this.weighingList.goodsName = this.goodsNameList[0].constValue
+                    this.weighingList.goodsNameKey = this.goodsNameList[0].constKey
+                })
+        },
+        carNochange(e) {
+            //车牌号下拉选中
+            for (let i = 0; i < this.carList.length; i++) {
+                if (e == this.carList[i].id) {
+                    this.weighingList.carNo = this.carList[i].carNo
+                    this.weighingList.tare = this.carList[i].tare
+                    break
+                }
+            }
+        },
+        carNoTypechange() {
+            if (this.cartips == '手动输入') {
+                this.cartips = '下拉选择'
+            } else {
+                this.cartips = '手动输入'
+            }
+        },
+        record() {
+            this.$router.push({
+                path: 'dryRecord',
+                query: {
+                    warehouseName: this.warehouseName,
+                    warehouseId: this.warehouseId
+                }
+            })
+        },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`)
+            this.pageSize = val
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.currentPage = val
+            console.log(`当前页: ${val}`)
+            this.getList()
+        },
+        setVal(data) {
+            if (this.information == '毛重') {
+                this.weighingList.grossWeight = data
+                this.weighingList.netWeight =
+                    Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
+            } else {
+                this.weighingList.tare = data
+            }
+        },
+        openPort() {
+            this.$refs.weightChild.openPort()
+        },
+
+        listclick(row) {
+            this.weighingList = row
+            this.information = '皮重'
+            this.cartips = '手动输入'
+            this.tpyeNo = '1'
+        },
+        addCar() {
+            this.$router.push({
+                path: 'addCar',
+            })
+        },
+
+        submit() {
+            var allow = hasPermission('warehouseManagement.warehouse.warehouseInfo.hong')
+            if (!allow) {// 提交为外勤权限，错误提示“暂未获得权限”
+                this.$message({
+                    message: '暂未获得权限，不可保存检斤信息！',
+                    type: 'warning',
+                })
+                return
+            }
+            this.weighingList.compId = localStorage.getItem('ws-pf_compId')
+            this.weighingList.weigher = localStorage.getItem('ws-pf_staffName')
+            this.weighingList.warehouseName = this.warehouseName
+            if (this.tpyeNo == 2) {
+                this.weighingList.statusFlag = 1
+                if (!this.weighingList.goodsName) {
+                    this.$message({
+                        message: '货名不能为空',
+                        type: 'warning',
+                    })
+                    return
+                }
+                if (!this.weighingList.carNo) {
+                    this.$message({
+                        message: '车牌号不能为空',
+                        type: 'warning',
+                    })
+                    return
+                }
+                if (!this.weighingList.grossWeight) {
+                    this.$message({
+                        message: '毛重不能为空',
+                        type: 'warning',
+                    })
+                    return
+                }
+                if (
+                    isNaN(this.weighingList.grossWeight) ||
+                    (String(this.weighingList.grossWeight).indexOf('.') != -1 &&
+                        String(this.weighingList.grossWeight).length -
+                        (String(this.weighingList.grossWeight).indexOf('.') + 1) >
+                        1) ||
+                    this.weighingList.grossWeight < 1 ||
+                    this.weighingList.grossWeight > 100000
+                ) {
+                    this.$message({
+                        message: '毛重输入错误！',
+                        type: 'warning',
+                    })
+                    return
+                }
+                if (this.cartips == '手动输入') {
+                    this.weighingList.statusFlag = 3
+                    if (!this.weighingList.tare) {
+                        this.$message({
+                            message: '皮重不能为空',
+                            type: 'warning',
+                        })
+                        return
+                    }
+                    if (
+                        isNaN(this.weighingList.tare) ||
+                        (String(this.weighingList.tare).indexOf('.') != -1 &&
+                            String(this.weighingList.tare).length -
+                            (String(this.weighingList.tare).indexOf('.') + 1) >
+                            1) ||
+                        this.weighingList.tare < 1 ||
+                        this.weighingList.tare > 100000
+                    ) {
+                        this.$message({
+                            message: '皮重输入错误！',
+                            type: 'warning',
+                        })
+                        return
+                    }
+                    if (this.weighingList.netWeight < 0) {
+                        this.$message({
+                            message: '净重不能为负',
+                            type: 'warning',
+                        })
+                        return
+                    }
+                }
+            }
+            if (this.tpyeNo == 1) { //称皮重
+                this.weighingList.statusFlag = 3
+                if (!this.weighingList.tare) {
+                    this.$message({
+                        message: '皮重不能为空',
+                        type: 'warning',
+                    })
+                    return
+                }
+                if (
+                    isNaN(this.weighingList.tare) ||
+                    (String(this.weighingList.tare).indexOf('.') != -1 &&
+                        String(this.weighingList.tare).length -
+                        (String(this.weighingList.tare).indexOf('.') + 1) >
+                        1) ||
+                    this.weighingList.tare < 1 ||
+                    this.weighingList.tare > 100000
+                ) {
+                    this.$message({
+                        message: '皮重输入错误！',
+                        type: 'warning',
+                    })
+                    return
+                }
+                if (this.weighingList.netWeight < 0) {
+                    this.$message({
+                        message: '净重不能为负',
+                        type: 'warning',
+                    })
+                    return
+                }
+            }
+
+            this.$confirm('确定保存检斤信息？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    if (this.tpyeNo == 2) { //称毛重
+                        addDryWarehouse(this.weighingList)
+                            .toPromise()
+                            .then((response) => {
+                                this.$message({
+                                    message: '操作成功！',
+                                    type: 'success'
+                                });
+                                this.weighingList.carNo = ""
+                                this.weighingList.grossWeight = ""
+                                this.weighingList.tare = ""
+                                this.weighingList.netWeight = ""
+                                this.getList()
+                            })
+                    } else if (this.tpyeNo == 1) {//称皮重
+                        editDryWarehouse(this.weighingList)
+                            .toPromise()
+                            .then((response) => {
+                                this.$message({
+                                    message: '操作成功！',
+                                    type: 'success'
+                                });
+                                this.weighingList.carNo = ""
+                                this.weighingList.grossWeight = ""
+                                this.weighingList.tare = ""
+                                this.weighingList.netWeight = ""
+                                this.getList()
+                            })
+                    }
+
+                })
+                .catch(() => {
+                    return false
+                })
+        },
+        tabClick(val) {
+            this.weighingList = {}
+            this.index = val
+            if (val == 0) {
+                this.information = '皮重'
+                this.tpyeNo = '1'
+                this.cartips = '手动输入'//用来点称皮重时显示皮重输入框
+            } else {
+                this.tpyeNo = '2'
+                this.information = '毛重'
+            }
+            this.getList()
+        },
+        warehouseNameChange(e) {
+            for (let i = 0; i < this.warehouseList.length; i++) {
+                if (this.warehouseList[i].warehouseName == e) {
+                    this.warehouseId = this.warehouseList[i].id
+                    this.weighingList.baseId = this.warehouseList[i].id
+                    this.weighingList.warehouseNo = this.warehouseList[i].commonWarehouseNo
+                    if (this.warehouseList[i].allowEdit == 1) {
+                        this.disabled = false
+                    } else {
+                        this.disabled = true
+                    }
+                }
+            }
+            this.getList()
+            this.getCarXiaLa()
+        },
+        calculation() {
+            //計算净重
+            if (this.weighingList.grossWeight && this.weighingList.tare) {
+                let count = 0
+                this.weighingList.netWeight =
+                    this.weighingList.grossWeight -
+                    this.weighingList.tare -
+                    Number(
+                        this.weighingList.buckleMiscellaneous
+                            ? this.weighingList.buckleMiscellaneous
+                            : 0
+                    )
+            }
+        },
+        selectWarehouse() {
+            selectWarehouseSelf({
+                compId: localStorage.getItem('ws-pf_compId'),
+            })
+                .toPromise()
+                .then((response) => {
+                    this.warehouseList = response
+                    var obj = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
+                    if (obj) {
+                        this.warehouseName = obj.value
+                        if (obj.allowEdit == 1) {
+                            this.disabled = false
+                        } else {
+                            this.disabled = true
+                        }
+                        this.warehouseId = obj.warehouseId
+                        this.weighingList.baseId = obj.warehouseId
+                        this.weighingList.warehouseNo = obj.No
+                        this.getCarXiaLa()
+                        this.getList()
+                    } else {
+                        this.warehouseName = response[0].warehouseName
+                        this.weighingList.baseId = response[0].id
+                        this.warehouseId = response[0].id
+                        this.weighingList.warehouseNo = response[0].commonWarehouseNo
+                        if (response[0].allowEdit == 1) {
+                            this.disabled = false
+                        } else {
+                            this.disabled = true
+                        }
+                        this.getCarXiaLa()
+                        this.getList()
+                    }
+                })
+        },
+        getList() {
+            getRecord({
+                baseId: this.warehouseId,
+                currentPage: this.currentPage,
+                pageSize: this.pageSize,
+                searchType: 1,
+                startDate: "",
+                endDate: "",
+                searchKeyWord: "",
+            })
+                .toPromise()
+                .then((response) => {
+                    this.deliveryList = response.records
+                    this.deptBudgetTotal = response.total
+                })
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.center {
+    background: #fff;
+}
+
+.size_css {
+    width: 540px;
+    min-width: 540px;
+    overflow-x: scroll;
+    position: relative;
+}
+
+.ws-info-table {
+    border: none;
+}
+
+.base_header_layout {
+    padding: 10px;
+    margin-bottom: 10px;
+}
+
+.ws-info-table .el-form-item {
+    width: 50%;
+    border: none;
+}
+
+.formItem {
+    width: 100%;
+    display: inline;
+}
+
+.ws-info-table {
+    border: none;
+}
+
+.ws-info-table .el-form-item {
+    width: 100%;
+    border: none;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 30%;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+}
+
+/deep/.el-textarea__inner {
+    width: 92%;
+}
+
+/deep/.ws-info-table .el-form-item.rememo .el-form-item__content {
+    height: 76px;
+}
+
+.title {
+    font-size: 16px;
+    font-weight: 600;
+    margin: 10px;
+}
+
+.titleup {
+    position: relative;
+}
+
+.title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 15px;
+    background: #8890b1;
+    margin-right: 5px;
+}
+
+.substance {
+    background: #ffffff;
+    width: 100%;
+    border-radius: 4px;
+    margin: 0 auto;
+    padding-top: 20px;
+}
+
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+    text-align: center;
+}
+
+/deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+}
+
+.bg-left {
+    padding-left: 30px;
+}
+
+.bg-right {
+    padding-right: 10px;
+    text-align: right;
+}
+
+.bg-bottom {
+    margin: 15px 0px;
+}
+
+.titleup {
+    position: relative;
+}
+
+.el-upload--picture-card {
+    background-color: #fbfdff;
+    border: 1px dashed #c0ccda;
+    border-radius: 6px;
+    box-sizing: border-box;
+    width: 148px;
+    height: 148px;
+    line-height: 146px;
+    vertical-align: top;
+    margin-left: -289px;
+}
+
+.but {
+    text-align: center;
+    margin: 20px auto;
+}
+
+.top {
+    background: black;
+    color: #2aff7c;
+    font-size: 32px;
+    text-align: right;
+    padding: 0 10px 0 20px;
+    border-radius: 10px;
+    margin: 0 20px 20px 21px;
+    position: absolute;
+    top: 140px;
+    width: 465px;
+
+    .zujian {
+        position: relative;
+    }
+
+    .kg-style {
+        font-size: 30px;
+        color: red;
+    }
+
+    .confirmInfo {
+        display: flex;
+
+        .car-type {
+            text-align: left;
+            width: 50%;
+            min-width: 200px;
+        }
+
+        .car-no {
+            width: 50%;
+            text-align: right;
+        }
+    }
+
+    .confirmWeight {
+        display: flex;
+        align-items: center;
+
+        .titleWeight {
+            width: 35%;
+            min-width: 200px;
+            text-align: left;
+            line-height: 90px;
+            color: red;
+        }
+
+        .weight {
+            width: 65%;
+            text-align: right;
+            color: red;
+        }
+    }
+}
+
+.bottom {
+    // text-align: center;
+    background: white;
+    margin: 20px 20px 0 20px;
+    // border-radius: 10px;
+    padding-bottom: 20px;
+
+    .img1,
+    .img2 {
+        width: 200px;
+        padding: 20px;
+    }
+
+    .video-content {
+        width: 100%;
+    }
+
+    .video1 {
+        text-align: center;
+    }
+}
+
+/deep/.title_css .el-dialog__header {
+    text-align: center !important;
+}
+
+.bottom-btn {
+    display: flex;
+    margin-top: 20px;
+    justify-content: space-around;
+}
+
+/deep/.el-radio-group {
+    width: 100%;
+    display: flex;
+}
+
+/deep/.el-radio__label {
+    font-size: 20px;
+}
+
+/deep/.el-radio__inner {
+    // background: red;
+    height: 20px;
+    width: 20px;
+}
+
+.label-width {
+    width: 100%;
+    text-align: center;
+    font-size: 20px;
+}
+
+.show-excel {
+    opacity: 0;
+}
+
+/deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+}
+
+/deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+.sh-address {
+    display: flex;
+}
+
+.print-type-ew {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 20px;
+
+    /deep/.el-radio__label {
+        font-size: 14px;
+    }
+
+    margin-top: 10px;
+}
+.right-content{
+    margin-top: 20px;
+}
+</style>

src/views/warehousenew/warehouseManagementList.vue

@@ -85,6 +85,7 @@
       <ws-button @click="transformation()" v-hasPermission=" `warehouseManagement.warehouse.warehouseInfo.view`">折转</ws-button>
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`" @click="handleall()">全部仓库</ws-button>
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`" @click="handleMintor()">查看监控</ws-button>
+      <ws-button @click="dryClick()">烘干入库</ws-button>
         <el-table ref='table' show-summary :summary-method="getSummaries" class="wenzi setUp_css" :data="warehouseList" style="width: 100%; margin-top: 20px" height="calc(100% - 45px)" v-if="warehouseType == '1'">
         <el-table-column prop="warehouseName" label="仓库名">
         </el-table-column>
@@ -798,6 +799,11 @@
           path: 'warehouseManagementMintor'
         })
       },
+      dryClick(){
+        this.$router.push({
+          path: 'dryWarehousing'
+        })
+      },
       handleall(){
         this.$router.push({
           path: 'warehouseManagement'