diff --git a/sgzb-ui/src/components/TableModel/index.vue b/sgzb-ui/src/components/TableModel/index.vue
index 5ad91ded..29c4af47 100644
--- a/sgzb-ui/src/components/TableModel/index.vue
+++ b/sgzb-ui/src/components/TableModel/index.vue
@@ -138,13 +138,7 @@
data() {
return {
total: 0,
- tableList: [
- { demo: '123' },
- { demo: '123' },
- { demo: '123' },
- { demo: '123' },
- { demo: '123' },
- ],
+ tableList: [],
/* 分页参数 */
pageParams: {
pageNum: 1,
diff --git a/sgzb-ui/src/views/scrapManage/Inventory/config.js b/sgzb-ui/src/views/scrapManage/Inventory/config.js
new file mode 100644
index 00000000..83b29ee6
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/Inventory/config.js
@@ -0,0 +1,31 @@
+export const config = {
+ handleColShow: true, // 是否显示操作列
+ pageShow: true, // 是否显示分页组件
+ isSelShow: true,// 表格是否需要复选框
+ isFormShow: true, // 是否显示表单查询组件
+ handleWidth: '', // 操作列宽度
+ formLabel: [
+ { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+ { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
+ { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
+ { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
+ { f_label: '报废单号', f_model: 'laiyuan', f_type: 'ipt', },
+ { f_label: '审批状态', f_model: 'taskStatus', f_type: 'sel', f_selList: [] },
+ { f_label: '报废类型', f_model: 'taskStatus', f_type: 'sel', f_selList: [] },
+ { f_label: '创建时间', f_model: 'time', f_type: 'date' },
+ ],
+ columnsList: [
+ { t_width: '55px', t_props: '', t_label: '序号' },
+ { t_props: '', t_label: '预报废单号' },
+ { t_props: '', t_label: '机具类型' },
+ { t_props: '', t_label: '任务创建人' },
+ { t_props: '', t_label: '任务创建时间' },
+ { t_props: '', t_label: '审核状态' },
+ ],
+ handleBtn: [
+ { btn_title: '查看', id: 1 },
+ { btn_title: '新增报废', id: 2 },
+ { btn_title: '驳回退料', id: 3 },
+ { btn_title: '审批详情', id: 4 },
+ ],
+}
\ No newline at end of file
diff --git a/sgzb-ui/src/views/scrapManage/Inventory/index.vue b/sgzb-ui/src/views/scrapManage/Inventory/index.vue
index d1c61084..12b579aa 100644
--- a/sgzb-ui/src/views/scrapManage/Inventory/index.vue
+++ b/sgzb-ui/src/views/scrapManage/Inventory/index.vue
@@ -1,20 +1,50 @@
- 盘点报废
-
+
+
+
+ 导出数据
+
+
+
+
+
+ {{ btn.btn_title }}
+
+
+
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
new file mode 100644
index 00000000..5d3671b9
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
@@ -0,0 +1,123 @@
+
+import {
+ getUnitInfoSelectApi,
+ listPartTypeApi,
+} from '@/api/repairTest/repair'
+import { getProjectList } from '@/api/claimAndRefund/receive'
+
+let unitList = []
+let proList = []
+let typeList = []
+export const config = {
+ handleColShow: true, // 是否显示操作列
+ pageShow: true, // 是否显示分页组件
+ isSelShow: true,// 表格是否需要复选框
+ isFormShow: true, // 是否显示表单查询组件
+ handleWidth: '', // 操作列宽度
+ formLabel: [
+ { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+ { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
+ { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
+ { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
+ {
+ f_label: '报废来源', f_model: 'scrapSource', f_type: 'sel', f_selList: [
+ { label: '退料', value: 1 },
+ { label: '维修', value: 2 },
+ { label: '盘点', value: 3 },
+ ]
+ },
+ {
+ f_label: '审批状态', f_model: 'taskStatus', f_type: 'sel', f_selList: [
+ { label: '待审核', value: 120 },
+ { label: '审核中', value: 121 },
+ { label: '已驳回', value: 123 },
+ { label: '已通过', value: 122 },
+ ]
+ },
+ { f_label: '创建时间', f_model: 'time', f_type: 'date' },
+ ],
+ columnsList: [
+ { t_width: '55px', t_props: '', t_label: '序号' },
+ { t_width: '', t_props: 'scrapNum', t_label: '预报废单号', },
+ { t_width: '', t_props: '', t_label: '报废来源', t_slot: 'source', },
+ { t_width: '', t_props: 'repairNum', t_label: '单号', t_slot: 'code', },
+ { t_width: '', t_props: 'unitName', t_label: '退料单位名称', },
+ { t_width: '', t_props: 'projectName', t_label: '退料工程名称', },
+ { t_width: '', t_props: 'itemType', t_label: '设备类型', },
+ { t_width: '', t_props: 'createBy', t_label: '任务创建人', },
+ { t_width: '', t_props: 'createTime', t_label: '任务创建时间', },
+ { t_width: '', t_props: 'taskStatus', t_label: '审核状态', t_slot: 'type', },
+ { t_width: '', t_props: '', t_label: '不通过原因', },
+ ],
+ handleBtn: [
+ { btn_title: '查看', id: 1 },
+ { btn_title: '审核', id: 2 },
+
+ ],
+}
+
+export const dialogConfig = {
+ outerWidth: '70%',
+ outerTitle: '',
+ outerVisible: false,
+ innerWidth: '50%',
+ innerTitle: '',
+ innerVisible: false,
+ handleColShow: false, // 是否显示操作列
+ pageShow: false, // 是否显示分页组件
+ isSelShow: false,// 表格是否需要复选框
+ isFormShow: true, // 是否显示表单查询组件
+ formLabel: [
+ { f_label: '类型名称', f_model: 'keywords', f_type: 'sel' },
+ ],
+
+ columnsList: [
+ { t_width: '55px', t_props: '', t_label: '序号' },
+ { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
+ { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
+ { t_width: '', t_props: 'maCode', t_label: '设备编码' },
+ { t_width: '', t_props: 'scrapNum', t_label: '设备数量' },
+ { t_width: '', t_props: 'status', t_label: '审批状态', t_slot: 't_type' },
+ { t_width: '', t_props: '', t_label: '报废原因' },
+ { t_width: '', t_props: '', t_label: '报废图片' },
+ { t_width: '', t_props: 'remark', t_label: '备注' },
+ ],
+
+}
+
+export const getSelList = () => {
+ new Promise(async (resolve) => {
+ const { data: unitRes } = await getUnitInfoSelectApi()
+ unitList = unitRes.map((e) => {
+ e.value = e.unitId
+ e.label = e.unitName
+ return e
+ })
+ const { data: proRes } = await getProjectList()
+ proList = proRes.map((e) => {
+ e.value = e.projectId
+ e.label = e.projectName
+ return e
+ })
+ const { data: typeRes } = await listPartTypeApi()
+ typeList = typeRes
+ resolve()
+ }).then(() => {
+ config.formLabel.map((item) => {
+ if (item.f_model === 'backUnit') {
+ item.f_selList = unitList
+ return item
+ }
+ if (item.f_model === 'backPro') {
+ item.f_selList = proList
+ return item
+ }
+ if (item.f_model === 'type') {
+ item.f_selList = typeList
+ return item
+ }
+ })
+ }).catch(() => {
+
+ })
+}
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
new file mode 100644
index 00000000..a95652b0
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
@@ -0,0 +1,298 @@
+
+
+
+
+
+
+ 导出数据
+
+
+
+
+ 退料
+ 维修
+ 盘点
+
+
+
+ {{
+ data.repairCode
+ }}
+ {{
+ data.scrapNum
+ }}
+
+
+
+ 待审核
+ 审核中
+ 已驳回
+ 已通过
+
+
+
+ 查看
+ 审核
+
+
+
+
+
+
+
+
+
+ 待审核
+ 通过
+ 驳回
+
+
+
+ 通 过
+ 驳 回
+
+
+
+
+
+
+ 请输入驳回原因
+
+
+
+
+
+
+ 取 消
+ 保 存
+
+
+
+
+
+
+
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/config.js
new file mode 100644
index 00000000..70afcd89
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/config.js
@@ -0,0 +1,56 @@
+
+
+export const config = {
+ handleColShow: true, // 是否显示操作列
+ pageShow: true, // 是否显示分页组件
+ isSelShow: true,// 表格是否需要复选框
+ isFormShow: true, // 是否显示表单查询组件
+ handleWidth: '', // 操作列宽度
+ formLabel: [
+ { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+ { f_label: '类型名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
+ { f_label: '规格型号', f_model: 'backPro', f_type: 'sel', f_selList: [] },
+ ],
+ columnsList: [
+ { t_width: '55px', t_props: '', t_label: '序号' },
+ { t_width: '', t_props: 'demo', t_label: '类型名称' },
+ { t_width: '', t_props: '', t_label: '规格型号' },
+ { t_width: '', t_props: '', t_label: '数量' },
+ { t_width: '', t_props: '', t_label: '合格数量' },
+ { t_width: '', t_props: '', t_label: '维修数量' },
+ { t_width: '', t_props: '', t_label: '预报废数量' },
+ { t_width: '', t_props: '', t_label: '状态' },
+ ],
+ handleBtn: [
+ { btn_title: '查看', id: 1 },
+ { btn_title: '审核', id: 2 },
+
+ ],
+}
+
+export const dialogConfig = {
+ outerWidth: '70%',
+ outerTitle: '',
+ outerVisible: false,
+ innerWidth: '50%',
+ innerTitle: '',
+ innerVisible: false,
+ handleColShow: false, // 是否显示操作列
+ pageShow: false, // 是否显示分页组件
+ isSelShow: false,// 表格是否需要复选框
+ isFormShow: true, // 是否显示表单查询组件
+ formLabel: [
+ { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+ { f_label: '类型名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
+ { f_label: '规格型号', f_model: 'backPro', f_type: 'sel', f_selList: [] },
+ ],
+
+ columnsList: [
+ { t_width: '55px', t_props: '', t_label: '序号' },
+ { t_width: '', t_props: 'demo', t_label: '设备类型' },
+ { t_width: '', t_props: '', t_label: '规格型号' },
+ { t_width: '', t_props: '', t_label: '设备编码' },
+ { t_width: '', t_props: '', t_label: '退料状态' },
+ ],
+
+}
\ No newline at end of file
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue
new file mode 100644
index 00000000..89e8803d
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+ 完成退料
+
+
+
+ {{ btn.btn_title }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingcss.vue
similarity index 99%
rename from sgzb-ui/src/views/scrapManage/forecastWaste/auditing.vue
rename to sgzb-ui/src/views/scrapManage/forecastWaste/auditingcss.vue
index 1514bff6..9c3f5d09 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingcss.vue
@@ -103,8 +103,8 @@
v-if="data.status == 2"
size="mini"
>驳回 s
+ >
+
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/index.js b/sgzb-ui/src/views/scrapManage/forecastWaste/index.js
index 253648da..b3128b43 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/index.js
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/index.js
@@ -148,8 +148,5 @@ export const getSelList = () => {
}).catch(() => {
})
-
-
-
}
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
new file mode 100644
index 00000000..3ff6cc57
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
@@ -0,0 +1,123 @@
+
+import {
+ getUnitInfoSelectApi,
+ listPartTypeApi,
+} from '@/api/repairTest/repair'
+import { getProjectList } from '@/api/claimAndRefund/receive'
+
+let unitList = []
+let proList = []
+let typeList = []
+
+
+export const config = {
+ handleColShow: true, // 是否显示操作列
+ pageShow: true, // 是否显示分页组件
+ isSelShow: true,// 表格是否需要复选框
+ isFormShow: true, // 是否显示表单查询组件
+ handleWidth: '', // 操作列宽度
+ formLabel: [
+ { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+ { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
+ { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
+ { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
+ { f_label: '报废单号', f_model: 'scrapNum', f_type: 'ipt', f_selList: [] },
+ {
+ f_label: '审批状态', f_model: 'taskStatus', f_type: 'sel', f_selList: [
+ { label: '待审核', value: 120 },
+ { label: '审核中', value: 121 },
+ { label: '已驳回', value: 123 },
+ { label: '已通过', value: 122 },
+ ]
+ },
+ { f_label: '创建时间', f_model: 'time', f_type: 'date' },
+ {
+ f_label: '报废来源', f_model: 'scrapSource', f_type: 'sel', f_selList: [
+ { label: '退料', value: 1 },
+ { label: '维修', value: 2 },
+ { label: '盘点', value: 3 },
+ ]
+ },
+ ],
+ columnsList: [
+ { t_width: '55px', t_props: '', t_label: '序号' },
+ { t_width: '', t_props: 'scrapNum', t_label: '报废单号' },
+ { t_width: '', t_props: '', t_label: '报废来源', t_slot: 'source' },
+ { t_width: '', t_props: 'repairNum', t_label: '预报废单号' },
+ { t_width: '', t_props: 'unitName', t_label: '退料单位名称' },
+ { t_width: '', t_props: 'projectName', t_label: '退料工程名称' },
+ { t_width: '', t_props: 'itemType', t_label: '机具类型' },
+ { t_width: '', t_props: 'createBy', t_label: '任务创建人' },
+ { t_width: '', t_props: 'createTime', t_label: '任务创建时间' },
+ { t_width: '', t_props: 'taskStatus', t_label: '审核状态', t_slot: 'type' },
+ ],
+ handleBtn: [
+ { btn_title: '查看', id: 1 },
+ { btn_title: '审核', id: 2 },
+
+ ],
+}
+
+export const dialogConfig = {
+ outerWidth: '70%',
+ outerTitle: '',
+ outerVisible: false,
+ innerWidth: '50%',
+ innerTitle: '',
+ innerVisible: false,
+ handleColShow: false, // 是否显示操作列
+ pageShow: false, // 是否显示分页组件
+ isSelShow: false,// 表格是否需要复选框
+ isFormShow: true, // 是否显示表单查询组件
+ formLabel: [
+ { f_label: '类型名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
+ ],
+
+ columnsList: [
+ { t_width: '55px', t_props: '', t_label: '序号' },
+ { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
+ { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
+ { t_width: '', t_props: 'maCode', t_label: '设备编码' },
+ { t_width: '', t_props: 'scrapNum', t_label: '设备数量' },
+ { t_width: '', t_props: 'remark', t_label: '报废原因' },
+ { t_width: '', t_props: 'fileUrl', t_label: '报废图片' },
+ ],
+
+}
+
+export const getSelList = () => {
+ new Promise(async (resolve) => {
+ const { data: unitRes } = await getUnitInfoSelectApi()
+ unitList = unitRes.map((e) => {
+ e.value = e.unitId
+ e.label = e.unitName
+ return e
+ })
+ const { data: proRes } = await getProjectList()
+ proList = proRes.map((e) => {
+ e.value = e.projectId
+ e.label = e.projectName
+ return e
+ })
+ const { data: typeRes } = await listPartTypeApi()
+ typeList = typeRes
+ resolve()
+ }).then(() => {
+ config.formLabel.map((item) => {
+ if (item.f_model === 'backUnit') {
+ item.f_selList = unitList
+ return item
+ }
+ if (item.f_model === 'backPro') {
+ item.f_selList = proList
+ return item
+ }
+ if (item.f_model === 'type') {
+ item.f_selList = typeList
+ return item
+ }
+ })
+ }).catch(() => {
+
+ })
+}
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
new file mode 100644
index 00000000..2ec5bb77
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
@@ -0,0 +1,239 @@
+
+
+
+
+
+
+
+ 提交报废
+
+
+
+
+
+ 待提交
+ 审核中
+ 已驳回
+ 已通过
+
+
+
+ 退料
+ 维修审核
+ 盘点
+
+
+
+ 查看
+ 提交报废
+ 审批详情
+ 驳回退料
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 驳回退料
+ 返回
+
+
+
+
+
+
+
+
+
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listingcss.vue
similarity index 99%
rename from sgzb-ui/src/views/scrapManage/forecastWaste/listing.vue
rename to sgzb-ui/src/views/scrapManage/forecastWaste/listingcss.vue
index 44ae9a2d..335c2019 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listingcss.vue
@@ -231,7 +231,7 @@
this.$message.error('请勾选列表数据!')
} else {
this.dialogWidth = '50%'
- this.selDepart = true
+ this.title = '提交报废'
this.dialogVisible = true
}
},