Commit 69564844 authored by 徐来柯's avatar 徐来柯

update

parent 6bcd53fc
......@@ -136,4 +136,9 @@
margin-left:10px;
}
}
}
.el-table .warning-row td {
background: #ff4949 !important;
color: #fff !important;
}
\ No newline at end of file
......@@ -111,6 +111,7 @@ const productManage = () =>
import('@/views/education/productManage.vue');
const ProductionPlan = () =>
import('@/views/education/ProductionPlan.vue');
// 生产排程统计页面
const ManageList = () =>
import('@/views/education/ManageList.vue');
const ProducSchedule = () =>
......
This diff is collapsed.
......@@ -95,7 +95,9 @@ export default {
},
created () {
this.$nextTick(() => {
this.$refs.codeInput.focus()
if (this.$refs.codeInput) {
this.$refs.codeInput.focus()
}
})
},
methods: {
......
......@@ -247,7 +247,7 @@ export default {
return
}
}
if (this.relateType === 'VPlanQuantity') {
if (this.relateType === 'VPlanQuantity' || this.relateType === 'FinishQuantity') {
if (this.currentRow.DateType.indexOf('整型') !== -1) {
return this.$emit('conserve', this.currentRow, this.relateType)
} else {
......
<template>
<div class="box-container">
<div class="wrap">
<search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<el-table
border
height="675"
......@@ -10,11 +10,8 @@
class="table-style"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="60">
</el-table-column>
:row-class-name="tableRowClassName"
>
<el-table-column
label="序号"
:show-overflow-tooltip="true"
......@@ -93,19 +90,17 @@
<Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
</div>
<store-dialog :titleText="'产品入库单'" :titleType="'pro'" v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" />
<delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop>
</div>
</template>
<script>
import searchForm from './component/searchForm'
import storeDialog from './component/storeDialog'
import deletePop from './component/deletePop'
import Pagination from './component/Pagination.vue'
export default {
components: { searchForm, storeDialog, deletePop, Pagination },
components: { searchForm, Pagination },
data () {
return {
tableData: [],
......@@ -166,7 +161,7 @@ export default {
this.searchData()
},
methods: {
searchData () {
searchData () {
var $this = this
var postData = this.resetData()
this.$axios({
......@@ -200,8 +195,13 @@ export default {
console.log('err',err)
})
},
handleSelectionChange (val) {
this.checkList = val
tableRowClassName({row, rowIndex}) {
row.EndDt = row.EndDt === '' ? 0: row.EndDt
row.DeliveryDt = row.DeliveryDt === '' ? 0 : row.DeliveryDt
if (new Date(row.EndDt).getTime() > new Date(row.DeliveryDt).getTime()) {
return 'warning-row'
}
return '';
},
// 分页方法
pageFun(num){
......@@ -211,25 +211,6 @@ export default {
this.tableData = this.cloneData.slice((num-1)*this.$refs.page.pageSize,this.$refs.page.pageSize*num)
}
},
// 扫码枪扫码
scanGunCode(value) {
console.log('开始扫码。。。')
this.$axios({
method:"post",
url:`/api/ProductStorage/ProductStorage_ScanCodeAdd?ScanCode=${value}`,
}).then((res)=>{
console.log('扫码成功。。。')
var postData = {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
this.searchData(this.postData)
}).catch(() => {
console.log('扫码失败。。。')
})
},
resetData () {
return {
argKeyWord: this.formData.argKeyWord,
......@@ -238,36 +219,12 @@ export default {
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
},
delData () {
var $this = this
if ($this.checkList.length === 0) {
$this.deleteShow = true
$this.typeV = 2
} else {
var list = []
$this.checkList.forEach((item) => {
list.push(item.ID)
})
$this.$axios({
method:"post",
url:`/api/ProductStorage/ProductStorage_Delete`,
data:list
}).then((res)=>{
var postData = $this.resetData()
$this.searchData(postData)
})
}
},
//关闭提示弹窗
cancel_delete(){
this.deleteShow = false
},
openDialog () {
this.popShow = true
},
closeDialog () {
this.popShow = false
},
conserve (data) {
var $this = this
this.$axios({
......@@ -291,4 +248,5 @@ export default {
}
}
}
</script>
\ No newline at end of file
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment