diff --git a/src/views/loanManagement/loanHistory.vue b/src/views/loanManagement/loanHistory.vue
index d725e94..736867b 100644
--- a/src/views/loanManagement/loanHistory.vue
+++ b/src/views/loanManagement/loanHistory.vue
@@ -1,3 +1,712 @@
- 归还记录
-
\ No newline at end of file
+
+
+
+
+
+ {{ row.stLend.leCode }}
+ {{ row.stLend.stRealtimeStock.coGoods.goodsCode }}
+ {{ row.stLend.stRealtimeStock.coGoods.goodsName }}
+ {{ row.stLend.stRealtimeStock.piNo }}
+ {{ row.stLend.stRealtimeStock.coStorehouse.shName }}
+ {{ row.stLend.stRealtimeStock.storageLocation.location }}
+ {{ row.stLend.quantity }}
+ {{ row.stLend.returnQty }}
+ {{ row.stLend.stRealtimeStock.coGoods.unitName }}
+ {{ row.stLend.leDate }}
+ {{ row.stLend.leReturnDate }}
+ {{ row.stLend.pfDepartment.deptName }}
+ {{ row.stLend.leMan.userName }}
+ {{ row.createMan.userName }}
+
+ {{ row.stLend.curStatus == 20 ? '已借出' : row.stLend.curStatus == 24 ?
+ '部分归还' : row.stLend.curStatus == 25 ? '已归还' : "新建" }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/processManagement/bathRefine/planClass.vue b/src/views/processManagement/bathRefine/planClass.vue
index 5013321..5f989e6 100644
--- a/src/views/processManagement/bathRefine/planClass.vue
+++ b/src/views/processManagement/bathRefine/planClass.vue
@@ -1,3 +1,749 @@
- 计划类检查项配置
-
\ No newline at end of file
+
+
+
+
+
+ 审批
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/processManagement/bathRefine/workCenterDevice.vue b/src/views/processManagement/bathRefine/workCenterDevice.vue
index bd30ca1..1d3a565 100644
--- a/src/views/processManagement/bathRefine/workCenterDevice.vue
+++ b/src/views/processManagement/bathRefine/workCenterDevice.vue
@@ -1,3 +1,795 @@
- 确认人员配置
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/warehouseManagement/workwearPlan/index.vue b/src/views/warehouseManagement/workwearPlan/index.vue
index f9f417b..8323648 100644
--- a/src/views/warehouseManagement/workwearPlan/index.vue
+++ b/src/views/warehouseManagement/workwearPlan/index.vue
@@ -1,3 +1,352 @@
- 工装计划申报
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+ 删除
+
+
+ {{ row.keeper.userName }}
+ {{ row.createMan.userName }}
+
+
+
+ 插入一行
+ 删除选择行
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+ changeMoData(val, scope.$index)">
+
+
+
+
+
+
+
+ changeMoData(val, scope.$index)">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/warehouseManagement/workwearPlan/js/workColumnData.js b/src/views/warehouseManagement/workwearPlan/js/workColumnData.js
new file mode 100644
index 0000000..1a5ebd2
--- /dev/null
+++ b/src/views/warehouseManagement/workwearPlan/js/workColumnData.js
@@ -0,0 +1,402 @@
+export default {
+ 'declarationPlan': [
+ {
+ label: '零件号',
+ prop: 'partCode',
+ search: true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入零件号',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '工装号',
+ prop: 'moCodee',
+ search: true,
+ hide:true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入工装号',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '模具编码',
+ prop: 'moCode',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入模具编码',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '计划类型',
+ prop: 'planType',
+ search: true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入计划类型',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '数量',
+ prop: 'quantity',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入数量',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '生产标识',
+ prop: 'quaLevel',
+ search: true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入生产标识',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '紧急状态',
+ prop: 'urgentTypeText',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入紧急状态',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '需求日期',
+ prop: 'needDate',
+ type:'date',
+ searchRange:true,
+ search: true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入需求日期',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '保管员',
+ prop: 'keeper',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入保管员',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '建立时间',
+ prop: 'createTime',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入建立时间',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '建立人员',
+ prop: 'createMan',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入建立人员',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '备注',
+ prop: 'memo',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入备注',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '状态',
+ prop: 'mafStatusTitle',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入状态',
+ trigger: 'blur',
+ },
+ ],
+ },
+ ],
+ 'declarationLog': [
+ {
+ label: '零件号',
+ prop: 'partCode',
+ search: true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入零件号',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '工装号',
+ prop: 'moCodee',
+ search: true,
+ hide:true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入工装号',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '模具编码',
+ prop: 'moCode',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入模具编码',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '计划类型',
+ prop: 'planType',
+ search: true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入计划类型',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '数量',
+ prop: 'quantity',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入数量',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '生产标识',
+ prop: 'quaLevel',
+ search: true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入生产标识',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '紧急状态',
+ prop: 'urgentTypeText',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入紧急状态',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '需求日期',
+ prop: 'needDate',
+ type:'date',
+ searchRange:true,
+ search: true,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入需求日期',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '保管员',
+ prop: 'keeper',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入保管员',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '建立时间',
+ prop: 'createTime',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入建立时间',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '建立人员',
+ prop: 'createMan',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入建立人员',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '备注',
+ prop: 'memo',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入备注',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '状态',
+ prop: 'mafStatusTitle',
+ search: false,
+ sortable: true,
+ overHidden: true,
+ width: 200,
+ rules: [
+ {
+ required: true,
+ message: '请输入状态',
+ trigger: 'blur',
+ },
+ ],
+ },
+ ]
+}
\ No newline at end of file
diff --git a/src/views/workLicense/components/credentialDialog.vue b/src/views/workLicense/components/credentialDialog.vue
new file mode 100644
index 0000000..93057e9
--- /dev/null
+++ b/src/views/workLicense/components/credentialDialog.vue
@@ -0,0 +1,88 @@
+
+
+
+ 插入一行
+ 删除选择行
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/workLicense/components/maintainDialog.vue b/src/views/workLicense/components/maintainDialog.vue
new file mode 100644
index 0000000..43a84e0
--- /dev/null
+++ b/src/views/workLicense/components/maintainDialog.vue
@@ -0,0 +1,72 @@
+
+
+
+
证书类型:
+
+
+
+
日期类型:
+
+
+
+
+
批量设置
+
插入一行
+
删除选择行
+
保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/workLicense/workLicense.vue b/src/views/workLicense/workLicense.vue
index 92d2362..534a676 100644
--- a/src/views/workLicense/workLicense.vue
+++ b/src/views/workLicense/workLicense.vue
@@ -5,24 +5,19 @@
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
:span-method="spanMethod">
-
- 维护
删除
导入
- 批量发证
- 设置有效期
+ 证书维护
+ 证书类型维护
+
- 设置上岗证编号
+ 设备维护
+
删除选择行
@@ -45,7 +40,8 @@
删除选择行
-
+
批量设置
@@ -54,11 +50,11 @@
-
+
-
+
-
+
@@ -76,24 +72,81 @@
+
+
+
设备时间:
+
+
设备有效期:
+
+
批量设置
+
保存
+
插入一行
+
删除选择行
+
+
+
+
+
+ changeDevice(val, scope.$index)">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+