Compare commits

..

No commits in common. "8190ec1f05c7beb11e9d10ba2638bcc38c063642" and "71fa900582c93cad497d886fb88a5a5e26be223c" have entirely different histories.

View File

@ -280,26 +280,6 @@ const listGridInfo = {
{ title: '所属国', dataIndex: 'operatorCountry' }, { title: '所属国', dataIndex: 'operatorCountry' },
{ dataIndex: 'action' }, { dataIndex: 'action' },
], ],
hospital: [
{ title: '#DBID', dataIndex: 'id', width: 80 },
{ title: '名称', dataIndex: 'resourceName', width: 200, ellipsis: true },
{ title: '经度', dataIndex: 'lng' },
{ title: '纬度', dataIndex: 'lat' },
{ title: '医生数量', dataIndex: 'doctorNum' },
{ title: '护士数量', dataIndex: 'nurseNum' },
{ title: '病床', dataIndex: 'hospitalBed' },
{ dataIndex: 'action' },
],
warehouse: [
{ title: '#DBID', dataIndex: 'id', width: 80 },
{ title: '名称', dataIndex: 'resourceName', width: 200, ellipsis: true },
{ title: '经度', dataIndex: 'lng' },
{ title: '纬度', dataIndex: 'lat' },
{ title: '药材数量', dataIndex: 'medicalNum' },
{ title: '油料', dataIndex: 'fuelNum' },
{ title: '弹药', dataIndex: 'ammunitionNum' },
{ dataIndex: 'action' },
],
} }
export default { export default {
@ -333,10 +313,6 @@ export default {
valueKey: 'key', valueKey: 'key',
}, },
}, },
{
label: '装备分类编码',
prop: 'entityType',
},
{ {
label: '装备分类名称', label: '装备分类名称',
prop: 'entityName', prop: 'entityName',
@ -470,7 +446,6 @@ export default {
created() { created() {
this.getZzTree() this.getZzTree()
for (const key in this.dicData) { for (const key in this.dicData) {
console.log('=this.dicData=='+key)
this.$http({ this.$http({
url: '/dicdata/' + key + '/getList', url: '/dicdata/' + key + '/getList',
method: 'get', method: 'get',
@ -509,7 +484,7 @@ export default {
handleOpenEditZbflModal(data) { handleOpenEditZbflModal(data) {
this.zbflModal.title = '编辑装备分类' this.zbflModal.title = '编辑装备分类'
this.zbflModal.mode = 'edit' this.zbflModal.mode = 'edit'
this.zbflModal.formData = { id: data.id, parentId: data.parentId, entityName: data.entityName,entityType: data.entityType } this.zbflModal.formData = { id: data.id, parentId: data.parentId, entityName: data.entityName }
this.zbflModal.visible = true this.zbflModal.visible = true
}, },
handleSubmitZbfl(formData) { handleSubmitZbfl(formData) {