diff --git a/src/views/EquipmentLedger/components/equ-repair.vue b/src/views/EquipmentLedger/components/equ-repair.vue
index 3a33b37a..b1dc1919 100644
--- a/src/views/EquipmentLedger/components/equ-repair.vue
+++ b/src/views/EquipmentLedger/components/equ-repair.vue
@@ -30,8 +30,8 @@
placeholder="请选择操作类型"
@change="handleStatusChange(row)"
>
-
-
+
+
diff --git a/src/views/EquipmentLedger/components/euq-out.vue b/src/views/EquipmentLedger/components/euq-out.vue
index ece359de..5884ca1a 100644
--- a/src/views/EquipmentLedger/components/euq-out.vue
+++ b/src/views/EquipmentLedger/components/euq-out.vue
@@ -145,7 +145,7 @@
-
+
@@ -352,7 +352,14 @@ export default {
proLocation: [{ required: true, message: '请输入详细地址', trigger: 'blur' }],
useUint: [{ required: true, message: '请输入需求单位', trigger: 'blur' }],
userName: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
- userPhone: [{ required: true, message: '请输入联系方式', trigger: 'blur' }]
+ userPhone: [
+ { required: true, message: '请输入联系方式', trigger: 'blur' },
+ {
+ pattern: /^1[3456789]\d{9}$/,
+ message: '请输入正确的手机号码',
+ trigger: 'blur',
+ },
+ ]
},
provinceList: [],
@@ -509,7 +516,11 @@ export default {
useTime: item.useTime
}
})
-
+ if (this.maIds) {
+ params.status = '3'
+ } else {
+ params.status = '2'
+ }
params.jsonData = JSON.stringify(jsonData)
console.log('params', params)
diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue
index f0aae7b1..be40a03e 100644
--- a/src/views/EquipmentLedger/index.vue
+++ b/src/views/EquipmentLedger/index.vue
@@ -367,6 +367,10 @@
{{ row.branch ? row.subCategory + '>' : row.subCategory }}{{ row.branch }}
+
+ 上架
+ 下架
+
在库
自用
@@ -809,6 +813,7 @@ export default {
{ key: 6, label: `规格型号`, prop: 'specificationModel', visible: true },
{ key: 7, label: `装备编码`, prop: 'code', visible: true },
{ key: 8, label: `装备状态`, prop: 'status', visible: true },
+ { key: 44, label: `上下架状态`, prop: 'upDownStatus', visible: true },
{ key: 9, label: `使用年限`, prop: 'serviceLife', visible: true },
{ key: 10, label: `使用项目`, prop: 'usingProject', visible: true },
{ key: 11, label: `使用到期时间`, prop: 'expirationTime', visible: true },