diff --git a/src/const/capital/productclass.js b/src/const/capital/productclass.js index c8ae4d1..a59ac04 100644 --- a/src/const/capital/productclass.js +++ b/src/const/capital/productclass.js @@ -1,183 +1,176 @@ const num = (rule, value, callback) => { - if (value < 0) { - callback(new Error('必须大于0')); - return false - } - callback(); + if (value < 0) { + callback(new Error("必须大于0")); + return false; + } + callback(); }; -const statisticsTypeDic = -[ - { - label: '否', - value: 0 - }, - { - label: '是', - value: 1 - }, -] - const gType = - [ - { - label: '启用', - value: 0 - }, { - label: '禁用', - value: 1 - } - ] - const Type = - [ - { - label:'固定资产', - value:1 - }, - { - label:'试剂类', - value:2 - }, - { - label:'耗材类', - value:3 - } - ] - +const statisticsTypeDic = [ + { + label: "否", + value: 0, + }, + { + label: "是", + value: 1, + }, +]; +const gType = [ + { + label: "启用", + value: 0, + }, + { + label: "禁用", + value: 1, + }, +]; +const Type = [ + { + label: "固定资产", + value: 1, + }, + // { + // label:'试剂类', + // value:2 + // }, + // { + // label:'耗材类', + // value:3 + // } +]; export const tableOption = { - calcHeight: 210, - searchShow: true, - searchMenuSpan: 4, - border: false, - viewBtn: false, - editBtn: false, - addBtn: false, - delBtn: false, - index: false, - columnBtn: false, - refreshBtn: false, - searchShowBtn: false, - menuWidth: 280, - headerAlign: "left", - align: "left", - menuPosition: "left", - emptyBtnText: "重置", - searchBtnText: "查询", - searchSpan: 5, - selection: false, - tip: false, - tree: true, - searchBtn:false, - emptyBtn:false, - slot: true, - //弹框 - saveBtn:false, - cancelBtn:false, + calcHeight: 210, + searchShow: true, + searchMenuSpan: 4, + border: false, + viewBtn: false, + editBtn: false, + addBtn: false, + delBtn: false, + index: false, + columnBtn: false, + refreshBtn: false, + searchShowBtn: false, + menuWidth: 280, + headerAlign: "left", + align: "left", + menuPosition: "left", + emptyBtnText: "重置", + searchBtnText: "查询", + searchSpan: 5, + selection: false, + tip: false, + tree: true, + searchBtn: false, + emptyBtn: false, + slot: true, + //弹框 + saveBtn: false, + cancelBtn: false, dialogWidth: 920, - addBtn:false, - updateBtn:false, + addBtn: false, + updateBtn: false, tip: false, labelPosition: "top", columnBtn: false, refreshBtn: false, - dialogCustomClass:"custom", - addTitle:"新增", - menuHeaderAlign: 'left', - column: - [ - { - label: "类型", - prop: "name", - searchLabelWidth: 60, - span: 8, - rules: - [ - { - required: true, - message: "请输入类型名称", - trigger: "blur" - } - ], - overHidden:true, - }, - { - label: "资产类型", - prop: "productCategory", - type: "select", - span: 8, - dicData: Type, - editDisabled: true, - rules: - [ - { - required: true, - message: "请选择资产类型", - trigger: "blur", - } - ], - overHidden:true, - }, - { - label: "上级类型", - prop: "parentId", - dicData: [], - type: "tree", - hide: true, - addDisabled: false, - span: 8, - props: { - label: "title" - }, - rules: - [ - { - required: false, - message: "上级类型", - trigger: "click" - } - ], - overHidden:true, - - }, - { - label: "状态", - prop: "status", - type: "select", - span: 8, - dicData: gType, - overHidden:true, - rules: - [ - { - required: true, - message: "请选择固定资产", - trigger: "blur", - } - ], - // value: 1, - slot:true, - }, - { - label: "危险品", - prop: "danger", - type: "switch", - overHidden:true, - span: 8, - dicData: statisticsTypeDic, - }, - { - label: "排序", - prop: "sort", - type: "number", - overHidden:true, - span: 8, - width: 100, - cell: true, - // minRows: 1, - rules: [{ - required: true, - message: "请输入排序", - trigger: "blur" - }], - }, - ] -} + dialogCustomClass: "custom", + addTitle: "新增", + menuHeaderAlign: "left", + column: [ + { + label: "类型", + prop: "name", + searchLabelWidth: 60, + span: 8, + rules: [ + { + required: true, + message: "请输入类型名称", + trigger: "blur", + }, + ], + overHidden: true, + }, + { + label: "资产类型", + prop: "productCategory", + type: "select", + span: 8, + dicData: Type, + editDisabled: true, + rules: [ + { + required: true, + message: "请选择资产类型", + trigger: "blur", + }, + ], + overHidden: true, + }, + { + label: "上级类型", + prop: "parentId", + dicData: [], + type: "tree", + hide: true, + addDisabled: false, + span: 8, + props: { + label: "title", + }, + rules: [ + { + required: false, + message: "上级类型", + trigger: "click", + }, + ], + overHidden: true, + }, + { + label: "状态", + prop: "status", + type: "select", + span: 8, + dicData: gType, + overHidden: true, + rules: [ + { + required: true, + message: "请选择固定资产", + trigger: "blur", + }, + ], + // value: 1, + slot: true, + }, + { + label: "危险品", + prop: "danger", + type: "switch", + overHidden: true, + span: 8, + dicData: statisticsTypeDic, + }, + { + label: "排序", + prop: "sort", + type: "number", + overHidden: true, + span: 8, + width: 100, + cell: true, + // minRows: 1, + rules: [ + { + required: true, + message: "请输入排序", + trigger: "blur", + }, + ], + }, + ], +}; diff --git a/src/views/capital/productstoreList.vue b/src/views/capital/productstoreList.vue index 02a85f8..7ac42a3 100644 --- a/src/views/capital/productstoreList.vue +++ b/src/views/capital/productstoreList.vue @@ -244,6 +244,7 @@ class="menuLeft" size="small" style="float: right" + v-if="permission.goods_list_check_btn" @click="goodsconfirm" > 物品确认 @@ -549,8 +550,8 @@ />
- - 申领数:    + 选择批次 + 设备确认 @@ -109,7 +110,7 @@ @click="scrapHandle(row, index)" >报废 - 校准 + > --> diff --git a/src/views/purchasing/purchaseApply.vue b/src/views/purchasing/purchaseApply.vue index 790c17d..707eaef 100644 --- a/src/views/purchasing/purchaseApply.vue +++ b/src/views/purchasing/purchaseApply.vue @@ -387,7 +387,7 @@ -->