|
|
@@ -3,10 +3,10 @@
|
|
|
<div class="center">
|
|
|
<div class="substance">
|
|
|
<div class="substance-left">
|
|
|
- <div class="titleTop">
|
|
|
- <div class="title"></div>
|
|
|
- <div class="textword">基本信息</div>
|
|
|
- </div>
|
|
|
+ <div class="titleTop">
|
|
|
+ <div class="title"></div>
|
|
|
+ <div class="textword">基本信息</div>
|
|
|
+ </div>
|
|
|
<ws-form>
|
|
|
<ws-info-table>
|
|
|
<ws-form-item label="任务编号" span="1" prop="contractNo">
|
|
|
@@ -21,9 +21,11 @@
|
|
|
<ws-form-item label="囤位号" span="1" prop="storageTagNo">
|
|
|
<ws-input v-model="inspect.storageTagNo" placeholder="暂无" disabled size="small" />
|
|
|
</ws-form-item>
|
|
|
- <ws-form-item label="合同/移库编号" span="1" prop="contractNo"><!--moveTaskNo-->
|
|
|
- <ws-input v-model="inspect.contractNo" placeholder="自动获取，不可编辑" disabled size="small" v-if="inspect.contractNo" />
|
|
|
- <ws-input v-model="inspect.moveTaskNo" placeholder="自动获取，不可编辑" disabled size="small" v-else/>
|
|
|
+ <ws-form-item label="合同/移库编号" span="1" prop="contractNo">
|
|
|
+ <!--moveTaskNo-->
|
|
|
+ <ws-input v-model="inspect.contractNo" placeholder="自动获取，不可编辑" disabled size="small"
|
|
|
+ v-if="inspect.contractNo" />
|
|
|
+ <ws-input v-model="inspect.moveTaskNo" placeholder="自动获取，不可编辑" disabled size="small" v-else />
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="提示" span="1" prop="tips">
|
|
|
<ws-input v-model="inspect.weighingManagement.tips" placeholder="暂无" disabled size="small" />
|
|
|
@@ -32,7 +34,8 @@
|
|
|
<ws-input v-model="inspect.goodsName" placeholder="自动获取，不可编辑" disabled size="small" />
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="经办人" span="1" prop="secretaryWeigher">
|
|
|
- <ws-input v-model="inspect.weighingManagement.secretaryWeigher" placeholder="自动获取，不可编辑" disabled size="small" />
|
|
|
+ <ws-input v-model="inspect.weighingManagement.secretaryWeigher" placeholder="自动获取，不可编辑" disabled
|
|
|
+ size="small" />
|
|
|
</ws-form-item>
|
|
|
<ws-form-item label="出库类型" span="1" prop="inOutType">
|
|
|
<ws-input v-model="inspect.weighingManagement.inOutType" placeholder="自动获取，不可编辑" disabled size="small" />
|
|
|
@@ -71,6 +74,8 @@
|
|
|
:value="item.warehouseName">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
+ <el-button @click='refreshClick(1)' type="primary">刷新</el-button>
|
|
|
+ <el-button @click='refreshClick' type="primary">{{timer?refresh:'自动刷新'}}</el-button>
|
|
|
<div class="screen">
|
|
|
<div class="screen_left">
|
|
|
<el-badge :value="nosuccess" class="badge_item">
|
|
|
@@ -99,28 +104,29 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table> -->
|
|
|
- <el-table ref="singleTable" :key='timestamp' :data="switchList" highlight-current-row @current-change="rowChange"
|
|
|
- style="width: 100%; overflow-y: scroll !important; height: calc(100vh - 54vh);margin-top:14px">
|
|
|
- <el-table-column property="number" label="业务编号">
|
|
|
- <span slot-scope="scope">{{scope.row.weighingManagement?scope.row.weighingManagement.number:""}}</span>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column property="carNumber" label="车牌号">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column property="status" label="状态">
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- <div style="text-align: center" v-if="inspectbtn == 1">
|
|
|
- <el-pagination class='switchpage' @size-change="handleSizeChange" @current-change="handleCurrentChange"
|
|
|
- :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="deptBudgetTotal1">
|
|
|
- </el-pagination>
|
|
|
- </div>
|
|
|
- <div style="text-align: center" v-if="inspectbtn == 2">
|
|
|
- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
|
|
|
- :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="deptBudgetTotal2">
|
|
|
- </el-pagination>
|
|
|
- </div>
|
|
|
+ <el-table ref="singleTable" :key='timestamp' :data="switchList" highlight-current-row
|
|
|
+ @current-change="rowChange"
|
|
|
+ style="width: 100%; overflow-y: scroll !important; height: calc(100vh - 54vh);margin-top:14px">
|
|
|
+ <el-table-column property="number" label="业务编号">
|
|
|
+ <span slot-scope="scope">{{scope.row.weighingManagement?scope.row.weighingManagement.number:""}}</span>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column property="carNumber" label="车牌号">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column property="status" label="状态">
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <div style="text-align: center" v-if="inspectbtn == 1">
|
|
|
+ <el-pagination class='switchpage' @size-change="handleSizeChange" @current-change="handleCurrentChange"
|
|
|
+ :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="deptBudgetTotal1">
|
|
|
+ </el-pagination>
|
|
|
+ </div>
|
|
|
+ <div style="text-align: center" v-if="inspectbtn == 2">
|
|
|
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
|
|
|
+ :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="deptBudgetTotal2">
|
|
|
+ </el-pagination>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="footer">
|
|
|
@@ -130,40 +136,47 @@
|
|
|
</div>
|
|
|
<div class="formList">
|
|
|
<ws-form>
|
|
|
- <ws-info-table>
|
|
|
- <ws-form-item label="等级" prop="grade">
|
|
|
- <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled">
|
|
|
- <ws-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
|
|
|
- :value="item.constValue" />
|
|
|
- </ws-select>
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="杂质（%）" prop="impurity">
|
|
|
- <el-input v-model="inspect.impurity" placeholder="请输入杂质占比" maxlength="10" size="small" type="number" :disabled="disabled" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="水分（%）" prop="waterContent">
|
|
|
- <el-input v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="10" size="small" type="number" :disabled="disabled" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="霉变粒（%）" prop="mildewGrain">
|
|
|
- <el-input v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="10" size="small" type="number" :disabled="disabled" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="容重（克/升）" prop="bulkDensity">
|
|
|
- <el-input v-model="inspect.bulkDensity" placeholder="请输入容重" maxlength="10" size="small" type="number" :disabled="disabled" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="热损伤（%）" prop="jiaorenli">
|
|
|
- <el-input v-model="inspect.jiaorenli" placeholder="请输入热损伤占比" maxlength="10" size="small" type="number" :disabled="disabled" />
|
|
|
- </ws-form-item>
|
|
|
- <ws-form-item label="不完善粒（%）" prop="imperfectGrain">
|
|
|
- <el-input v-model="inspect.imperfectGrain" placeholder="请输入不完善粒占比" maxlength="10" size="small" type="number" :disabled="disabled" />
|
|
|
- </ws-form-item>
|
|
|
+ <ws-info-table>
|
|
|
+ <ws-form-item label="等级" prop="grade">
|
|
|
+ <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled">
|
|
|
+ <ws-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
|
|
|
+ :value="item.constValue" />
|
|
|
+ </ws-select>
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="杂质（%）" prop="impurity">
|
|
|
+ <el-input v-model="inspect.impurity" placeholder="请输入杂质占比" maxlength="10" size="small" type="number"
|
|
|
+ :disabled="disabled" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="水分（%）" prop="waterContent">
|
|
|
+ <el-input v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="10" size="small" type="number"
|
|
|
+ :disabled="disabled" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="霉变粒（%）" prop="mildewGrain">
|
|
|
+ <el-input v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="10" size="small" type="number"
|
|
|
+ :disabled="disabled" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="容重（克/升）" prop="bulkDensity">
|
|
|
+ <el-input v-model="inspect.bulkDensity" placeholder="请输入容重" maxlength="10" size="small" type="number"
|
|
|
+ :disabled="disabled" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="热损伤（%）" prop="jiaorenli">
|
|
|
+ <el-input v-model="inspect.jiaorenli" placeholder="请输入热损伤占比" maxlength="10" size="small" type="number"
|
|
|
+ :disabled="disabled" />
|
|
|
+ </ws-form-item>
|
|
|
+ <ws-form-item label="不完善粒（%）" prop="imperfectGrain">
|
|
|
+ <el-input v-model="inspect.imperfectGrain" placeholder="请输入不完善粒占比" maxlength="10" size="small"
|
|
|
+ type="number" :disabled="disabled" />
|
|
|
+ </ws-form-item>
|
|
|
</ws-info-table>
|
|
|
</ws-form>
|
|
|
<div class="but">
|
|
|
- <!-- <el-button @click="print" type="primary">提交</el-button> -->
|
|
|
- <el-button @click="print" type="primary">提交并打印</el-button>
|
|
|
- </div>
|
|
|
+ <!-- <el-button @click="print" type="primary">提交</el-button> -->
|
|
|
+ <el-button @click="print" type="primary">提交并打印</el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @opened="opendBtn" @close="closeDialog">
|
|
|
+ <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @opened="opendBtn"
|
|
|
+ @close="closeDialog">
|
|
|
<!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
|
|
|
<outInspectPrint :printData="printData" ref="saveImg"></outInspectPrint>
|
|
|
<div style="text-align:center">
|
|
|
@@ -185,8 +198,8 @@
|
|
|
packList
|
|
|
} from '@/model/contarct/index'
|
|
|
import html2canvas from 'html2canvas'
|
|
|
- import axios from 'axios'
|
|
|
- import outInspectPrint from './component/outInspectPrint.vue'
|
|
|
+ import axios from 'axios'
|
|
|
+ import outInspectPrint from './component/outInspectPrint.vue'
|
|
|
export default {
|
|
|
components: {
|
|
|
outInspectPrint,
|
|
|
@@ -194,8 +207,10 @@
|
|
|
watch: {},
|
|
|
data() {
|
|
|
return {
|
|
|
+ timer: '',
|
|
|
+ refresh: 60,
|
|
|
inspect: {
|
|
|
- weighingManagement:{}
|
|
|
+ weighingManagement: {}
|
|
|
},
|
|
|
disabled: false,
|
|
|
gradeList: [],
|
|
|
@@ -204,42 +219,42 @@
|
|
|
warehouseList: [],
|
|
|
inspectbtn: 1,
|
|
|
inspectList: [],
|
|
|
- noinspectList:[],
|
|
|
- switchList:[],
|
|
|
- timestamp:'',
|
|
|
+ noinspectList: [],
|
|
|
+ switchList: [],
|
|
|
+ timestamp: '',
|
|
|
//分页
|
|
|
currentPage: 1,
|
|
|
pageSize: 10,
|
|
|
deptCircularPage: {},
|
|
|
deptBudgetTotal: 0,
|
|
|
- deptBudgetTotal1:0,
|
|
|
- deptBudgetTotal1:0,
|
|
|
+ deptBudgetTotal1: 0,
|
|
|
+ deptBudgetTotal1: 0,
|
|
|
managementType: 3,
|
|
|
- isShowPrint:false,
|
|
|
- printData:{},
|
|
|
- nosuccess:0,
|
|
|
- success:0
|
|
|
+ isShowPrint: false,
|
|
|
+ printData: {},
|
|
|
+ nosuccess: 0,
|
|
|
+ success: 0
|
|
|
}
|
|
|
},
|
|
|
activated() {
|
|
|
- // this.cangid = this.$route.query.cangid
|
|
|
- // this.warehouseName = this.$route.query.warehouseName
|
|
|
- // this.inspect.contractNo = this.$route.query.contractNo
|
|
|
- // this.inspect.binNumber = this.$route.query.binNumber
|
|
|
- // this.inspect.carNumber = this.$route.query.carNumber
|
|
|
- // this.inspect.goodsName = this.$route.query.goodsName
|
|
|
- // this.inspect.storageTagNo = this.$route.query.storageTagNo
|
|
|
- // let id = this.$route.query.id
|
|
|
- // this.cangNo = this.$route.query.warehouseNo
|
|
|
- // this.count = Number(this.$route.query.count) + 1
|
|
|
- // 品级
|
|
|
- packList({
|
|
|
- constId: 'CON3'
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.gradeList = response
|
|
|
- })
|
|
|
+ // this.cangid = this.$route.query.cangid
|
|
|
+ // this.warehouseName = this.$route.query.warehouseName
|
|
|
+ // this.inspect.contractNo = this.$route.query.contractNo
|
|
|
+ // this.inspect.binNumber = this.$route.query.binNumber
|
|
|
+ // this.inspect.carNumber = this.$route.query.carNumber
|
|
|
+ // this.inspect.goodsName = this.$route.query.goodsName
|
|
|
+ // this.inspect.storageTagNo = this.$route.query.storageTagNo
|
|
|
+ // let id = this.$route.query.id
|
|
|
+ // this.cangNo = this.$route.query.warehouseNo
|
|
|
+ // this.count = Number(this.$route.query.count) + 1
|
|
|
+ // 品级
|
|
|
+ packList({
|
|
|
+ constId: 'CON3'
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.gradeList = response
|
|
|
+ })
|
|
|
//仓库
|
|
|
selectWarehouseSelf({
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
@@ -248,27 +263,27 @@
|
|
|
.then((response) => {
|
|
|
this.warehouseList = response
|
|
|
let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
|
|
|
- _wareHouse = JSON.parse(_wareHouse)
|
|
|
- for (let i = 0; i < response.length; i++) {
|
|
|
- if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
|
|
|
- this.warehouseName = response[i].warehouseName
|
|
|
- this.warehouseId = response[i].warehouseId
|
|
|
- this.positionInfos=response[i].positionInfos
|
|
|
- this.warehouseCount = response[i].count
|
|
|
- this.warehouseNo = response[i].commonWarehouseNo
|
|
|
- this.warehouseType=response[i].warehouseType
|
|
|
- }
|
|
|
- if (!_wareHouse) {
|
|
|
- this.warehouseName = this.warehouseList[0].value
|
|
|
- this.warehouseId = this.warehouseList[0].warehouseId
|
|
|
- this.positionInfos=response[0].positionInfos
|
|
|
- this.warehouseCount = response[0].count
|
|
|
- this.warehouseNo = response[0].commonWarehouseNo
|
|
|
- this.warehouseType=response[0].warehouseType
|
|
|
- }
|
|
|
- }
|
|
|
- if (_wareHouse ) {
|
|
|
- this.warehouseName =_wareHouse.value
|
|
|
+ _wareHouse = JSON.parse(_wareHouse)
|
|
|
+ for (let i = 0; i < response.length; i++) {
|
|
|
+ if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
|
|
|
+ this.warehouseName = response[i].warehouseName
|
|
|
+ this.warehouseId = response[i].warehouseId
|
|
|
+ this.positionInfos = response[i].positionInfos
|
|
|
+ this.warehouseCount = response[i].count
|
|
|
+ this.warehouseNo = response[i].commonWarehouseNo
|
|
|
+ this.warehouseType = response[i].warehouseType
|
|
|
+ }
|
|
|
+ if (!_wareHouse) {
|
|
|
+ this.warehouseName = this.warehouseList[0].value
|
|
|
+ this.warehouseId = this.warehouseList[0].warehouseId
|
|
|
+ this.positionInfos = response[0].positionInfos
|
|
|
+ this.warehouseCount = response[0].count
|
|
|
+ this.warehouseNo = response[0].commonWarehouseNo
|
|
|
+ this.warehouseType = response[0].warehouseType
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (_wareHouse) {
|
|
|
+ this.warehouseName = _wareHouse.value
|
|
|
for (var i = 0; i < response.length; i++) {
|
|
|
if (response[i].warehouseName == _wareHouse.value) {
|
|
|
this.cangid = this.warehouseList[i].id
|
|
|
@@ -284,82 +299,210 @@
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
|
- printclose(){
|
|
|
+ refreshClick(type) {
|
|
|
+ let that = this
|
|
|
+ if (type == 1) {
|
|
|
+ getinspectList({
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ currentPage: that.currentPage,
|
|
|
+ pageSize: that.pageSize,
|
|
|
+ warehouseName: that.warehouseName,
|
|
|
+ managementType: that.managementType,
|
|
|
+ qualityType: 1,
|
|
|
+ loadingstatus: 1,
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ that.noinspectList = response.records
|
|
|
+ console.log(that.inspectbtn, that.noinspectList.length)
|
|
|
+ if (that.inspectbtn == 1 && that.noinspectList.length > 0) {
|
|
|
+ that.switchList = that.noinspectList
|
|
|
+ that.inspect = that.noinspectList[0]
|
|
|
+ if (!that.inspect.weighingManagement) {
|
|
|
+ that.inspect.weighingManagement = {}
|
|
|
+ }
|
|
|
+ } else if (that.inspectbtn == 1) {
|
|
|
+ that.switchList = []
|
|
|
+ that.inspect = {}
|
|
|
+ that.inspect.weighingManagement = {}
|
|
|
+ }
|
|
|
+ console.log(that.switchList)
|
|
|
+ that.deptBudgetTotal1 = response.total
|
|
|
+ that.nosuccess = response.total
|
|
|
+ })
|
|
|
+ getinspectList({
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ currentPage: that.currentPage,
|
|
|
+ pageSize: that.pageSize,
|
|
|
+ warehouseName: that.warehouseName,
|
|
|
+ managementType: that.managementType,
|
|
|
+ qualityType: 2,
|
|
|
+ loadingstatus: 1,
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ that.inspectList = response.records
|
|
|
+ console.log(that.inspectbtn, that.inspectList.length)
|
|
|
+ if (that.inspectbtn == 2 && that.inspectList.length > 0) {
|
|
|
+ that.switchList = that.inspectList
|
|
|
+ that.inspect = that.inspectList[0]
|
|
|
+ if (!that.inspect.weighingManagement) {
|
|
|
+ that.inspect.weighingManagement = {}
|
|
|
+ }
|
|
|
+ } else if (that.inspectbtn == 2) {
|
|
|
+ that.switchList = []
|
|
|
+ that.inspect = {}
|
|
|
+ that.inspect.weighingManagement = {}
|
|
|
+ }
|
|
|
+ that.deptBudgetTotal2 = response.total
|
|
|
+ that.success = response.total
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ clearInterval(that.timer)
|
|
|
+ that.refresh = 60
|
|
|
+ that.timer = setInterval(function() {
|
|
|
+ // console.log(that.refresh)
|
|
|
+ if (that.refresh == 0) {
|
|
|
+ that.refresh = 60
|
|
|
+ getinspectList({
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ currentPage: that.currentPage,
|
|
|
+ pageSize: that.pageSize,
|
|
|
+ warehouseName: that.warehouseName,
|
|
|
+ managementType: that.managementType,
|
|
|
+ qualityType: 1,
|
|
|
+ loadingstatus: 1,
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ that.noinspectList = response.records
|
|
|
+ console.log(that.inspectbtn, that.noinspectList.length)
|
|
|
+ if (that.inspectbtn == 1 && that.noinspectList.length > 0) {
|
|
|
+ that.switchList = that.noinspectList
|
|
|
+ that.inspect = that.noinspectList[0]
|
|
|
+ if (!that.inspect.weighingManagement) {
|
|
|
+ that.inspect.weighingManagement = {}
|
|
|
+ }
|
|
|
+ } else if (that.inspectbtn == 1) {
|
|
|
+ that.switchList = []
|
|
|
+ that.inspect = {}
|
|
|
+ that.inspect.weighingManagement = {}
|
|
|
+ }
|
|
|
+ console.log(that.switchList)
|
|
|
+ that.deptBudgetTotal1 = response.total
|
|
|
+ that.nosuccess = response.total
|
|
|
+ })
|
|
|
+ getinspectList({
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ currentPage: that.currentPage,
|
|
|
+ pageSize: that.pageSize,
|
|
|
+ warehouseName: that.warehouseName,
|
|
|
+ managementType: that.managementType,
|
|
|
+ qualityType: 2,
|
|
|
+ loadingstatus: 1,
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ that.inspectList = response.records
|
|
|
+ console.log(that.inspectbtn, that.inspectList.length)
|
|
|
+ if (that.inspectbtn == 2 && that.inspectList.length > 0) {
|
|
|
+ that.switchList = that.inspectList
|
|
|
+ that.inspect = that.inspectList[0]
|
|
|
+ if (!that.inspect.weighingManagement) {
|
|
|
+ that.inspect.weighingManagement = {}
|
|
|
+ }
|
|
|
+ } else if (that.inspectbtn == 2) {
|
|
|
+ that.switchList = []
|
|
|
+ that.inspect = {}
|
|
|
+ that.inspect.weighingManagement = {}
|
|
|
+ }
|
|
|
+ that.deptBudgetTotal2 = response.total
|
|
|
+ that.success = response.total
|
|
|
+ })
|
|
|
+ }
|
|
|
+ that.refresh--
|
|
|
+
|
|
|
+ }, 1000);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ printclose() {
|
|
|
this.isShowPrint = false
|
|
|
this.getList()
|
|
|
},
|
|
|
- printSmall(){
|
|
|
+ printSmall() {
|
|
|
this.inspect.type = 1
|
|
|
- localStorage.setItem('out-Warehouse_print',JSON.stringify( this.inspect))
|
|
|
+ localStorage.setItem('out-Warehouse_print', JSON.stringify(this.inspect))
|
|
|
window.open('../../../static/outInspectionPrint.html')
|
|
|
},
|
|
|
- printBig(){
|
|
|
- this.inspect.type = 2
|
|
|
- localStorage.setItem('out-Warehouse_print',JSON.stringify(this.inspect))
|
|
|
+ printBig() {
|
|
|
+ this.inspect.type = 2
|
|
|
+ localStorage.setItem('out-Warehouse_print', JSON.stringify(this.inspect))
|
|
|
window.open('../../../static/outInspectionPrint.html')
|
|
|
- },
|
|
|
+ },
|
|
|
warehouseNameChange(e) {
|
|
|
for (let i = 0; i < this.warehouseList.length; i++) {
|
|
|
- if(this.warehouseList[i].warehouseName==e){
|
|
|
- localStorage.setItem('houseSelfCollect_house1', JSON.stringify({
|
|
|
- No:this.warehouseList[i].commonWarehouseNo,
|
|
|
- allowEdit:this.warehouseList[i].allowEdit,
|
|
|
- value:this.warehouseList[i].warehouseName,
|
|
|
- count:this.warehouseList[i].count,
|
|
|
- warehouseId:this.warehouseList[i].id
|
|
|
- }))
|
|
|
- // this.positionInfos=this.warehouseList1[i].positionInfos
|
|
|
- // this.warehouseCount = this.warehouseList1[i].count
|
|
|
+ if (this.warehouseList[i].warehouseName == e) {
|
|
|
+ localStorage.setItem('houseSelfCollect_house1', JSON.stringify({
|
|
|
+ No: this.warehouseList[i].commonWarehouseNo,
|
|
|
+ allowEdit: this.warehouseList[i].allowEdit,
|
|
|
+ value: this.warehouseList[i].warehouseName,
|
|
|
+ count: this.warehouseList[i].count,
|
|
|
+ warehouseId: this.warehouseList[i].id
|
|
|
+ }))
|
|
|
+ // this.positionInfos=this.warehouseList1[i].positionInfos
|
|
|
+ // this.warehouseCount = this.warehouseList1[i].count
|
|
|
// this.warehouseNo = this.warehouseList1[i].commonWarehouseNo
|
|
|
- // this.warehouseType=this.warehouseList1[i].warehouseType
|
|
|
- }
|
|
|
- }
|
|
|
+ // this.warehouseType=this.warehouseList1[i].warehouseType
|
|
|
+ }
|
|
|
+ }
|
|
|
this.getList()
|
|
|
},
|
|
|
- record(){
|
|
|
+ record() {
|
|
|
this.$router.push({
|
|
|
- path:'outInspectRecord',
|
|
|
- query:{warehouseName: this.warehouseName}
|
|
|
+ path: 'outInspectRecord',
|
|
|
+ query: {
|
|
|
+ warehouseName: this.warehouseName
|
|
|
+ }
|
|
|
})
|
|
|
|
|
|
},
|
|
|
inspectChange(num) {
|
|
|
this.inspectbtn = num
|
|
|
- if(num == 1){
|
|
|
+ if (num == 1) {
|
|
|
this.switchList = this.noinspectList
|
|
|
- }else if(num == 2){
|
|
|
+ } else if (num == 2) {
|
|
|
this.switchList = this.inspectList
|
|
|
}
|
|
|
- if(this.switchList.length > 0){
|
|
|
- this.inspect = this.switchList[0]
|
|
|
- if(!this.inspect.weighingManagement){
|
|
|
- this.inspect.weighingManagement = {}
|
|
|
- }
|
|
|
- }else{
|
|
|
+ if (this.switchList.length > 0) {
|
|
|
+ this.inspect = this.switchList[0]
|
|
|
+ if (!this.inspect.weighingManagement) {
|
|
|
+ this.inspect.weighingManagement = {}
|
|
|
+ }
|
|
|
+ } else {
|
|
|
this.inspect = {}
|
|
|
- this.inspect.weighingManagement={}
|
|
|
+ this.inspect.weighingManagement = {}
|
|
|
}
|
|
|
|
|
|
},
|
|
|
- handleSizeChange(val) {
|
|
|
+ handleSizeChange(val) {
|
|
|
console.log(`每页 ${val} 条`)
|
|
|
this.pageSize = val
|
|
|
this.getList()
|
|
|
},
|
|
|
- handleCurrentChange(val) {
|
|
|
+ handleCurrentChange(val) {
|
|
|
this.currentPage = val
|
|
|
console.log(`当前页: ${val}`)
|
|
|
this.getList()
|
|
|
},
|
|
|
- rowChange(val) {
|
|
|
+ rowChange(val) {
|
|
|
// if(this.tpyeNo == 2 && this.status == 1 && val.qualityInspectionManagement.confirm == 0){
|
|
|
// this.$message({
|
|
|
// message: '该条质检信息未确认',
|
|
|
// type: 'warning'
|
|
|
// });
|
|
|
// }
|
|
|
- if(val){
|
|
|
- this.inspect = val
|
|
|
+ if (val) {
|
|
|
+ this.inspect = val
|
|
|
}
|
|
|
},
|
|
|
getdate() {
|
|
|
@@ -392,9 +535,8 @@
|
|
|
this.printData.pictureAddress = response.data.url
|
|
|
this.inspect.pictureAddress = response.data.url
|
|
|
addOut(this.inspect)
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {})
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
@@ -416,9 +558,8 @@
|
|
|
this.printData.pictureAddress = response.data.url
|
|
|
this.inspect.pictureAddress = response.data.url
|
|
|
addOut(this.inspect)
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {})
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
@@ -450,7 +591,8 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (this.inspect.impurity && String(this.inspect.impurity).indexOf('.') != -1 && String(this.inspect.impurity).length - (String(this
|
|
|
+ if (this.inspect.impurity && String(this.inspect.impurity).indexOf('.') != -1 && String(this.inspect
|
|
|
+ .impurity).length - (String(this
|
|
|
.inspect.impurity).indexOf('.') + 1) > 1) {
|
|
|
this.$message({
|
|
|
message: '杂质应保留一位小数',
|
|
|
@@ -459,7 +601,7 @@
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
// if (!this.inspect.waterContent) {
|
|
|
// this.$message({
|
|
|
// message: '水分不能为空',
|
|
|
@@ -474,7 +616,8 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (this.inspect.waterContent && String(this.inspect.waterContent).indexOf('.') != -1 && String(this.inspect.waterContent).length - (String(
|
|
|
+ if (this.inspect.waterContent && String(this.inspect.waterContent).indexOf('.') != -1 && String(this.inspect
|
|
|
+ .waterContent).length - (String(
|
|
|
this.inspect.waterContent).indexOf('.') + 1) > 1) {
|
|
|
this.$message({
|
|
|
message: '水分应保留一位小数',
|
|
|
@@ -496,8 +639,9 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (String(this.inspect.mildewGrain).indexOf('.') != -1 && String(this.inspect.mildewGrain).length - (String(
|
|
|
- this.inspect.mildewGrain).indexOf('.') + 1) > 1) {
|
|
|
+ if (String(this.inspect.mildewGrain).indexOf('.') != -1 && String(this.inspect.mildewGrain).length - (
|
|
|
+ String(
|
|
|
+ this.inspect.mildewGrain).indexOf('.') + 1) > 1) {
|
|
|
this.$message({
|
|
|
message: '霉变粒应保留一位小数',
|
|
|
type: 'warning',
|
|
|
@@ -518,7 +662,8 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (this.inspect.bulkDensity && String(this.inspect.bulkDensity).indexOf('.') != -1 && String(this.inspect.bulkDensity).length - (String(
|
|
|
+ if (this.inspect.bulkDensity && String(this.inspect.bulkDensity).indexOf('.') != -1 && String(this.inspect
|
|
|
+ .bulkDensity).length - (String(
|
|
|
this.inspect.bulkDensity).indexOf('.') + 1) > 0) {
|
|
|
this.$message({
|
|
|
message: '容重需输入整数',
|
|
|
@@ -540,7 +685,8 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if (String(this.inspect.jiaorenli).indexOf('.') != -1 && String(this.inspect.jiaorenli).length - (String(this
|
|
|
+ if (String(this.inspect.jiaorenli).indexOf('.') != -1 && String(this.inspect.jiaorenli).length - (String(
|
|
|
+ this
|
|
|
.inspect.jiaorenli).indexOf('.') + 1) > 1) {
|
|
|
this.$message({
|
|
|
message: '热损伤应保留一位小数',
|
|
|
@@ -562,7 +708,8 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- if ( this.inspect.imperfectGrain && String(this.inspect.imperfectGrain).indexOf('.') != -1 && String(this.inspect.imperfectGrain).length - (
|
|
|
+ if (this.inspect.imperfectGrain && String(this.inspect.imperfectGrain).indexOf('.') != -1 && String(this
|
|
|
+ .inspect.imperfectGrain).length - (
|
|
|
String(this.inspect.imperfectGrain).indexOf('.') + 1) > 1) {
|
|
|
this.$message({
|
|
|
message: '不完善粒应保留一位小数',
|
|
|
@@ -582,21 +729,21 @@
|
|
|
this.$message.success('保存成功')
|
|
|
// this.printData = this.inspect
|
|
|
// conole.log(this.printData)
|
|
|
-
|
|
|
+
|
|
|
// this.isShowPrint = true
|
|
|
// this.getList()
|
|
|
getinspectLook({
|
|
|
- id: response
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response2) => {
|
|
|
- this.printData = response2
|
|
|
- this.printData.contractManagement =this.inspect.contractManagement
|
|
|
- console.log(this.printData)
|
|
|
- this.isShowPrint = true
|
|
|
- this.getList()
|
|
|
- })
|
|
|
-
|
|
|
+ id: response
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response2) => {
|
|
|
+ this.printData = response2
|
|
|
+ this.printData.contractManagement = this.inspect.contractManagement
|
|
|
+ console.log(this.printData)
|
|
|
+ this.isShowPrint = true
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+
|
|
|
})
|
|
|
})
|
|
|
.catch(() => {
|
|
|
@@ -609,60 +756,61 @@
|
|
|
})
|
|
|
},
|
|
|
getList() {
|
|
|
- this.timestamp=new Date().valueOf()
|
|
|
- getinspectList({
|
|
|
- compId: localStorage.getItem('ws-pf_compId'),
|
|
|
- currentPage: this.currentPage,
|
|
|
- pageSize: this.pageSize,
|
|
|
- warehouseName: this.warehouseName,
|
|
|
- managementType: this.managementType,
|
|
|
- qualityType:1
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.noinspectList = response.records
|
|
|
- console.log(this.inspectbtn,this.noinspectList.length )
|
|
|
- if(this.inspectbtn == 1 && this.noinspectList.length > 0){
|
|
|
- this.switchList = this.noinspectList
|
|
|
- this.inspect = this.noinspectList[0]
|
|
|
- if(!this.inspect.weighingManagement){
|
|
|
- this.inspect.weighingManagement = {}
|
|
|
- }
|
|
|
- }else if(this.inspectbtn == 1){
|
|
|
- this.switchList = []
|
|
|
- this.inspect = {}
|
|
|
- this.inspect.weighingManagement = {}
|
|
|
- }
|
|
|
- console.log(this.switchList )
|
|
|
- this.deptBudgetTotal1 = response.total
|
|
|
- this.nosuccess = response.total
|
|
|
- })
|
|
|
- getinspectList({
|
|
|
- compId: localStorage.getItem('ws-pf_compId'),
|
|
|
- currentPage: this.currentPage,
|
|
|
- pageSize: this.pageSize,
|
|
|
- warehouseName: this.warehouseName,
|
|
|
- managementType: this.managementType,
|
|
|
- qualityType:2
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- this.inspectList = response.records
|
|
|
- console.log(this.inspectbtn,this.inspectList.length )
|
|
|
- if(this.inspectbtn == 2 && this.inspectList.length > 0){
|
|
|
- this.switchList = this.inspectList
|
|
|
- this.inspect = this.inspectList[0]
|
|
|
- if(!this.inspect.weighingManagement){
|
|
|
- this.inspect.weighingManagement = {}
|
|
|
- }
|
|
|
- }else if(this.inspectbtn == 2){
|
|
|
- this.switchList = []
|
|
|
- this.inspect = {}
|
|
|
- this.inspect.weighingManagement = {}
|
|
|
- }
|
|
|
- this.deptBudgetTotal2 = response.total
|
|
|
- this.success = response.total
|
|
|
- })
|
|
|
+ this.timestamp = new Date().valueOf()
|
|
|
+ this.refreshClick(1)
|
|
|
+ // getinspectList({
|
|
|
+ // compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ // currentPage: this.currentPage,
|
|
|
+ // pageSize: this.pageSize,
|
|
|
+ // warehouseName: this.warehouseName,
|
|
|
+ // managementType: this.managementType,
|
|
|
+ // qualityType:1
|
|
|
+ // })
|
|
|
+ // .toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // this.noinspectList = response.records
|
|
|
+ // console.log(this.inspectbtn,this.noinspectList.length )
|
|
|
+ // if(this.inspectbtn == 1 && this.noinspectList.length > 0){
|
|
|
+ // this.switchList = this.noinspectList
|
|
|
+ // this.inspect = this.noinspectList[0]
|
|
|
+ // if(!this.inspect.weighingManagement){
|
|
|
+ // this.inspect.weighingManagement = {}
|
|
|
+ // }
|
|
|
+ // }else if(this.inspectbtn == 1){
|
|
|
+ // this.switchList = []
|
|
|
+ // this.inspect = {}
|
|
|
+ // this.inspect.weighingManagement = {}
|
|
|
+ // }
|
|
|
+ // console.log(this.switchList )
|
|
|
+ // this.deptBudgetTotal1 = response.total
|
|
|
+ // this.nosuccess = response.total
|
|
|
+ // })
|
|
|
+ // getinspectList({
|
|
|
+ // compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ // currentPage: this.currentPage,
|
|
|
+ // pageSize: this.pageSize,
|
|
|
+ // warehouseName: this.warehouseName,
|
|
|
+ // managementType: this.managementType,
|
|
|
+ // qualityType:2
|
|
|
+ // })
|
|
|
+ // .toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // this.inspectList = response.records
|
|
|
+ // console.log(this.inspectbtn,this.inspectList.length )
|
|
|
+ // if(this.inspectbtn == 2 && this.inspectList.length > 0){
|
|
|
+ // this.switchList = this.inspectList
|
|
|
+ // this.inspect = this.inspectList[0]
|
|
|
+ // if(!this.inspect.weighingManagement){
|
|
|
+ // this.inspect.weighingManagement = {}
|
|
|
+ // }
|
|
|
+ // }else if(this.inspectbtn == 2){
|
|
|
+ // this.switchList = []
|
|
|
+ // this.inspect = {}
|
|
|
+ // this.inspect.weighingManagement = {}
|
|
|
+ // }
|
|
|
+ // this.deptBudgetTotal2 = response.total
|
|
|
+ // this.success = response.total
|
|
|
+ // })
|
|
|
},
|
|
|
},
|
|
|
}
|
|
|
@@ -695,6 +843,7 @@
|
|
|
/deep/.ws-info-table .el-form-item .el-form-item__content {
|
|
|
border: none;
|
|
|
}
|
|
|
+
|
|
|
.title::before {
|
|
|
content: '';
|
|
|
display: inline-block;
|
|
|
@@ -713,6 +862,7 @@
|
|
|
line-height: 60px;
|
|
|
margin-bottom: 20px;
|
|
|
border-radius: 4px;
|
|
|
+
|
|
|
.textword {
|
|
|
font-size: 18px;
|
|
|
font-weight: 600;
|
|
|
@@ -728,14 +878,16 @@
|
|
|
width: 59%;
|
|
|
background: #ffffff;
|
|
|
border-radius: 4px;
|
|
|
- /deep/.el-input.is-disabled .el-input__inner{
|
|
|
- background: #F5F7FA;
|
|
|
- border-radius: 4px;
|
|
|
- color: #8890B1 !important;
|
|
|
- border: none;
|
|
|
+
|
|
|
+ /deep/.el-input.is-disabled .el-input__inner {
|
|
|
+ background: #F5F7FA;
|
|
|
+ border-radius: 4px;
|
|
|
+ color: #8890B1 !important;
|
|
|
+ border: none;
|
|
|
}
|
|
|
- /deep/.ws-info-table .el-form-item{
|
|
|
- margin: 10px 0;
|
|
|
+
|
|
|
+ /deep/.ws-info-table .el-form-item {
|
|
|
+ margin: 10px 0;
|
|
|
|
|
|
}
|
|
|
}
|
|
|
@@ -762,8 +914,9 @@
|
|
|
.screen_right {
|
|
|
width: 50%;
|
|
|
}
|
|
|
- .screen_left{
|
|
|
- min-width: 182px;
|
|
|
+
|
|
|
+ .screen_left {
|
|
|
+ min-width: 182px;
|
|
|
}
|
|
|
|
|
|
.badge_item {
|
|
|
@@ -778,10 +931,13 @@
|
|
|
border-radius: 4px;
|
|
|
text-align: center;
|
|
|
line-height: 32px;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
- .record:hover,.inspect_css:hover,.noinspect_css:hover{
|
|
|
- cursor:pointer;
|
|
|
+
|
|
|
+ .record:hover,
|
|
|
+ .inspect_css:hover,
|
|
|
+ .noinspect_css:hover {
|
|
|
+ cursor: pointer;
|
|
|
}
|
|
|
|
|
|
.inspect_css {
|
|
|
@@ -835,7 +991,8 @@
|
|
|
text-align: center;
|
|
|
margin: 20px auto;
|
|
|
}
|
|
|
- /deep/.switchpage.el-pagination .el-select .el-input{
|
|
|
- margin:0 30px 0 10px;
|
|
|
+
|
|
|
+ /deep/.switchpage.el-pagination .el-select .el-input {
|
|
|
+ margin: 0 30px 0 10px;
|
|
|
}
|
|
|
</style>
|
