Skip to content

T
template_vue
Commit 4ca1c541 authored by hubaoshan's avatar hubaoshan
Browse files
Options

1

parent b1f862a4
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 82 deletions
src/views/template/enterboundTwo.vue
View file @ 4ca1c541
......@@ -128,7 +128,8 @@
<el-table-column label="cj" prop="cj" :show-overflow-tooltip="true" min-width="120">
<template slot-scope="scope">
<span v-if="scope.row.cj ">{{ getManufacturerLabel(scope.row.cj) || '-' }}</span>
<span v-if="scope.row.cj">{{ getManufacturerLabel(scope.row.cj) || '-' }}</span>
<span v-else> {{ scope.row.cheCjName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true" min-width="150">
......@@ -143,6 +144,7 @@
<span v-else-if="scope.row.ptype === '3'">wd</span>
<span v-else-if="scope.row.ptype === '4'">sl</span>
<span v-else-if="scope.row.ptype === '5'">zd</span>
<span v-else-if="scope.row.ptype === '30'">che</span>
<span v-else>-</span>
</template>
</el-table-column>
......@@ -251,6 +253,7 @@
<span v-else-if="singleDetails.ptype === '3'">wd</span>
<span v-else-if="singleDetails.ptype === '4'">sl</span>
<span v-else-if="singleDetails.ptype === '5'">zd</span>
<span v-else-if="singleDetails.ptype === '30'">che</span>
<span v-else>-</span>
<!-- <el-input v-model.trim="singleDetails.ptype" :readonly="true" />-->
</el-form-item>
......@@ -291,63 +294,54 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="出入情况：" prop="ioType">
<span v-if="singleDetails.ioType === '1'">入</span>
<span v-else-if="singleDetails.ioType === '2'">出</span>
<span v-else-if="singleDetails.ioType === '3'">手动入</span>
<span v-else-if="singleDetails.ioType === '4'">手动出</span>
<span v-else>-</span>
<!-- <el-input v-model.trim="singleDetails.ioType" :readonly="true" />-->
<el-form-item v-show="isShow" label="bzq：" prop="cheBzq">
<span>{{ formatCheBzq(singleDetails.cheBzq)|| '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态：" prop="flag">
<span v-if="singleDetails.flag ==='0' ">停用</span>
<span v-else-if="singleDetails.flag ==='1' ">正常</span>
<span v-else>-</span>
<!-- <el-input v-model.trim="singleDetails.flag" :readonly="true" />-->
<!-- <el-form-item v-show="isShow" label="bz：" prop="cheBz">-->
<!-- <span>{{ singleDetails.cheBz|| '-' }}</span>-->
<!-- </el-form-item>-->
<el-form-item v-show="isShow" label="unit：" prop="cheUnit">
<span>{{ singleDetails.cheUnit|| '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-show="singleDetails.ioType !== '1'" label="申请人：" prop="createBy">
<span>{{ singleDetails.applyName }}</span>
<!-- <el-input v-model.trim="singleDetails.createBy" :readonly="true" />-->
<el-form-item v-show="isShow" label="cjName：" prop="cheCjName">
<span>{{ singleDetails.cheCjName|| '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-show="singleDetails.ioType !== '1'" label="申请时间：" prop="createDate">
<span>{{ singleDetails.apply_create_date }}</span>
<!-- <el-input v-model.trim="singleDetails.createDate" :readonly="true" />-->
<el-form-item label="出入情况：" prop="ioType">
<span v-if="singleDetails.ioType === '1'">入</span>
<span v-else-if="singleDetails.ioType === '2'">出</span>
<span v-else-if="singleDetails.ioType === '3'">手动入</span>
<span v-else-if="singleDetails.ioType === '4'">手动出</span>
<span v-else>-</span>
<!-- <el-input v-model.trim="singleDetails.ioType" :readonly="true" />-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="创建人：" prop="updateBy">
<span>{{ singleDetails.createName }}</span>
<!-- <el-input v-model.trim="singleDetails.updateBy" :readonly="true" :maxlength="100" />-->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建时间：" prop="updateDate">
<span>{{ singleDetails.income_create_date }}</span>
<!-- <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-show="singleDetails.ioType !== '1'" label="确认人：" prop="affirmBy">
<span>{{ singleDetails.affirmName }}</span>
<!-- <el-input v-model.trim="singleDetails.affirmBy" :readonly="true" :maxlength="100" />-->
<el-form-item label="创建人：" prop="createBy">
<span>{{ singleDetails.createName }}</span>
<!-- <el-input v-model.trim="singleDetails.updateBy" :readonly="true" :maxlength="100" />-->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-show="singleDetails.ioType !== '1'" label="确认时间：" prop="affirmDate">
<span>{{ singleDetails.affirmDate }}</span>
<!-- <el-input v-model.trim="singleDetails.affirmDate" :readonly="true" />-->
<el-form-item label="创建时间：" prop="createDate">
<span>{{ singleDetails.income_create_date }}</span>
<!-- <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />-->
</el-form-item>
</el-col>
</el-row>
......@@ -365,7 +359,7 @@ import {
} from '@/api/outcomeWmsApply'
import commonField from '@/utils/commonField'
import { getDicts } from '@/api/system/dict/data'
import { exportIncomeInoutWmsLog, listIncomeInoutWmsLog } from '@/api/incomeInoutWmsLog'
import { exportIncomeInoutWmsLog, getIncomeInoutWmsLog, listIncomeInoutWmsLog } from '@/api/incomeInoutWmsLog'
// import manufacturer from "@/api/outcomeWmsJbapplyTemp";
export default {
......@@ -376,7 +370,7 @@ export default {
loading: true,
// 总条数
total: 0,
isShow: false,
manufacturer: {},
// 入库记录表格数据
incomeInoutWmsLogList: [],
......@@ -394,7 +388,6 @@ export default {
flag: '',
createBy: '',
applyName: '',
createName: '',
updateName: '',
createDate: '',
updateBy: '',
......@@ -598,9 +591,18 @@ export default {
},
// 获取所选行详情信息操作
handleDetail(row) {
this.singleDetails = row
const id = row.businessId
getIncomeInoutWmsLog(id).then(response => {
// this.singleDetails = response.data
if (this.singleDetails.ptype !== '30') {
this.isShow = false
}
})
console.log(row)
this.singleDetails = row
console.log(this.singleDetails)
this.title = '详情信息'
this.isShow = true
this.openDetails = !this.openDetails
},
// 取消按钮
......@@ -659,7 +661,9 @@ export default {
this.open = true
this.title = '添加入库记录'
},
formatCheBzq(date) {
return date ? date.split(' ')[0] : ''
},
// 改变状态
handleStatusChange(row) {
const text = row.flag === '1' ? '启用' : '停用'
......
src/views/template/incomeWmsBox.vue
View file @ 4ca1c541
......@@ -114,17 +114,24 @@
<div class="mb12 font-small-bold">库存管理列表</div>
<el-table v-loading="loading" border :data="incomeWmsBoxList">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true">
<el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.whId ">{{ getDataDictLabel(scope.row.whId) }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true" width="150">
<template slot-scope="scope">
{{ scope.row.orderCode || '-' }}
</template>
</el-table-column>
<el-table-column label="cj" prop="cj" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ getManufacturerLabel(scope.row.cj) || '-' }}
<span v-if="scope.row.cj">{{ getManufacturerLabel(scope.row.cj) || '-' }}</span>
<span v-else> {{ scope.row.cheCjName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true" width="100">
<el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.ptype === '1'">jb</span>
<span v-else-if="scope.row.ptype === '2'">label</span>
......@@ -136,46 +143,46 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="lot" prop="lot" :show-overflow-tooltip="true" width="110">
<el-table-column label="lot" prop="lot" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.lot || '-' }}
</template>
</el-table-column>
<el-table-column label="location" prop="location" :show-overflow-tooltip="true" width="110">
<el-table-column label="location" prop="location" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.location || '-' }}
</template>
</el-table-column>
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true" width="110">
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="rank" prop="rank" :show-overflow-tooltip="true" width="110">
<el-table-column label="rank" prop="rank" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.rank || '-' }}
</template>
</el-table-column>
<el-table-column label="qty" prop="qty" :show-overflow-tooltip="true" width="110">
<el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- <span v-if="scope.row.qty >= 0 ">{{scope.row.qty}}</span>-->
<!-- <span v-else>-</span>-->
{{ scope.row.qty || '-' }}
</template>
</el-table-column>
<el-table-column label="label_id" prop="labelId" :show-overflow-tooltip="true" width="90">
<el-table-column label="label_id" prop="labelId" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.mac || '-' }}
</template>
</el-table-column>
<el-table-column label="创建人" prop="createBy" :show-overflow-tooltip="true" width="130">
<el-table-column label="创建人" prop="createBy" :show-overflow-tooltip="true" width="80">
<template slot-scope="scope">
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
<el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true" width="130">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
......@@ -294,24 +301,27 @@
<el-row>
<el-col :span="12">
<el-form-item v-show="isShow" label="bzq：" prop="cheBzq">
<span>{{ singleDetails.cheBzq|| '-' }}</span>
<span>{{ formatCheBzq(singleDetails.cheBzq)|| '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-show="isShow" label="bz：" prop="cheBz">
<span>{{ singleDetails.cheBz|| '-' }}</span>
<!-- <el-form-item v-show="isShow" label="bz：" prop="cheBz">-->
<!-- <span>{{ singleDetails.cheBz|| '-' }}</span>-->
<!-- </el-form-item>-->
<el-form-item v-show="isShow" label="cjName：" prop="cheCjName">
<span>{{ singleDetails.cheCjName|| '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-show="isShow" label="cjName：" prop="cheCjName">
<span>{{ singleDetails.cheCjName|| '-' }}</span>
<el-form-item v-show="isShow" label="unit：" prop="cheUnit">
<span>{{ singleDetails.cheUnit|| '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-show="isShow" label="unit：" prop="cheUnit">
<span>{{ singleDetails.cheUnit|| '-' }}</span>
<el-form-item label="创建人：" prop="createBy">
<span>{{ singleDetails.createName||'-' }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -383,7 +393,6 @@ export default {
},
cheBzq: '',
cheBz: '',
cheCjName: '',
cheUnit: '',
// 状态菜单
statusOptions: [
......@@ -481,6 +490,7 @@ export default {
methods: {
getwareHouse() {
getDicts('WAREHOUSE').then(res => {
console.log(res)
this.warehouseList = res.data
const whId = res.data[0].dictValue
this.form.whId = whId
......@@ -500,6 +510,7 @@ export default {
listIncomeWmsBox(this.queryParams).then(
response => {
this.incomeWmsBoxList = response.rows
console.log('this.cheCjName', this.cheCjName)
this.total = response.total
this.loading = false
}
......@@ -663,10 +674,10 @@ export default {
},
// 获取所选行详情信息操作
handleDetail(row) {
this.singleDetails = []
const id = row.businessId
getIncomeWmsBox(id).then(response => {
this.singleDetails = response.data
this.singleDetails.createName = row.createName
if (this.singleDetails.ptype !== '30') {
this.isShow = false
}
......@@ -675,8 +686,10 @@ export default {
this.openDetails = !this.openDetails
this.isShow = true
this.reset()
},
formatCheBzq(date) {
return date ? date.split(' ')[0] : ''
}
}
}
</script>
......
src/views/template/outcomeWmsApply.vue
View file @ 4ca1c541
......@@ -190,6 +190,11 @@
<!-- {{ scope.row.remarks || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="创建人" prop="createBy" :show-overflow-tooltip="true" width="80">
<template slot-scope="scope">
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
......@@ -311,21 +316,21 @@
</el-select>
</el-form-item>
<el-form-item label="材料一" prop="qty1">
<el-form-item label="Na3PO4" prop="qty1">
<el-input v-model.trim="formPn.qty1" placeholder="请输入数量" :disabled="disabled1" style="width: 200px" />
<span class="dialogPn">{{ newQty1 }}</span>
<span class="dialogPn">{{ newQty1 }}</span><span v-if="newQty1" class="dialogUnit">KG</span>
</el-form-item>
<el-form-item label="材料二" prop="qty2">
<el-form-item label="NB-Y" prop="qty2">
<el-input v-model.trim="formPn.qty2" placeholder="请输入数量" :disabled="disabled2" style="width: 200px" />
<span class="dialogPn">{{ newQty2 }}</span>
<span class="dialogPn">{{ newQty2 }}</span><span v-if="newQty2" class="dialogUnit">KG</span>
</el-form-item>
<el-form-item label="材料三" prop="qty3">
<el-form-item label="NB-Z" prop="qty3">
<el-input v-model.trim="formPn.qty3" placeholder="请输入数量" :disabled="disabled3" style="width: 200px" />
<span class="dialogPn">{{ newQty3 }}</span>
<span class="dialogPn">{{ newQty3 }}</span><span v-if="newQty3" class="dialogUnit">KG</span>
</el-form-item>
<el-form-item label="材料四" prop="qty4">
<el-form-item label="NB-C" prop="qty4">
<el-input v-model.trim="formPn.qty4" placeholder="请输入数量" :disabled="disabled4" style="width: 200px" />
<span class="dialogPn">{{ newQty4 }}</span>
<span class="dialogPn">{{ newQty4 }}</span><span v-if="newQty4" class="dialogUnit">KG</span>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -384,8 +389,8 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="创建人：" prop="createBy">
<span>{{ singleDetails.createBy|| '-' }}</span>
<el-form-item label="创建人：" prop="createName">
<span>{{ singleDetails.createName|| '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -606,15 +611,15 @@ export default {
},
newQty2() {
// 计算新的数量值
return this.formPn.qty2 ? this.formPn.qty2 * 20 : ''
return this.formPn.qty2 ? this.formPn.qty2 * 15 : ''
},
newQty3() {
// 计算新的数量值
return this.formPn.qty3 ? this.formPn.qty3 * 30 : ''
return this.formPn.qty3 ? this.formPn.qty3 * 18 : ''
},
newQty4() {
// 计算新的数量值
return this.formPn.qty4 ? this.formPn.qty4 * 40 : ''
return this.formPn.qty4 ? this.formPn.qty4 * 20 : ''
}
},
/** 路由离开前存储筛选条件*/
......@@ -769,7 +774,7 @@ export default {
this.disabled4 = true
this.formPn = response.data
this.formPn.whId = response.data.whId
this.$set(this.formPn, 'qty2', response.data.qty / 10)
this.$set(this.formPn, 'qty2', response.data.qty / 15)
this.openGain = true
this.title = '修改领用申请'
} else if (response.data.pn === 'zzz') {
......@@ -778,7 +783,7 @@ export default {
this.disabled4 = true
this.formPn = response.data
this.formPn.whId = response.data.whId
this.$set(this.formPn, 'qty3', response.data.qty / 10)
this.$set(this.formPn, 'qty3', response.data.qty / 18)
this.openGain = true
this.title = '修改领用申请'
} else if (response.data.pn === 'qqq') {
......@@ -787,7 +792,7 @@ export default {
this.disabled3 = true
this.formPn = response.data
this.formPn.whId = response.data.whId
this.$set(this.formPn, 'qty4', response.data.qty / 10)
this.$set(this.formPn, 'qty4', response.data.qty / 20)
this.openGain = true
this.title = '修改领用申请'
}
......@@ -857,11 +862,11 @@ export default {
if (item.qty1 && item.qty1 > 0) {
multiplier = 10
} else if (item.qty2 && item.qty2 > 0) {
multiplier = 20
multiplier = 15
} else if (item.qty3 && item.qty3 > 0) {
multiplier = 30
multiplier = 18
} else {
multiplier = 40
multiplier = 20
}
// 计算乘积时要访问对象的属性值
......@@ -886,7 +891,7 @@ export default {
{
whId: this.formPn.whId,
qty: this.newQty1,
pn: 'xxx',
pn: 'Na3PO4',
ptype: '30',
dealStatus: '0',
sureStatus: '0',
......@@ -895,7 +900,7 @@ export default {
{
whId: this.formPn.whId,
qty: this.newQty2,
pn: 'yyy',
pn: 'NB-Y',
ptype: '30',
dealStatus: '0',
sureStatus: '0',
......@@ -904,7 +909,7 @@ export default {
{
whId: this.formPn.whId,
qty: this.newQty3,
pn: 'zzz',
pn: 'NB-Z',
ptype: '30',
dealStatus: '0',
sureStatus: '0',
......@@ -913,7 +918,7 @@ export default {
{
whId: this.formPn.whId,
qty: this.newQty4,
pn: 'qqq',
pn: 'NB-C',
ptype: '30',
dealStatus: '0',
sureStatus: '0',
......@@ -989,6 +994,7 @@ export default {
getOutcomeWmsApply(id).then(response => {
if (response.data.length > 0) {
this.outTempList = response.data
this.singleDetails.createName = row.createName
this.isShow = true
}
})
......@@ -1019,4 +1025,11 @@ export default {
left: 20% !important;
text-align: center !important;
}
::v-deep .dialogUnit
{
display: inline-block;
position: relative ;
left: 25%;
text-align: center;
}
</style>
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