制衣模块+制衣部件

zhc4dev
暖暖 2 years ago
parent 2d080e91cf
commit 31cb1d49af
  1. 6
      ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue
  2. 6
      ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
  3. 66
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
  4. 13
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularListDetail.vue

@ -82,7 +82,7 @@
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical"/>
<a @click="handleDetail(record)">详情</a>
<a @click="handleDetail(record.id)">详情</a>
<a-divider type="vertical"/>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
@ -249,8 +249,8 @@ export default {
fieldList.push({type: 'string', value: 'enterpriseId', text: '企业', dictCode: ''})
this.superFieldList = fieldList
},
handleDetail(record) {
this.$refs.ZyClothsComponentListDetail.showModal(record)
handleDetail(id) {
this.$refs.ZyClothsComponentListDetail.showModal(id)
}
}
}

@ -114,7 +114,7 @@
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical"/>
<a @click="handleDetail(record)">详情</a>
<a @click="handleDetail(record.id)">详情</a>
<a-divider type="vertical"/>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
@ -291,8 +291,8 @@ export default {
fieldList.push({type: 'string', value: 'pictureUrl', text: '图片', dictCode: ''})
this.superFieldList = fieldList
},
handleDetail(record) {
this.$refs.ZyClothsModularListDetail.showModal(record)
handleDetail(id) {
this.$refs.ZyClothsModularListDetail.showModal(id)
}
}
}

@ -7,12 +7,13 @@
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<p class="title">制衣部件详情</p>
<a-descriptions title="" bordered>
<a-descriptions-item label="企业">{{model.enterpriseId_dictText}}</a-descriptions-item>
<a-descriptions-item label="服装类型">{{model.clothsTypeId_dictText}}</a-descriptions-item>
<a-descriptions-item label="企业">{{model.enterpriseId}}</a-descriptions-item>
<a-descriptions-item label="服装类型">{{model.clothsTypeId}}</a-descriptions-item>
<a-descriptions-item label="部件名称">{{model.partsName}}</a-descriptions-item>
<a-descriptions-item label="模块">{{model.modularId_dictText}}</a-descriptions-item>
<a-descriptions-item label="模块">{{model.modularId}}</a-descriptions-item>
<a-descriptions-item label="描述" :span="2">{{model.description}}</a-descriptions-item>
<a-descriptions-item label="图片" :span="3">
<img v-if="model.pictureUrl" :src="model.pictureUrl" alt="无法显示"></img>
@ -20,8 +21,9 @@
</a-descriptions-item>
</a-descriptions>
<p class="title">部件工序详情</p>
<a-table :columns="columns1" :data-source="data1" bordered :pagination="false">
<a-table :columns="columns1" :data-source="data1" rowKey="id" bordered :pagination="false">
</a-table>
</a-spin>
</a-modal>
</div>
</template>
@ -38,20 +40,20 @@
},
{
title: '部件',
dataIndex: 'nums',
key: 'nums',
dataIndex: 'componentId',
key: 'componentId',
align:'center'
},
{
title: '工序',
dataIndex: 'modularId_dictText',
key: 'modularId_dictText',
dataIndex: 'processId',
key: 'processId',
align:'center'
},
{
title: '是否瓶颈工序',
dataIndex: 'partsName',
key: 'partsName',
dataIndex: 'bottleneck',
key: 'bottleneck',
align:'center'
},
{
@ -61,55 +63,41 @@
align:'center'
},
];
const data1 = [
{
key: '1',
nums:'gfhjf',
modularId_dictText:'1-3合后育克',
partsName:'是',
createTime:'2022-12-06 19:00:07'
},
// {
// key: '2',
// nums:'aaff',
// modularId_dictText:'1-3',
// partsName:'',
// createTime:'2022-12-06 18:30:49'
// }
]
export default {
name: 'ZyClothsComponentListDetail',//
data () {
return {
visible: false,
confirmLoading: false,
confirmLoading:true,
model:{
},
data1,
data1:[],
columns1,
}
},
methods: {
showModal(record) {
showModal(id) {
this.visible = true;
this.model = record
this.$http.get('/base/zyClothsComponent/detail?id='+record.id).then(
this.$http.get('/base/zyClothsComponent/detail?id='+id).then(
res=>{
// this.data = res.result
this.model = res.result.zyClothsComponent
this.data1 = res.result.zyProcessComponents
this.confirmLoading = false
// this.model = res.result.zyClothsComponent
// this.ProcessData = res.result.zyProcess
// this.basicActionData = res.result.zyClothActions
// this.accessoriesData = res.result.zyFabrics
// this.fabricData = res.result.zyAccessories
console.log('工序详情页')
console.log(this.data)
console.log(this.accessoriesData)
console.log(this.fabricData)
this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
console.log(res.result)
// console.log(this.data)
// console.log(this.accessoriesData)
// console.log(this.fabricData)
// this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
// this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
}
)
console.log('record')
console.log(record.id)
},
handleOk(e) {
this.confirmLoading = true;

@ -7,6 +7,7 @@
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<p class="title">制衣模块详情</p>
<a-descriptions title="" bordered>
<a-descriptions-item label="企业">{{model.enterpriseId}}</a-descriptions-item>
@ -25,6 +26,7 @@
<p class="title">模块工序详情</p>
<a-table :columns="columns2" :data-source="data2" rowKey="id" bordered :pagination="false">
</a-table>
</a-spin>
</a-modal>
</div>
</template>
@ -92,7 +94,6 @@
data () {
return {
visible: false,
confirmLoading: false,
model:{
},
data1:[],
@ -101,25 +102,27 @@
columns2,
img:'',
mp4:'',
confirmLoading:true
}
},
methods: {
showModal(record) {
showModal(id) {
this.visible = true;
// this.model = record
this.$http.get('/base/zyClothsModular/detail?id='+record.id).then(
this.$http.get('/base/zyClothsModular/detail?id='+id).then(
res=>{
// this.data = res.result
this.model = res.result.zyClothsModular
this.data1 = res.result.zyClothsModularComponents
this.data2 = res.result.zyProcessModularVos
this.confirmLoading = false
// this.ProcessData = res.result.zyProcess
// this.basicActionData = res.result.zyClothActions
// this.accessoriesData = res.result.zyFabrics
// this.fabricData = res.result.zyAccessories
this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
// this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
// this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
}
)
},

Loading…
Cancel
Save