diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue index 05fe78de..34af9f54 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue @@ -8,6 +8,7 @@ :inline="true" v-show="showSearch" label-width="100px" + :disabled="!isAdd && !isEdit" > @@ -50,8 +51,8 @@ @@ -59,10 +60,10 @@ @change="selDeviceTypeChange" style="width: 240px" v-model="queryParams.companyId" - :disabled="leaseApplyDetails.length > 0" placeholder="请选择设备类型" clearable filterable + :disabled="isEdit" > @@ -78,7 +79,6 @@ ref="deviceTypeCascader" filterable style="width: 240px" - :disabled="isEdit && !isView" > @@ -104,7 +104,7 @@ 保存 @@ -173,12 +173,13 @@ @@ -187,9 +188,10 @@ @@ -198,7 +200,7 @@ align="center" fixed="right" class-name="small-padding fixed-width" - v-if="isView" + v-if="isAdd || isEdit" > @@ -37,9 +39,13 @@ export default { pageContent: '新增领料任务', viewTaskId: '', rejectTaskStatus: '', - isView: false, + isEdit: false, routerParams: {}, + + isAdd: false, + isView: false, + isEdit: false, } }, methods: { @@ -71,6 +77,32 @@ export default { this.isShowComponent = 'AddPicking' this.routerParams = routerParams }, + + // 新增 查看 编辑 驳回提交等操作 + handlePicking(type, taskId) { + switch (type) { + case 1: + this.pageContent = '新增领料任务' + this.isAdd = true + this.isEdit = false + this.viewTaskId = '' + break + case 2: + this.pageContent = '领料任务编辑' + this.isAdd = false + this.isEdit = true + this.viewTaskId = taskId + break + case 3: + this.pageContent = '领料任务详情' + this.isAdd = false + this.isEdit = false + this.viewTaskId = taskId + break + } + + this.isShowComponent = 'AddPicking' + }, goBack() { this.isShowComponent = 'Home' }, diff --git a/sgzb-ui/src/views/claimAndreturn/return/reject/index.vue b/sgzb-ui/src/views/claimAndreturn/reject/index.vue similarity index 51% rename from sgzb-ui/src/views/claimAndreturn/return/reject/index.vue rename to sgzb-ui/src/views/claimAndreturn/reject/index.vue index f34a1369..1203a19b 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/reject/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/reject/index.vue @@ -1,5 +1,5 @@ + + diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue new file mode 100644 index 00000000..ae2403f5 --- /dev/null +++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue @@ -0,0 +1,61 @@ + + + diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/index.vue b/sgzb-ui/src/views/claimAndreturn/return/scrap/index.vue new file mode 100644 index 00000000..4f48825c --- /dev/null +++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/index.vue @@ -0,0 +1,32 @@ + + + + diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue index f01dbeaf..58288b81 100644 --- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue +++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue @@ -79,61 +79,61 @@