From 4acdf29606d9ae19bb571202b9ad119f5e019732 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 28 Jun 2024 15:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E6=96=99=E6=8A=A5?=
=?UTF-8?q?=E5=BA=9F=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sgzb-ui/src/components/Description/index.vue | 75 ++++++++++
sgzb-ui/src/views/base/comeAndGo/index.vue | 4 +-
sgzb-ui/src/views/base/project/index.vue | 5 +-
sgzb-ui/src/views/base/section/index.vue | 7 +-
.../return/scrap/component/config.js | 4 +-
.../return/scrap/component/home.vue | 8 +
.../forecastWaste/auditing/config.js | 2 +-
.../machinery/type/component/docView.vue | 33 +++++
.../warehouseManage/machinery/type/index.vue | 139 +++++++++++++-----
.../partsAcceptance/component/home.vue | 12 +-
.../newPurchase/serviceCenter/index.vue | 19 +--
.../toolsAcceptance/component/home.vue | 19 +--
.../warehousing/newTools/index.vue | 16 +-
sgzb-ui/vue.config.js | 2 +-
14 files changed, 254 insertions(+), 91 deletions(-)
create mode 100644 sgzb-ui/src/components/Description/index.vue
create mode 100644 sgzb-ui/src/views/warehouseManage/machinery/type/component/docView.vue
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 @@
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ {{ descriptionDetailsInfo[item.content] || '-' }}
+
+
+
+
+
+
+
+
+
\ 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 @@
编辑修改
编辑修改
diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js
index 4ae932e5..50a6b5e4 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js
+++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js
@@ -54,8 +54,8 @@ export const dialogConfig = {
// { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'typeName', t_label: '设备类型' },
{ t_width: '', t_props: 'typeCode', t_label: '规格型号' },
- { t_width: '', t_props: 'maCode', t_label: '设备编码' },
- { t_width: '', t_props: 'num', t_label: '数量', t_slot: 'num', },
+ // { t_width: '', t_props: 'maCode', t_label: '设备编码' },
+ { t_width: '', t_props: 'num', t_label: '退料数量', t_slot: 'num', },
{ t_width: '', t_props: 'remark', t_label: '驳回原因' },
],
diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/home.vue b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/home.vue
index 999e2929..a3587345 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/home.vue
@@ -83,6 +83,7 @@ import { config, dialogConfig, getSelList } from './config.js'
import {
getBackReceiveList,
getViewByApply,
+ getBackMachineNew,
} from '@/api/claimAndRefund/return.js'
export default {
components: {
@@ -101,6 +102,7 @@ export default {
dialogConfig,
getSelList,
getBackReceiveList,
+ // getBackMachineNew,
getViewByApply,
sendParams: {
backSource: 1,
@@ -110,6 +112,12 @@ export default {
id: '',
agreementId: '',
},
+ // sendParamsQuery: {
+ // parentId: '',
+ // agreementId: '',
+ // typeId:'',
+ // taskId:''
+ // },
}
},
created() {
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
index ddeb4da8..455d2611 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
@@ -89,7 +89,7 @@ export const dialogConfig = {
{ t_width: '', t_props: 'auditRemark', t_label: '驳回原因' },
{ t_width: '', t_props: '', t_label: '损坏原因', t_slot: 't_damage' },
{ t_width: '', t_props: '', t_label: '报废图片', t_slot: 't_img' },
- { t_width: '', t_props: 'remark', t_label: '备注' },
+ // { t_width: '', t_props: 'remark', t_label: '备注' },
],
}
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/type/component/docView.vue b/sgzb-ui/src/views/warehouseManage/machinery/type/component/docView.vue
new file mode 100644
index 00000000..f0822a94
--- /dev/null
+++ b/sgzb-ui/src/views/warehouseManage/machinery/type/component/docView.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
index 9e0d0cde..e3da8a86 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
@@ -107,28 +107,27 @@
align="center"
/> -->
-
+ /> -->
-
+ /> -->
- {{ scope.row.photoName }}
-
- -->
+
+
+
+
-
+
配置
删除
+
+ 详情
+
-
+
@@ -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 @@
查看
编辑
验收
验收单
-
+
-
+
查看
编辑
提交审核
审核
@@ -382,8 +380,9 @@
"
>