20220920-syy

zhc4dev
暖暖 2 years ago
parent a42880ab42
commit f1f59ed74b
  1. 81
      ant-design-vue-jeecg/src/components/procedure/processFabric.vue
  2. 12
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
  3. 12
      ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue
  4. 1
      ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue
  5. 1
      ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricFormDetailModel.vue

@ -1,38 +1,40 @@
<template>
<div>
<div style="padding: 15px 25px;">
<el-descriptions class="margin-top" :column="3" border style="margin-top: 50px">
<div style="">
<div style="padding: 15px 0;" v-for="(item,index) in tableModel" :key="index">
<p style="font-size: 18px;" v-if="!flag">辅料信息</p>
<p style="font-size: 16px;margin-bottom: 0" v-if="flag">辅料{{index+1}}信息</p>
<el-descriptions class="margin-top" :column="3" border style="margin: 30px 0">
<el-descriptions-item>
<template slot="label"><i class="el-icon-receiving"></i>类型id</template>
{{tableModel.typeId}}
{{item.typeId}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-coin"></i>编号</template>
{{tableModel.nums}}
{{item.nums}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-postcard"></i>名称</template>
{{tableModel.contents}}
{{item.contents}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-copy-document"></i>图片</template>
{{tableModel.picture}}
{{item.picture}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-price-tag"></i>材质</template>
{{tableModel.material}}
{{item.material}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-files"></i>规格</template>
{{tableModel.specs}}
{{item.specs}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-takeaway-box"></i>库存量</template>
{{tableModel.store}}
{{item.store}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"><i class="el-icon-location-outline"></i>供货商</template>
{{tableModel.supplierInfo}}
{{item.supplierInfo}}
</el-descriptions-item>
</el-descriptions>
</div>
@ -42,7 +44,30 @@
<script>
export default {
name: 'processFabric',
props:['model','fabricId'],
// props:['model','fabricId'],
props:{
model:{
type: Array,
default: function () {
return [
{
contents: "MZN600-287-800",
createBy: null,
createTime: null,
id: "1458996032118022146",
material: "厚",
nums: "MZN600-287-800",
picture: "12",
specs: "21",
store: 21,
supplierInfo: "河南驻马店",
typeId: "12",
updateBy: null,
updateTime: null,}
]
}
}
},
data () {
return {
img:'',//
@ -50,6 +75,7 @@
mp4:'',//
tableModel:[],
id:'',
flag:true,
visible: false,
confirmLoading: false,
validatorRules: {
@ -62,16 +88,29 @@
// cData
model: function(newVal,oldVal){
this.tableModel= newVal
//
if(newVal == null){
this.tableModel = [
{
contents: "MZN600-287-800",
createBy: null,
createTime: null,
id: "1458996032118022146",
material: "厚",
nums: "MZN600-287-800",
picture: "12",
specs: "21",
store: 21,
supplierInfo: "河南驻马店",
typeId: "12",
updateBy: null,
updateTime: null,}
]
}
if(this.tableModel.length == 1){
this.flag = false
}
},
fabricId: function(newVal,oldVal){
this.id = newVal
this.$http.get('/accessories/zyAccessories/queryById?id='+this.id).then(
res=>{
//id
console.log(this.id)
console.log(res.result)
})
}
},
methods: {
getTableModel(){

@ -7,8 +7,8 @@
@ok="handleOk"
@cancel="handleCancel">
<h1 style="text-align: center;margin-bottom: 0px;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序辅料</span></h1>
<zyProcess :data="processData" style="border: 1px solid #e8e8e8; padding: 30px 25px"></zyProcess>
<processFabric :fabricId =fabricId style="padding:0 20px"></processFabric>
<zyProcess :data="processData" style="border: 1px solid #e8e8e8;padding: 30px 25px;margin-bottom:30px;"></zyProcess>
<processFabric :model ="fabricData" style="padding:0 20px;border: 1px solid #e8e8e8;"></processFabric>
</a-modal>
</template>
@ -33,6 +33,7 @@ import zyProcess from '@/components/procedure/zyProcess'
model:{
},
processData:{},
fabricData:[],
processId:'',
fabricId:'',
visible:false,
@ -60,6 +61,13 @@ import zyProcess from '@/components/procedure/zyProcess'
res=>{
this.processData = res.result.zyProcess
})
this.$http.get('/accessories/zyAccessories/queryById?id='+this.fabricId).then(
res=>{
this.fabricData = res.result
console.log(res.result)
console.log(this.fabricData)
console.log(this.fabricId)
})
}
)
},

@ -9,7 +9,8 @@
@cancel="handleCancel"
>
<h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px;">黄淮学院服装智能制造管理平台 - <span>辅料管理</span></h1>
<processFabric :model="model"></processFabric>
<div style="border: 1px solid #e8e8e8;padding: 15px;">
<processFabric :model="model"></processFabric></div>
</a-modal>
</div>
</template>
@ -26,8 +27,7 @@ import processFabric from '@/components/procedure/processFabric'
},
data () {
return {
model:{
},
model:[],
visible: false,
confirmLoading: false,
validatorRules: {
@ -39,7 +39,11 @@ import processFabric from '@/components/procedure/processFabric'
this.visible = true;
this.$http.get('/accessories/zyAccessories/queryById?id='+id).then(
res=>{
this.model = res.result
if(this.model == ''){
this.model.push(res.result)
console.log(1)
}
})
},
handleOk() {

@ -207,6 +207,7 @@
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
console.log(this.model)
},
methods: {
add () {

@ -222,6 +222,7 @@
this.$http.get('/fabric/zyFabric/queryById?id='+id).then(
res=>{
this.model = res.result
console.log(this.model)
}
)

Loading…
Cancel
Save