Merge branch 'master' of http://222.71.165.188:3000/yunxi/yueyueshu
mhsnet
2 months ago
commit
15b0795f88
File diff suppressed because one or more lines are too long
@ -1,147 +1,138 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog title="详情"
|
<el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
|
||||||
:close-on-click-modal="false" append-to-body
|
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
|
||||||
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
|
<el-row :gutter="15" class="">
|
||||||
width="600px">
|
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
|
||||||
<el-row :gutter="15" class="">
|
<template v-if="!loading">
|
||||||
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
|
<el-col :span="24">
|
||||||
<template v-if="!loading">
|
<jnpf-form-tip-item label="母件编码" prop="pieceId">
|
||||||
<el-col :span="24" >
|
<p>{{ dataForm.pieceId }}</p>
|
||||||
<jnpf-form-tip-item label="母件编码"
|
</jnpf-form-tip-item>
|
||||||
prop="pieceId" >
|
</el-col>
|
||||||
<p>{{dataForm.pieceId}}</p>
|
<el-col :span="24">
|
||||||
</jnpf-form-tip-item>
|
<jnpf-form-tip-item label="母件名称" prop="pieceName">
|
||||||
</el-col>
|
<p>{{ dataForm.pieceName }}</p>
|
||||||
<el-col :span="24" >
|
</jnpf-form-tip-item>
|
||||||
<jnpf-form-tip-item label="母件名称"
|
</el-col>
|
||||||
prop="pieceName" >
|
<el-col :span="24">
|
||||||
<p>{{dataForm.pieceName}}</p>
|
<jnpf-form-tip-item label="规格型号" prop="models">
|
||||||
</jnpf-form-tip-item>
|
<p>{{ dataForm.models }}</p>
|
||||||
</el-col>
|
</jnpf-form-tip-item>
|
||||||
<el-col :span="24" >
|
</el-col>
|
||||||
<jnpf-form-tip-item label="规格型号"
|
<el-col :span="24">
|
||||||
prop="models" >
|
<jnpf-form-tip-item label="计量单位" prop="unit">
|
||||||
<p>{{dataForm.models}}</p>
|
<p>{{ dataForm.unit }}</p>
|
||||||
</jnpf-form-tip-item>
|
</jnpf-form-tip-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24" >
|
<el-col :span="24">
|
||||||
<jnpf-form-tip-item label="计量单位"
|
<jnpf-form-tip-item label="版本代号" prop="versionCode">
|
||||||
prop="unit" >
|
<p>{{ dataForm.versionCode }}</p>
|
||||||
<p>{{dataForm.unit}}</p>
|
</jnpf-form-tip-item>
|
||||||
</jnpf-form-tip-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="24">
|
||||||
<el-col :span="24" >
|
<jnpf-form-tip-item label="版本说明" prop="versionIllustrate">
|
||||||
<jnpf-form-tip-item label="版本代号"
|
<p>{{ dataForm.versionIllustrate }}</p>
|
||||||
prop="versionCode" >
|
</jnpf-form-tip-item>
|
||||||
<p>{{dataForm.versionCode}}</p>
|
</el-col>
|
||||||
</jnpf-form-tip-item>
|
<el-col :span="24">
|
||||||
</el-col>
|
<jnpf-form-tip-item label="版本日期" prop="versionDate">
|
||||||
<el-col :span="24" >
|
<p>{{ dataForm.versionDate }}</p>
|
||||||
<jnpf-form-tip-item label="版本说明"
|
</jnpf-form-tip-item>
|
||||||
prop="versionIllustrate" >
|
</el-col>
|
||||||
<p>{{dataForm.versionIllustrate}}</p>
|
<el-col :span="24">
|
||||||
</jnpf-form-tip-item>
|
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
|
||||||
</el-col>
|
<p>{{ dataForm.creatorTime }}</p>
|
||||||
<el-col :span="24" >
|
</jnpf-form-tip-item>
|
||||||
<jnpf-form-tip-item label="版本日期"
|
</el-col>
|
||||||
prop="versionDate" >
|
<el-col :span="24">
|
||||||
<p>{{dataForm.versionDate}}</p>
|
<jnpf-form-tip-item label="单据状态" prop="documentStatus">
|
||||||
</jnpf-form-tip-item>
|
<p>{{ dataForm.documentStatus }} </p>
|
||||||
</el-col>
|
</jnpf-form-tip-item>
|
||||||
<el-col :span="24" >
|
</el-col>
|
||||||
<jnpf-form-tip-item label="创建时间"
|
</template>
|
||||||
prop="creatorTime" >
|
</el-form>
|
||||||
<p>{{dataForm.creatorTime}}</p>
|
</el-row>
|
||||||
</jnpf-form-tip-item>
|
<span slot="footer" class="dialog-footer">
|
||||||
</el-col>
|
<el-button @click="visible = false"> 取 消</el-button>
|
||||||
<el-col :span="24" >
|
</span>
|
||||||
<jnpf-form-tip-item label="单据状态"
|
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
|
||||||
prop="documentStatus" >
|
|
||||||
<p>{{dataForm.documentStatus}}</p>
|
|
||||||
</jnpf-form-tip-item>
|
|
||||||
</el-col>
|
|
||||||
</template>
|
|
||||||
</el-form>
|
|
||||||
</el-row>
|
|
||||||
<span slot="footer" class="dialog-footer">
|
|
||||||
<el-button @click="visible = false"> 取 消</el-button>
|
|
||||||
</span>
|
|
||||||
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
|
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
|
|
||||||
import { getConfigData } from '@/api/onlineDev/visualDev'
|
import { getConfigData } from '@/api/onlineDev/visualDev'
|
||||||
import jnpf from '@/utils/jnpf'
|
import jnpf from '@/utils/jnpf'
|
||||||
import Detail from '@/views/basic/dynamicModel/list/detail'
|
import Detail from '@/views/basic/dynamicModel/list/detail'
|
||||||
import { thousandsFormat } from "@/components/Generator/utils/index"
|
import { thousandsFormat } from "@/components/Generator/utils/index"
|
||||||
export default {
|
export default {
|
||||||
components: { Detail},
|
components: { Detail },
|
||||||
props: [],
|
props: [],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
visible: false,
|
visible: false,
|
||||||
detailVisible: false,
|
detailVisible: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
|
|
||||||
dataForm: {
|
dataForm: {
|
||||||
id :'',
|
id: '',
|
||||||
pieceId : '',
|
pieceId: '',
|
||||||
pieceName : '',
|
pieceName: '',
|
||||||
models : '',
|
models: '',
|
||||||
unit : '',
|
unit: '',
|
||||||
versionCode : '',
|
versionCode: '',
|
||||||
versionIllustrate : '',
|
versionIllustrate: '',
|
||||||
versionDate : '',
|
versionDate: '',
|
||||||
creatorTime : '',
|
creatorTime: '',
|
||||||
documentStatus : '',
|
documentStatus: "2",
|
||||||
},
|
},
|
||||||
|
documentStatusOptions: [{ "fullName": "已审核", "id": "1" }, { "fullName": "未审核", "id": "2" }],
|
||||||
|
documentStatusProps: { "label": "fullName", "value": "id" },
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {},
|
computed: {},
|
||||||
watch: {},
|
watch: {},
|
||||||
created() {
|
created() {
|
||||||
|
|
||||||
},
|
},
|
||||||
mounted() {},
|
mounted() { },
|
||||||
methods: {
|
methods: {
|
||||||
toDetail(defaultValue, modelId) {
|
toDetail(defaultValue, modelId) {
|
||||||
if (!defaultValue) return
|
if (!defaultValue) return
|
||||||
getConfigData(modelId).then(res => {
|
getConfigData(modelId).then(res => {
|
||||||
if (!res.data || !res.data.formData) return
|
if (!res.data || !res.data.formData) return
|
||||||
let formData = JSON.parse(res.data.formData)
|
let formData = JSON.parse(res.data.formData)
|
||||||
formData.popupType = 'general'
|
formData.popupType = 'general'
|
||||||
this.detailVisible = true
|
this.detailVisible = true
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.Detail.init(formData, modelId, defaultValue)
|
this.$refs.Detail.init(formData, modelId, defaultValue)
|
||||||
})
|
|
||||||
})
|
})
|
||||||
},
|
})
|
||||||
dataInfo(dataAll){
|
},
|
||||||
let _dataAll =dataAll
|
dataInfo(dataAll) {
|
||||||
this.dataForm = _dataAll
|
let _dataAll = dataAll
|
||||||
},
|
this.dataForm = _dataAll
|
||||||
|
},
|
||||||
|
|
||||||
init(id) {
|
init(id) {
|
||||||
this.dataForm.id = id || 0;
|
this.dataForm.id = id || 0;
|
||||||
this.visible = true;
|
this.visible = true;
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
if(this.dataForm.id){
|
if (this.dataForm.id) {
|
||||||
this.loading = true
|
this.loading = true
|
||||||
request({
|
request({
|
||||||
url: '/api/example/YysBillMaterial/detail/'+this.dataForm.id,
|
url: '/api/example/YysBillMaterial/detail/' + this.dataForm.id,
|
||||||
method: 'get'
|
method: 'get'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
this.dataInfo(res.data)
|
this.dataInfo(res.data)
|
||||||
this.loading = false
|
this.loading = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -1,119 +1,114 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog title="详情"
|
<el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
|
||||||
:close-on-click-modal="false" append-to-body
|
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
|
||||||
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
|
<el-row :gutter="15" class="">
|
||||||
width="600px">
|
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
|
||||||
<el-row :gutter="15" class="">
|
<template v-if="!loading">
|
||||||
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
|
<el-col :span="24">
|
||||||
<template v-if="!loading">
|
<jnpf-form-tip-item label="供应商编码" prop="supplierId">
|
||||||
<el-col :span="24" >
|
<p>{{ dataForm.supplierId }}</p>
|
||||||
<jnpf-form-tip-item label="供应商编码"
|
</jnpf-form-tip-item>
|
||||||
prop="supplierId" >
|
</el-col>
|
||||||
<p>{{dataForm.supplierId}}</p>
|
<el-col :span="24">
|
||||||
</jnpf-form-tip-item>
|
<jnpf-form-tip-item label="供应商简称" prop="supplierSname">
|
||||||
</el-col>
|
<p>{{ dataForm.supplierSname }}</p>
|
||||||
<el-col :span="24" >
|
</jnpf-form-tip-item>
|
||||||
<jnpf-form-tip-item label="供应商简称"
|
</el-col>
|
||||||
prop="supplierSname" >
|
<el-col :span="24">
|
||||||
<p>{{dataForm.supplierSname}}</p>
|
<jnpf-form-tip-item label="供应商全称" prop="supplierCname">
|
||||||
</jnpf-form-tip-item>
|
<p>{{ dataForm.supplierCname }}</p>
|
||||||
</el-col>
|
</jnpf-form-tip-item>
|
||||||
<el-col :span="24" >
|
</el-col>
|
||||||
<jnpf-form-tip-item label="供应商全称"
|
<el-col :span="24">
|
||||||
prop="supplierCname" >
|
<jnpf-form-tip-item label="供应商分类" prop="supplierClassification">
|
||||||
<p>{{dataForm.supplierCname}}</p>
|
<p>{{ dataForm.supplierClassification }}</p>
|
||||||
</jnpf-form-tip-item>
|
</jnpf-form-tip-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24" >
|
<el-col :span="24">
|
||||||
<jnpf-form-tip-item label="供应商分类"
|
<jnpf-form-tip-item label="启用状态" prop="enableStatus">
|
||||||
prop="supplierClassification" >
|
<p>{{ dataForm.enableStatus }}</p>
|
||||||
<p>{{dataForm.supplierClassification}}</p>
|
</jnpf-form-tip-item>
|
||||||
</jnpf-form-tip-item>
|
</el-col>
|
||||||
</el-col>
|
</template>
|
||||||
<el-col :span="24" >
|
</el-form>
|
||||||
<jnpf-form-tip-item label="启用状态"
|
</el-row>
|
||||||
prop="enableStatus" >
|
<span slot="footer" class="dialog-footer">
|
||||||
<p>{{dataForm.enableStatus}}</p>
|
<el-button @click="visible = false"> 取 消</el-button>
|
||||||
</jnpf-form-tip-item>
|
</span>
|
||||||
</el-col>
|
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
|
||||||
</template>
|
|
||||||
</el-form>
|
|
||||||
</el-row>
|
|
||||||
<span slot="footer" class="dialog-footer">
|
|
||||||
<el-button @click="visible = false"> 取 消</el-button>
|
|
||||||
</span>
|
|
||||||
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
|
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
|
|
||||||
import { getConfigData } from '@/api/onlineDev/visualDev'
|
import { getConfigData } from '@/api/onlineDev/visualDev'
|
||||||
import jnpf from '@/utils/jnpf'
|
import jnpf from '@/utils/jnpf'
|
||||||
import Detail from '@/views/basic/dynamicModel/list/detail'
|
import Detail from '@/views/basic/dynamicModel/list/detail'
|
||||||
import { thousandsFormat } from "@/components/Generator/utils/index"
|
import { thousandsFormat } from "@/components/Generator/utils/index"
|
||||||
export default {
|
export default {
|
||||||
components: { Detail},
|
components: { Detail },
|
||||||
props: [],
|
props: [],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
visible: false,
|
visible: false,
|
||||||
detailVisible: false,
|
detailVisible: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
|
|
||||||
dataForm: {
|
dataForm: {
|
||||||
id :'',
|
id: '',
|
||||||
supplierId : '',
|
supplierId: '',
|
||||||
supplierSname : '',
|
supplierSname: '',
|
||||||
supplierCname : '',
|
supplierCname: '',
|
||||||
supplierClassification : '',
|
supplierClassification: '',
|
||||||
enableStatus : '',
|
enableStatus: '2',
|
||||||
},
|
},
|
||||||
|
enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
|
||||||
|
enableStatusProps: { "label": "fullName", "value": "id" },
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {},
|
computed: {},
|
||||||
watch: {},
|
watch: {},
|
||||||
created() {
|
created() {
|
||||||
|
|
||||||
},
|
},
|
||||||
mounted() {},
|
mounted() { },
|
||||||
methods: {
|
methods: {
|
||||||
toDetail(defaultValue, modelId) {
|
toDetail(defaultValue, modelId) {
|
||||||
if (!defaultValue) return
|
if (!defaultValue) return
|
||||||
getConfigData(modelId).then(res => {
|
getConfigData(modelId).then(res => {
|
||||||
if (!res.data || !res.data.formData) return
|
if (!res.data || !res.data.formData) return
|
||||||
let formData = JSON.parse(res.data.formData)
|
let formData = JSON.parse(res.data.formData)
|
||||||
formData.popupType = 'general'
|
formData.popupType = 'general'
|
||||||
this.detailVisible = true
|
this.detailVisible = true
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.Detail.init(formData, modelId, defaultValue)
|
this.$refs.Detail.init(formData, modelId, defaultValue)
|
||||||
})
|
|
||||||
})
|
})
|
||||||
},
|
})
|
||||||
dataInfo(dataAll){
|
},
|
||||||
let _dataAll =dataAll
|
dataInfo(dataAll) {
|
||||||
this.dataForm = _dataAll
|
let _dataAll = dataAll
|
||||||
},
|
this.dataForm = _dataAll
|
||||||
|
},
|
||||||
|
|
||||||
init(id) {
|
init(id) {
|
||||||
this.dataForm.id = id || 0;
|
this.dataForm.id = id || 0;
|
||||||
this.visible = true;
|
this.visible = true;
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
if(this.dataForm.id){
|
if (this.dataForm.id) {
|
||||||
this.loading = true
|
this.loading = true
|
||||||
request({
|
request({
|
||||||
url: '/api/example/YysSupplierInformation/detail/'+this.dataForm.id,
|
url: '/api/example/YysSupplierInformation/detail/' + this.dataForm.id,
|
||||||
method: 'get'
|
method: 'get'
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
this.dataInfo(res.data)
|
this.dataInfo(res.data)
|
||||||
this.loading = false
|
this.loading = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Loading…
Reference in new issue