mirror of
https://github.com/shawncai/ERP.git
synced 2024-09-20 15:06:11 +08:00
beyond 7.3
This commit is contained in:
beyond
parent
bcb7fbef72
commit
c34ec65adf
|
|
@ -60,6 +60,7 @@
|
|||
"vue-element-extends": "^1.0.5",
|
||||
"vue-google-maps": "^0.1.21",
|
||||
"vue-i18n": "7.3.2",
|
||||
"vue-print-nb": "^1.3.0",
|
||||
"vue-router": "3.0.1",
|
||||
"vue-socket.io": "^3.0.4",
|
||||
"vue-splitpane": "1.0.2",
|
||||
|
|
@ -96,6 +97,7 @@
|
|||
"lint-staged": "7.2.2",
|
||||
"mini-css-extract-plugin": "0.4.1",
|
||||
"node-notifier": "5.2.1",
|
||||
"node-sass": "^4.12.0",
|
||||
"optimize-css-assets-webpack-plugin": "5.0.0",
|
||||
"ora": "3.0.0",
|
||||
"path-to-regexp": "2.4.0",
|
||||
|
|
|
|||
|
|
@ -21,13 +21,16 @@ import './icons' // icon
|
|||
import './errorLog' // error log
|
||||
import './permission' // permission control
|
||||
import './mock' // simulation data
|
||||
|
||||
import Print from 'vue-print-nb'
|
||||
import * as filters from './filters' // global filters
|
||||
|
||||
Vue.use(Element, {
|
||||
size: Cookies.get('size') || 'medium', // set element-ui default size
|
||||
i18n: (key, value) => i18n.t(key, value)
|
||||
})
|
||||
|
||||
Vue.use(Print)
|
||||
|
||||
Vue.use(VueElementExtends)
|
||||
|
||||
// register global utility filters.
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<!-- 打印操作 -->
|
||||
<el-button v-waves class="filter-item" icon="el-icon-printer" style="width: 86px" @click="handlePrint">{{ $t('public.print') }}</el-button>
|
||||
<!-- 新建操作 -->
|
||||
<el-button v-waves class="filter-item" icon="el-icon-plus" type="success" style="width: 86px" @click="handleAdd">{{ $t('public.add') }}</el-button>
|
||||
<el-button v-permission="['54-67-82-1']" v-waves class="filter-item" icon="el-icon-plus" type="success" style="width: 86px" @click="handleAdd">{{ $t('public.add') }}</el-button>
|
||||
</el-card>
|
||||
|
||||
<el-card class="box-card" style="margin-top: 10px" shadow="never">
|
||||
|
|
@ -128,11 +128,11 @@
|
|||
<!-- </el-table-column>-->
|
||||
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-show="scope.row.providePersonId === null" title="修改" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
|
||||
<el-button v-permission="['54-67-81-3']" v-show="scope.row.providePersonId === null" title="修改" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
|
||||
<el-button v-show="scope.row.providePersonId === null" title="确认" type="warning" size="mini" icon="el-icon-check" circle @click="handleReview(scope.row)"/>
|
||||
<el-button v-show="scope.row.providePersonId !== null && scope.row.stat === 1" title="丢失" type="danger" size="mini" icon="el-icon-close" circle @click="handleEdit2(scope.row)"/>
|
||||
<el-button v-show="scope.row.providePersonId !== null && scope.row.stat === 1" title="归还" type="primary" size="mini" icon="el-icon-back" circle @click="handleEdit3(scope.row)"/>
|
||||
<el-button v-show="scope.row.providePersonId === null" title="删除" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
|
||||
<el-button v-permission="['54-67-81-36']" v-show="scope.row.providePersonId !== null && scope.row.stat === 1" title="归还" type="primary" size="mini" icon="el-icon-back" circle @click="handleEdit3(scope.row)"/>
|
||||
<el-button v-permission="['54-67-81-3']" v-show="scope.row.providePersonId === null" title="删除" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@
|
|||
</el-editable-column>
|
||||
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" prop="checkPersonname" align="center" label="检验人员" min-width="150px">
|
||||
<template slot="edit" slot-scope="scope">
|
||||
<el-input v-model="scope.row.checkPersonname" @focus="handlechoosestaff"/>
|
||||
<el-input v-model="scope.row.checkPersonname" @focus="handlechoosestaff(scope)"/>
|
||||
<my-emp2 :staffcontrol.sync="staffcontrol" @chuli="chuli(scope, $event)"/>
|
||||
</template>
|
||||
</el-editable-column>
|
||||
|
|
@ -272,15 +272,29 @@ export default {
|
|||
components: { DetailReport3, DetailReport2, DetailReport, MyEmp2, MyMater, MyQuality, MyAccept, ProduceTask, MyArrival, MyCenter, MyDelivery, MySupplier, MyDetail, MyEmp },
|
||||
data() {
|
||||
const validatePass = (rule, value, callback) => {
|
||||
console.log(value)
|
||||
// console.log(value)
|
||||
if (value === '') {
|
||||
callback(new Error('请选择'))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
const validatePass100 = (rule, value, callback) => {
|
||||
console.log('value', value)
|
||||
if (value === undefined || value === null || value === '') {
|
||||
// callback(new Error('请选择供应商'))
|
||||
this.$notify.error({
|
||||
title: '错误',
|
||||
message: '请选择质检人员',
|
||||
offset: 100
|
||||
})
|
||||
callback()
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
const validatePass2 = (rule, value, callback) => {
|
||||
console.log(this.supplierId)
|
||||
// console.log(this.supplierId)
|
||||
if (this.personalForm.productCode === undefined || this.personalForm.productCode === null || this.personalForm.productCode === '') {
|
||||
callback(new Error('请选择抽检商品'))
|
||||
} else {
|
||||
|
|
@ -288,8 +302,8 @@ export default {
|
|||
}
|
||||
}
|
||||
const validatePass10 = (rule, value, callback) => {
|
||||
console.log(this.personalForm.checkQuantity)
|
||||
console.log(this.personalForm.sampleQuantity)
|
||||
// console.log(this.personalForm.checkQuantity)
|
||||
// console.log(this.personalForm.sampleQuantity)
|
||||
if (this.personalForm.sampleQuantity === undefined || this.personalForm.sampleQuantity === null || this.personalForm.sampleQuantity === '') {
|
||||
callback(new Error('请输入抽样数量'))
|
||||
} else if (Number(this.personalForm.sampleQuantity) > Number(this.personalForm.checkQuantity)) {
|
||||
|
|
@ -300,6 +314,8 @@ export default {
|
|||
}
|
||||
}
|
||||
return {
|
||||
// 控制scope
|
||||
kongscope: '',
|
||||
results: [{ value: 1, label: '合格' }, { value: 2, label: '不合格' }],
|
||||
// 控制报检部门是否可以编辑
|
||||
IsInspectionDeptId: false,
|
||||
|
|
@ -447,7 +463,7 @@ export default {
|
|||
{ required: true, message: '请输入合格数量', trigger: 'blur' }
|
||||
],
|
||||
checkPersonname: [
|
||||
{ required: true, message: '请选择检验人员', trigger: 'blur' }
|
||||
{ required: true, validator: validatePass100, trigger: 'blur' }
|
||||
],
|
||||
checkDeptId: [
|
||||
{ required: true, message: '请选择检验部门', trigger: 'blur' }
|
||||
|
|
@ -464,8 +480,8 @@ export default {
|
|||
return row.sampleQuantity
|
||||
},
|
||||
getfailedQuantity(row) {
|
||||
console.log(row.checkQuantity)
|
||||
console.log(row.passQuantity)
|
||||
// console.log(row.checkQuantity)
|
||||
// console.log(row.passQuantity)
|
||||
row.failedQuantity = row.sampleQuantity - row.passQuantity
|
||||
return row.failedQuantity
|
||||
},
|
||||
|
|
@ -509,12 +525,17 @@ export default {
|
|||
}
|
||||
},
|
||||
// 检验人员focus事件触发
|
||||
handlechoosestaff() {
|
||||
handlechoosestaff(scope) {
|
||||
this.staffcontrol = true
|
||||
this.kongscope = scope
|
||||
},
|
||||
chuli(scope, val) {
|
||||
scope.row.checkPersonname = val.personName
|
||||
scope.row.checkPersonId = val.id
|
||||
console.log('scope', scope)
|
||||
console.log('val', val)
|
||||
// scope.row.checkPersonname = val.personName
|
||||
// scope.row.checkPersonId = val.id
|
||||
this.kongscope.row.checkPersonname = val.personName
|
||||
this.kongscope.row.checkPersonId = val.id
|
||||
},
|
||||
// 物品信息focus事件
|
||||
handlemater() {
|
||||
|
|
@ -530,7 +551,7 @@ export default {
|
|||
},
|
||||
// 源单为质检申请单时返回数据
|
||||
report(val) {
|
||||
console.log(val)
|
||||
// console.log(val)
|
||||
this.personalForm.sourceSerialNumber = val.id
|
||||
this.personalForm.productCode = val.productCode
|
||||
this.personalForm.productName = val.productName
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<div class="filter-container">
|
||||
<el-input :placeholder="$t('repair.model')" v-model="listQuery.productType" style="width: 200px;" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
|
||||
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">{{ $t('table.search') }}</el-button>
|
||||
<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">{{ $t('table.add') }}</el-button>
|
||||
<el-button v-permission="['54-67-80-1']" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">{{ $t('table.add') }}</el-button>
|
||||
</div>
|
||||
<div class="app-container">
|
||||
<el-table
|
||||
|
|
@ -46,8 +46,8 @@
|
|||
</el-table-column>
|
||||
<el-table-column :resizable='false' :label="$t('table.actions')" align="center" min-width="200" class-name="small-padding fixed-width" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table2.edit') }}</el-button>
|
||||
<el-button size="mini" type="danger" @click="handleDelete(scope.row)">{{ $t('repair.delete') }}</el-button>
|
||||
<el-button v-permission="['54-67-80-3']" type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table2.edit') }}</el-button>
|
||||
<el-button v-permission="['54-67-80-2']" size="mini" type="danger" @click="handleDelete(scope.row)">{{ $t('repair.delete') }}</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
|
|||
|
|
@ -48,9 +48,9 @@
|
|||
<span>{{ scope.row.createTime }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-permission="[86]" :resizable="false" :label="$t('table.actions')" align="center" min-width="100" >
|
||||
<el-table-column :resizable="false" :label="$t('table.actions')" align="center" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-button v-permission="[86]" type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table2.edit') }}</el-button>
|
||||
<el-button v-permission="['54-67-71-3']" type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table2.edit') }}</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
|
|||
|
|
@ -1,171 +1,184 @@
|
|||
<template>
|
||||
<el-dialog :visible.sync="editVisible" :detailcontrol="detailcontrol" :detaildata="detaildata" :close-on-press-escape="false" :title="personalForm.applyNumber +' 详情'" append-to-body width="1010px" class="edit" top="-10px" @close="$emit('update:detailcontrol', false)">
|
||||
<!--基本信息-->
|
||||
<el-card class="box-card" style="margin-top: 63px" shadow="never">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">基本信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :model="personalForm" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.title')" style="width: 100%;">
|
||||
{{ personalForm.title }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.stockType')" prop="stockType" style="width: 100%;">
|
||||
{{ personalForm.stockTypeName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.applyPersonId')" style="width: 100%;">
|
||||
{{ personalForm.applyPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.applyDeptId')" prop="applyDeptId" style="width: 100%;">
|
||||
{{ personalForm.applyDeptName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.sourceType')" prop="sourceType" style="width: 100%;">
|
||||
{{ personalForm.sourceType | sourceTypeFilter }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.applyDate')" style="width: 100%;">
|
||||
{{ detailTime }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
<!--子件信息-->
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">采购申请明细来源</h2>
|
||||
<div class="container">
|
||||
<el-editable
|
||||
ref="editable"
|
||||
:data.sync="list2"
|
||||
:edit-config="{ showIcon: true, showStatus: true}"
|
||||
class="click-table1"
|
||||
stripe
|
||||
border
|
||||
size="medium"
|
||||
style="width: 100%">
|
||||
<el-editable-column type="selection" min-width="55" align="center"/>
|
||||
<el-editable-column label="序号" min-width="55" align="center" type="index"/>
|
||||
<el-editable-column prop="productCode" align="center" label="物品编号" min-width="150px"/>
|
||||
<el-editable-column prop="productName" align="center" label="物品名称" min-width="150px"/>
|
||||
<el-editable-column prop="productType" align="center" label="规格" min-width="150px"/>
|
||||
<el-editable-column prop="color" align="center" label="颜色" min-width="150px"/>
|
||||
<el-editable-column prop="unit" align="center" label="单位" min-width="150px"/>
|
||||
<el-editable-column prop="requireQuantity" align="center" label="需求数量" min-width="150px"/>
|
||||
<el-editable-column prop="requireDate" align="center" label="需求日期" min-width="170px"/>
|
||||
<el-editable-column prop="applyReason" align="center" label="申请原因" min-width="150px"/>
|
||||
<el-editable-column prop="sourceSerialNumber" align="center" label="源单序号" min-width="150px"/>
|
||||
</el-editable>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">采购申请明细</h2>
|
||||
<div class="container">
|
||||
<el-editable
|
||||
ref="editable2"
|
||||
:data.sync="list3"
|
||||
:edit-config="{ showIcon: true, showStatus: true}"
|
||||
class="click-table1"
|
||||
stripe
|
||||
border
|
||||
size="medium"
|
||||
style="width: 100%">
|
||||
<el-editable-column label="序号" min-width="55" align="center" type="index"/>
|
||||
<el-editable-column prop="productCode" align="center" label="物品编号" min-width="150px"/>
|
||||
<el-editable-column prop="productName" align="center" label="物品名称" min-width="150px"/>
|
||||
<el-editable-column prop="productType" align="center" label="规格" min-width="150px"/>
|
||||
<el-editable-column prop="color" align="center" label="颜色" min-width="150px"/>
|
||||
<el-editable-column prop="unit" align="center" label="单位" min-width="150px"/>
|
||||
<el-editable-column prop="requireDate" align="center" label="需求日期" min-width="170px"/>
|
||||
<el-editable-column prop="applyQuantity" align="center" label="申请数量" min-width="150px"/>
|
||||
<el-editable-column prop="planQuantity" align="center" label="已下达数量" min-width="150px"/>
|
||||
<el-editable-column prop="sourceSerialNumber" align="center" label="源单序号" min-width="150px"/>
|
||||
</el-editable>
|
||||
</div>
|
||||
</el-card>
|
||||
<!--审核状态-->
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">审批记录</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-table
|
||||
:data="reviewList"
|
||||
border
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
prop="step"
|
||||
align="center"
|
||||
label="当前步骤"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="stepHandlerName"
|
||||
align="center"
|
||||
label="当前审批人"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="handleTime"
|
||||
align="center"
|
||||
label="审批时间"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="stat"
|
||||
align="center"
|
||||
label="审批意见"
|
||||
min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.stat | statfilter }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">备注信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :model="personalForm" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.createPersonName2')" prop="stockType" style="width: 100%;">
|
||||
{{ personalForm.createPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.createDate2')" style="width: 100%;">
|
||||
{{ personalForm.createDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.endPersonName')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.endPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.endDate')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.endDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.modifyPersonName')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.modifyPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.modifyDate')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.modifyDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
<div id="printTest" >
|
||||
<!--基本信息-->
|
||||
<el-card class="box-card" style="margin-top: 63px" shadow="never">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">基本信息</h2>
|
||||
<button v-print="'#printTest'" class="print" style="font-size: 10px;">打印</button>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :model="personalForm" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item class="print2" label="单据编号" style="width: 100%;display: none">
|
||||
{{ personalForm.applyNumber }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.title')" style="width: 100%;">
|
||||
{{ personalForm.title }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.stockType')" prop="stockType" style="width: 100%;">
|
||||
{{ personalForm.stockTypeName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.applyPersonId')" style="width: 100%;">
|
||||
{{ personalForm.applyPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.applyDeptId')" prop="applyDeptId" style="width: 100%;">
|
||||
{{ personalForm.applyDeptName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.sourceType')" prop="sourceType" style="width: 100%;">
|
||||
{{ personalForm.sourceType | sourceTypeFilter }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockApply.applyDate')" style="width: 100%;">
|
||||
{{ detailTime }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
<!-- <div id="printTest" >-->
|
||||
<!-- <p>锄禾日当午</p>-->
|
||||
<!-- <p>汗滴禾下土 </p>-->
|
||||
<!-- <p>谁知盘中餐</p>-->
|
||||
<!-- <p>粒粒皆辛苦</p>-->
|
||||
<!-- </div>-->
|
||||
<!-- <button v-print="'#printTest'">打印</button>-->
|
||||
</el-card>
|
||||
<!--子件信息-->
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">采购申请明细来源</h2>
|
||||
<div class="container">
|
||||
<el-editable
|
||||
ref="editable"
|
||||
:data.sync="list2"
|
||||
:edit-config="{ showIcon: true, showStatus: true}"
|
||||
class="click-table1"
|
||||
border
|
||||
size="medium"
|
||||
style="width: 100%">
|
||||
<el-editable-column type="selection" min-width="55" align="center"/>
|
||||
<el-editable-column label="序号" min-width="55" align="center" type="index"/>
|
||||
<el-editable-column prop="productCode" align="center" label="物品编号"/>
|
||||
<el-editable-column prop="productName" align="center" label="物品名称" />
|
||||
<el-editable-column prop="productType" align="center" label="规格" />
|
||||
<el-editable-column prop="color" align="center" label="颜色" />
|
||||
<el-editable-column prop="unit" align="center" label="单位" />
|
||||
<el-editable-column prop="requireQuantity" align="center" label="需求数量" />
|
||||
<el-editable-column prop="requireDate" align="center" label="需求日期" />
|
||||
<el-editable-column prop="applyReason" align="center" label="申请原因" />
|
||||
<el-editable-column prop="sourceSerialNumber" align="center" label="源单序号" />
|
||||
</el-editable>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">采购申请明细</h2>
|
||||
<div class="container">
|
||||
<el-editable
|
||||
ref="editable2"
|
||||
:data.sync="list3"
|
||||
:edit-config="{ showIcon: true, showStatus: true}"
|
||||
class="click-table1"
|
||||
border
|
||||
size="medium"
|
||||
style="width: 100%">
|
||||
<el-editable-column label="序号" min-width="55" align="center" type="index"/>
|
||||
<el-editable-column prop="productCode" align="center" label="物品编号"/>
|
||||
<el-editable-column prop="productName" align="center" label="物品名称"/>
|
||||
<el-editable-column prop="productType" align="center" label="规格"/>
|
||||
<el-editable-column prop="color" align="center" label="颜色"/>
|
||||
<el-editable-column prop="unit" align="center" label="单位"/>
|
||||
<el-editable-column prop="requireDate" align="center" label="需求日期"/>
|
||||
<el-editable-column prop="applyQuantity" align="center" label="申请数量"/>
|
||||
<el-editable-column prop="planQuantity" align="center" label="已下达数量"/>
|
||||
<el-editable-column prop="sourceSerialNumber" align="center" label="源单序号"/>
|
||||
</el-editable>
|
||||
</div>
|
||||
</el-card>
|
||||
<!--审核状态-->
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">审批记录</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-table
|
||||
:data="reviewList"
|
||||
border
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
prop="step"
|
||||
align="center"
|
||||
label="当前步骤"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="stepHandlerName"
|
||||
align="center"
|
||||
label="当前审批人"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="handleTime"
|
||||
align="center"
|
||||
label="审批时间"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="stat"
|
||||
align="center"
|
||||
label="审批意见"
|
||||
min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.stat | statfilter }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">备注信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :model="personalForm" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.createPersonName2')" prop="stockType" style="width: 100%;">
|
||||
{{ personalForm.createPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.createDate2')" style="width: 100%;">
|
||||
{{ personalForm.createDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.endPersonName')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.endPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.endDate')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.endDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.modifyPersonName')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.modifyPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.modifyDate')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.modifyDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
|
|
@ -280,4 +293,12 @@ export default {
|
|||
.el-col-12{
|
||||
width: 49%;
|
||||
}
|
||||
@media print {
|
||||
.print {
|
||||
display: none;
|
||||
}
|
||||
.print2 {
|
||||
display: block !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,260 +1,263 @@
|
|||
<template>
|
||||
<el-dialog :visible.sync="editVisible" :detailcontrol="detailcontrol" :detaildata="detaildata" :close-on-press-escape="false" :title="personalForm.orderNumber +' 采购订单详情信息'" append-to-body width="1010px" class="edit" top="-10px" @close="$emit('update:detailcontrol', false)">
|
||||
<!--基本信息-->
|
||||
<el-card class="box-card" style="margin-top: 63px" shadow="never">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">基本信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :model="personalForm" :inline="true" status-icon class="demo-ruleForm" label-width="100px" style="margin-left: 30px;">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.inquiryTitle')" style="width: 100%;">
|
||||
<span>{{ personalForm.inquiryTitle }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.sourceType')" prop="sourceType" style="width: 100%;">
|
||||
<span>{{ personalForm.sourceType | sourceTypeFilter }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.supplierId')" prop="supplierId" style="width: 100%;">
|
||||
<span>{{ personalForm.supplierName }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockOrder.stockPersonId')" prop="inquiryPersonId" style="width: 100%;">
|
||||
<span>{{ personalForm.stockPersonName }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.stockTypeId')" prop="stockTypeId" style="width: 100%;">
|
||||
<span>{{ personalForm.stockTypeName }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.deptId')" prop="deptId" style="width: 100%;">
|
||||
<span>{{ personalForm.deptName }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.inquiryDate')" prop="inquiryDate" style="width: 100%;">
|
||||
<span>{{ personalForm.inquiryDate }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.inquiryTimes')" style="width: 100%;">
|
||||
<span>{{ personalForm.inquiryTimes }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.isVat')" style="width: 100%;">
|
||||
<span>{{ personalForm.isVat | isVatFilter }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.currency')" style="width: 100%;">
|
||||
<span>{{ personalForm.currency | currencyFilter }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockOrder.supplierNumber')" style="width: 100%;">
|
||||
<span>{{ personalForm.supplierNumber }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
<!--子件信息-->
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">采购订单明细</h2>
|
||||
<div class="container">
|
||||
<el-editable
|
||||
ref="editable"
|
||||
:data.sync="list2"
|
||||
:edit-config="{ showIcon: true, showStatus: true}"
|
||||
class="click-table1"
|
||||
stripe
|
||||
border
|
||||
size="medium"
|
||||
style="width: 100%">
|
||||
<el-editable-column label="序号" min-width="55" align="center" type="index"/>
|
||||
<el-editable-column prop="productCode" align="center" label="物品编号" min-width="150px"/>
|
||||
<el-editable-column prop="productName" align="center" label="物品名称" min-width="150px"/>
|
||||
<el-editable-column prop="productType" align="center" label="规格" min-width="150px"/>
|
||||
<el-editable-column prop="unit" align="center" label="单位" min-width="150px"/>
|
||||
<el-editable-column prop="stockQuantity" align="center" label="采购数量" min-width="150px"/>
|
||||
<el-editable-column prop="price" align="center" label="单价" min-width="170px"/>
|
||||
<el-editable-column prop="includeTaxPrice" align="center" label="含税价" min-width="170px"/>
|
||||
<el-editable-column prop="taxRate" align="center" label="税率(%)" min-width="170px"/>
|
||||
<el-editable-column prop="money" align="center" label="金额" min-width="150px"/>
|
||||
<el-editable-column prop="includeTaxMoney" align="center" label="含税金额" min-width="150px"/>
|
||||
<el-editable-column prop="tax" align="center" label="税额" min-width="150px"/>
|
||||
<el-editable-column prop="deliveryDate" align="center" label="交货日期" min-width="170px"/>
|
||||
<el-editable-column prop="discountRate" align="center" label="折扣(%)" min-width="170px"/>
|
||||
<el-editable-column prop="discountMoney" align="center" label="折扣额" min-width="170px"/>
|
||||
<el-editable-column prop="remark" align="center" label="备注" min-width="150px"/>
|
||||
<el-editable-column prop="sourceNumber" align="center" label="源单编号" min-width="150px"/>
|
||||
<el-editable-column prop="sourceSerialNumber" align="center" label="源单序号" min-width="150px"/>
|
||||
<el-editable-column prop="arrivalQuantity" align="center" label="已到货数量" min-width="150px"/>
|
||||
<el-editable-column prop="returnQuantity" align="center" label="退货数量" min-width="150px"/>
|
||||
<el-editable-column prop="actualArrivalQuantity" align="center" label="实到数量" min-width="150px"/>
|
||||
</el-editable>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" shadow="never" style="margin-top: 10px">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">合计信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :inline="true" status-icon class="demo-ruleForm" label-width="130px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="采购数量合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allQuantity }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="金额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="税额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allTaxMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="含税金额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allIncludeTaxMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="整单折扣金额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allDiscountMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="折后含税金额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allIncludeTaxDiscountMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="其他费用支出合计" style="width: 100%;">
|
||||
<span>{{ personalForm.otherMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">备注信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :model="personalForm" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.createPersonName2')" prop="stockType" style="width: 100%;">
|
||||
{{ personalForm.createPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.createDate2')" style="width: 100%;">
|
||||
{{ personalForm.createDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.endPersonName')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.endPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.endDate')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.endDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.modifyPersonName')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.modifyPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.modifyDate')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.modifyDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
<!--审核状态-->
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">审批记录</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-table
|
||||
:data="reviewList"
|
||||
border
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
prop="step"
|
||||
align="center"
|
||||
label="当前步骤"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="stepHandlerName"
|
||||
align="center"
|
||||
label="当前审批人"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="handleTime"
|
||||
align="center"
|
||||
label="审批时间"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="stat"
|
||||
align="center"
|
||||
label="审批意见"
|
||||
min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.stat | statfilter }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">到货信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-table
|
||||
:data="arravldata"
|
||||
border
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
prop="number"
|
||||
align="center"
|
||||
label="到货单编号"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="productCode"
|
||||
align="center"
|
||||
label="物品编号"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="arrivalQuantity"
|
||||
align="center"
|
||||
label="到货数量"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="arrivalDate"
|
||||
align="center"
|
||||
label="到货日期"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="acceptPersonName"
|
||||
align="center"
|
||||
label="点收人"
|
||||
min-width="150"/>
|
||||
</el-table>
|
||||
</div>
|
||||
</el-card>
|
||||
<div id="printTest" >
|
||||
<!--基本信息-->
|
||||
<el-card class="box-card" style="margin-top: 63px" shadow="never">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">基本信息</h2>
|
||||
<button v-print="'#printTest'" style="font-size: 10px;">打印</button>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :model="personalForm" :inline="true" status-icon class="demo-ruleForm" label-width="100px" style="margin-left: 30px;">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.inquiryTitle')" style="width: 100%;">
|
||||
<span>{{ personalForm.inquiryTitle }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.sourceType')" prop="sourceType" style="width: 100%;">
|
||||
<span>{{ personalForm.sourceType | sourceTypeFilter }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.supplierId')" prop="supplierId" style="width: 100%;">
|
||||
<span>{{ personalForm.supplierName }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockOrder.stockPersonId')" prop="inquiryPersonId" style="width: 100%;">
|
||||
<span>{{ personalForm.stockPersonName }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.stockTypeId')" prop="stockTypeId" style="width: 100%;">
|
||||
<span>{{ personalForm.stockTypeName }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.deptId')" prop="deptId" style="width: 100%;">
|
||||
<span>{{ personalForm.deptName }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.inquiryDate')" prop="inquiryDate" style="width: 100%;">
|
||||
<span>{{ personalForm.inquiryDate }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.inquiryTimes')" style="width: 100%;">
|
||||
<span>{{ personalForm.inquiryTimes }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.isVat')" style="width: 100%;">
|
||||
<span>{{ personalForm.isVat | isVatFilter }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockInquiry.currency')" style="width: 100%;">
|
||||
<span>{{ personalForm.currency | currencyFilter }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('StockOrder.supplierNumber')" style="width: 100%;">
|
||||
<span>{{ personalForm.supplierNumber }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
<!--子件信息-->
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">采购订单明细</h2>
|
||||
<div class="container">
|
||||
<el-editable
|
||||
ref="editable"
|
||||
:data.sync="list2"
|
||||
:edit-config="{ showIcon: true, showStatus: true}"
|
||||
class="click-table1"
|
||||
stripe
|
||||
border
|
||||
size="medium"
|
||||
style="width: 100%">
|
||||
<el-editable-column label="序号" min-width="55" align="center" type="index"/>
|
||||
<el-editable-column prop="productCode" align="center" label="物品编号" min-width="150px"/>
|
||||
<el-editable-column prop="productName" align="center" label="物品名称" min-width="150px"/>
|
||||
<el-editable-column prop="productType" align="center" label="规格" min-width="150px"/>
|
||||
<el-editable-column prop="unit" align="center" label="单位" min-width="150px"/>
|
||||
<el-editable-column prop="stockQuantity" align="center" label="采购数量" min-width="150px"/>
|
||||
<el-editable-column prop="price" align="center" label="单价" min-width="170px"/>
|
||||
<el-editable-column prop="includeTaxPrice" align="center" label="含税价" min-width="170px"/>
|
||||
<el-editable-column prop="taxRate" align="center" label="税率(%)" min-width="170px"/>
|
||||
<el-editable-column prop="money" align="center" label="金额" min-width="150px"/>
|
||||
<el-editable-column prop="includeTaxMoney" align="center" label="含税金额" min-width="150px"/>
|
||||
<el-editable-column prop="tax" align="center" label="税额" min-width="150px"/>
|
||||
<el-editable-column prop="deliveryDate" align="center" label="交货日期" min-width="170px"/>
|
||||
<el-editable-column prop="discountRate" align="center" label="折扣(%)" min-width="170px"/>
|
||||
<el-editable-column prop="discountMoney" align="center" label="折扣额" min-width="170px"/>
|
||||
<el-editable-column prop="remark" align="center" label="备注" min-width="150px"/>
|
||||
<el-editable-column prop="sourceNumber" align="center" label="源单编号" min-width="150px"/>
|
||||
<el-editable-column prop="sourceSerialNumber" align="center" label="源单序号" min-width="150px"/>
|
||||
<el-editable-column prop="arrivalQuantity" align="center" label="已到货数量" min-width="150px"/>
|
||||
<el-editable-column prop="returnQuantity" align="center" label="退货数量" min-width="150px"/>
|
||||
<el-editable-column prop="actualArrivalQuantity" align="center" label="实到数量" min-width="150px"/>
|
||||
</el-editable>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" shadow="never" style="margin-top: 10px">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">合计信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :inline="true" status-icon class="demo-ruleForm" label-width="130px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="采购数量合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allQuantity }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="金额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="税额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allTaxMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="含税金额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allIncludeTaxMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="整单折扣金额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allDiscountMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="折后含税金额合计" style="width: 100%;">
|
||||
<span>{{ personalForm.allIncludeTaxDiscountMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="其他费用支出合计" style="width: 100%;">
|
||||
<span>{{ personalForm.otherMoney }}</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">备注信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-form :model="personalForm" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.createPersonName2')" prop="stockType" style="width: 100%;">
|
||||
{{ personalForm.createPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.createDate2')" style="width: 100%;">
|
||||
{{ personalForm.createDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.endPersonName')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.endPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.endDate')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.endDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.modifyPersonName')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.modifyPersonName }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item :label="$t('public.modifyDate')" prop="applyDate" style="width: 100%;">
|
||||
{{ personalForm.modifyDate }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
<!--审核状态-->
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">审批记录</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-table
|
||||
:data="reviewList"
|
||||
border
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
prop="step"
|
||||
align="center"
|
||||
label="当前步骤"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="stepHandlerName"
|
||||
align="center"
|
||||
label="当前审批人"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="handleTime"
|
||||
align="center"
|
||||
label="审批时间"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="stat"
|
||||
align="center"
|
||||
label="审批意见"
|
||||
min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.stat | statfilter }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="box-card" style="margin-top: 15px" shadow="never">
|
||||
<h2 ref="fuzhu" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">到货信息</h2>
|
||||
<div class="container" style="margin-top: 37px">
|
||||
<el-table
|
||||
:data="arravldata"
|
||||
border
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
prop="number"
|
||||
align="center"
|
||||
label="到货单编号"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="productCode"
|
||||
align="center"
|
||||
label="物品编号"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="arrivalQuantity"
|
||||
align="center"
|
||||
label="到货数量"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="arrivalDate"
|
||||
align="center"
|
||||
label="到货日期"
|
||||
min-width="150"/>
|
||||
<el-table-column
|
||||
prop="acceptPersonName"
|
||||
align="center"
|
||||
label="点收人"
|
||||
min-width="150"/>
|
||||
</el-table>
|
||||
</div>
|
||||
</el-card>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@
|
|||
</el-col>
|
||||
<el-col :span="3">
|
||||
<div class="shipei" style="width: 100%; height: 150px;background: white;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" > <div style="width:52%;margin-left: 37%;margin-top: 22%; color:black">{{ deskdata.seven }}</div>
|
||||
<div class="shipei3" style="width:74%; color:black">未付款金额(万元)</div></div>
|
||||
<div class="shipei22" style="margin-left: 30%;width:74%; color:black">未付款金额</div></div>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<div class="shipei" style="width: 100%; height: 150px;background: white;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" > <div style="width:52%;margin-left: 37%;margin-top: 22%; color:black">{{ deskdata.eight }}</div>
|
||||
<div class="shipei3" style="width:78%; color:black">截止本月应付(万元)</div></div>
|
||||
<div class="shipei22" style="margin-left: 30%;width:78%; color:black">截止本月应付</div></div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
<div class="shipei" style="width: 100%; height: 150px;background: #a48df5;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" > <div class="shipei2" style="width:80%;margin-left: 10px;margin-top: 5px; color:white">今日维修量</div><div style="width: 67%; color:white">{{ deskdata.eleven }}</div><div class="shipei2" style="width: 64%; color:white">同比昨日</div><div style="color: white">{{ deskdata.rateThree }}</div></div>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<div class="shipei" style="width: 100%; height: 150px;background: #22d3b9;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" > <div class="shipei2" style="width:82%;margin-left: 10px;margin-top: 5px; color:white">今日采购量</div><div style="width: 67%; color:white">{{ deskdata.twelve }}</div><div class="shipei2" style="width: 66%; color:white">同比昨日</div><div style="color: white">{{ deskdata.rateFour }}</div></div>
|
||||
<div class="shipei" style="width: 100%; height: 150px;background: #22d3b9;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" > <div class="shipei2" style="width:82%;margin-left: 10px;margin-top: 5px; color:white">本月采购量</div><div style="width: 67%; color:white">{{ deskdata.twelve }}</div><div class="shipei2" style="width: 66%; color:white">同比昨日</div><div style="color: white">{{ deskdata.rateFour }}</div></div>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<div class="shipei" style="width: 100%; height: 150px;background: #6f8aff;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" ><div class="shipei2" style="width:80%;margin-left: 10px;margin-top: 5px; color:white">今日排名</div><div style="width: 67%; color:white">{{ deskdata.thirteen }} </div><div class="shipei2" style="width: 64%; color:white">同比昨日</div><div style="color: white">{{ deskdata.rateFive }}</div></div>
|
||||
|
|
@ -59,10 +59,10 @@
|
|||
<div class="shipei" style="width: 100%; height: 150px;background: white;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" > <div style="width:52%;margin-left: 37%;margin-top: 22%; color:black">{{ deskdata.fourteen}}</div><div class="shipei3" style="width:63%; color:black">未收款订单(笔)</div></div>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<div class="shipei" style="width: 100%; height: 150px;background: white;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" > <div style="width:52%;margin-left: 37%;margin-top: 22%; color:black">{{ deskdata.fifteen }}</div><div class="shipei3" style="width:71%; color:black">未收款金额(万元)</div></div>
|
||||
<div class="shipei" style="width: 100%; height: 150px;background: white;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" > <div style="width:52%;margin-left: 37%;margin-top: 22%; color:black">{{ deskdata.fifteen }}</div><div class="shipei22" style="margin-left: 30%;width:71%; color:black">未收款金额</div></div>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<div class="shipei" style="width: 100%; height: 150px;background: white;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" ><div style="width:52%;margin-left: 37%;margin-top: 22%; color:black">{{ deskdata.sixteen }} </div><div class="shipei3" style="width:79%; color:black">截止本月应收(万元)</div></div>
|
||||
<div class="shipei" style="width: 100%; height: 150px;background: white;display: flex;align-items: center;justify-content: center;flex-wrap: wrap" ><div style="width:52%;margin-left: 37%;margin-top: 22%; color:black">{{ deskdata.sixteen }} </div><div class="shipei22" style="margin-left: 30%;width:79%; color:black">截止本月应收</div></div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
|
@ -844,6 +844,11 @@
|
|||
width: 100% !important;
|
||||
font-size: 14px !important;
|
||||
}
|
||||
.shipei22 {
|
||||
width: 100% !important;
|
||||
font-size: 14px !important;
|
||||
margin-left: 10% !important;
|
||||
}
|
||||
.shipei4 {
|
||||
width: 66% !important;
|
||||
font-size: 14px !important;
|
||||
|
|
|
|||
|
|
@ -213,7 +213,15 @@ export default {
|
|||
data() {
|
||||
const validatePass = (rule, value, callback) => {
|
||||
console.log(value)
|
||||
if (value === '') {
|
||||
if (this.personalForm.supplierId === undefined || this.personalForm.supplierId === null || this.personalForm.supplierId === '') {
|
||||
callback(new Error('请选择'))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
const validatePass3 = (rule, value, callback) => {
|
||||
console.log(value)
|
||||
if (this.personalForm.handlePersonId === undefined || this.personalForm.handlePersonId === null || this.personalForm.handlePersonId === '') {
|
||||
callback(new Error('请选择'))
|
||||
} else {
|
||||
callback()
|
||||
|
|
@ -227,6 +235,19 @@ export default {
|
|||
callback()
|
||||
}
|
||||
}
|
||||
const validatePass5 = (rule, value, callback) => {
|
||||
console.log('value', value)
|
||||
if (value === 0) {
|
||||
this.$notify.error({
|
||||
title: '错误',
|
||||
message: '本次支付金额未填写',
|
||||
offset: 100
|
||||
})
|
||||
callback()
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
return {
|
||||
pickerOptions1: {
|
||||
disabledDate: (time) => {
|
||||
|
|
@ -307,7 +328,7 @@ export default {
|
|||
// 采购申请单规则数据
|
||||
personalrules: {
|
||||
supplierId: [
|
||||
{ required: true, validator: validatePass, trigger: 'focus' }
|
||||
{ required: true, validator: validatePass, trigger: 'change' }
|
||||
],
|
||||
applyDate: [
|
||||
{ required: true, message: '请选择申请日期', trigger: 'change' }
|
||||
|
|
@ -316,7 +337,7 @@ export default {
|
|||
{ required: true, message: '请输入本次付款金额', trigger: 'blur' }
|
||||
],
|
||||
handlePersonId: [
|
||||
{ required: true, validator: validatePass, trigger: 'focus' }
|
||||
{ required: true, validator: validatePass3, trigger: 'change' }
|
||||
],
|
||||
payDate: [
|
||||
{ required: true, message: '请选择付款日期', trigger: 'change' }
|
||||
|
|
@ -327,7 +348,7 @@ export default {
|
|||
// 采购申请单明细列表规则
|
||||
validRules: {
|
||||
payThis: [
|
||||
{ required: true, message: '请输入本次支付金额', trigger: 'change' }
|
||||
{ required: true, validator: validatePass5, trigger: 'blur' }
|
||||
],
|
||||
advanceMoney: [
|
||||
{ required: true, validator: validatePass2, trigger: 'blur' }
|
||||
|
|
@ -601,6 +622,7 @@ export default {
|
|||
this.$refs.personalForm.validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs.editable.validate().then(valid => {
|
||||
console.log('zhixing')
|
||||
addpayment(parms, parms2, this.personalForm).then(res => {
|
||||
console.log(res)
|
||||
if (res.data.ret === 200) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue