diff --git a/sgzb-ui/src/components/Description/index.vue b/sgzb-ui/src/components/Description/index.vue new file mode 100644 index 00000000..72f98b8c --- /dev/null +++ b/sgzb-ui/src/components/Description/index.vue @@ -0,0 +1,75 @@ + + + + + \ No newline at end of file diff --git a/sgzb-ui/src/views/base/comeAndGo/index.vue b/sgzb-ui/src/views/base/comeAndGo/index.vue index 20fc3b1b..ff7fc6fc 100644 --- a/sgzb-ui/src/views/base/comeAndGo/index.vue +++ b/sgzb-ui/src/views/base/comeAndGo/index.vue @@ -146,7 +146,7 @@ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['base:comeAndGo:edit']" - >编辑修改 diff --git a/sgzb-ui/src/views/base/project/index.vue b/sgzb-ui/src/views/base/project/index.vue index 1496c9a9..2b528dca 100644 --- a/sgzb-ui/src/views/base/project/index.vue +++ b/sgzb-ui/src/views/base/project/index.vue @@ -130,16 +130,15 @@ - - --> + + + + - + - + @@ -573,6 +580,32 @@ 取 消 + + + + + @@ -591,10 +624,16 @@ import { getUserByRoleList, getMaUserList } from '@/api/system/user' import { getProLists } from '@/api/base/base' import { imgUpLoad, fileUpLoad } from '@/api/system/upload' import { getInfo } from '@/api/login' + +import DialogModel from '@/components/DialogModel' +import Description from '@/components/Description/index' +import ScrapImg from '@/views/scrapManage/component/scrapImg' +import DocView from './component/docView.vue' + export default { name: 'ToolsType', // dicts: ['sys_normal_disable', 'sys_user_sex'], - components: { Treeselect }, + components: { Treeselect, Description, DialogModel, ScrapImg, DocView }, data() { return { // 遮罩层 @@ -656,8 +695,8 @@ export default { // 查询参数 queryParams: { - // pageNum: 1, - // pageSize: 10, + pageNum: 1, + pageSize: 10, typeName: undefined, // phonenumber: undefined, // status: undefined, @@ -748,6 +787,24 @@ export default { // {required: true, message: "开始日期不能为空", trigger: "blur"} // ], }, + // 设备详情对话框配置 + dialogConfig: { + outerWidth: '70%', + outerTitle: '设备详情', + outerVisible: false, + }, + // 详情展示列配置 + columnList: [ + { label: '计量单位', content: 'unitName' }, + { label: '原值', content: 'buyPrice' }, + { label: '丢失赔偿', content: 'payPrice' }, + { label: '图片', content: 'photoUrl', v_slot: 'img' }, + { label: '文档资料', content: 'documentName', v_slot: 'doc' }, + { label: '资产属性', content: 'propName' }, + { label: '厂家规格型号', content: 'facModel' }, + { label: '备注信息', content: 'remark' }, + ], + descriptionDetailsInfo: {}, } }, watch: { @@ -795,8 +852,8 @@ export default { getList() { this.loading = true getListByMaType(this.queryParams).then((response) => { - this.typeList = response.data - // this.total = response.total; + this.typeList = response.data.rows + this.total = response.data.total this.loading = false }) }, @@ -1034,12 +1091,16 @@ export default { this.form.companyId = val.companyId }, + // 详情 + handleDetails(row) { + console.log(row, '详情----') + this.descriptionDetailsInfo = row + this.dialogConfig.outerVisible = true + }, + /* 外层弹框关闭 */ + closeDialogOuter() { + this.dialogConfig.outerVisible = false + }, }, } - diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue index 9edecaff..e2a8e3c4 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue @@ -132,7 +132,6 @@