diff --git a/src/api/StockIn/index.ts b/src/api/StockIn/index.ts index bd7fda3..438c974 100644 --- a/src/api/StockIn/index.ts +++ b/src/api/StockIn/index.ts @@ -174,3 +174,16 @@ export function UpdateDeliveryStates(ChangeParams: any) { }); } +/** + * 辅材盘盈盘亏确认 + * @param data + * @returns + */ +export function confirm(data: any) { + return request({ + url: '/api/MaterialReceiveAct/confirm', + method: 'post', + data: data, + }); +} + diff --git a/src/views/check/auxiliaryOutIn/index.vue b/src/views/check/auxiliaryOutIn/index.vue new file mode 100644 index 0000000..5c6c5b9 --- /dev/null +++ b/src/views/check/auxiliaryOutIn/index.vue @@ -0,0 +1,277 @@ + + + + \ No newline at end of file diff --git a/src/views/stocked/careerAssistanceInquiry/index.vue b/src/views/stocked/careerAssistanceInquiry/index.vue index f8ecbd7..64f185e 100644 --- a/src/views/stocked/careerAssistanceInquiry/index.vue +++ b/src/views/stocked/careerAssistanceInquiry/index.vue @@ -17,7 +17,6 @@ filterable v-model="queryParams.params.ERPFACTORY" placeholder="下拉选择组织" - style="width: 240px" @change="GetERPLocationForList" > @@ -72,7 +70,6 @@ placeholder="请选择货位" popper-class="custom-header" :max-collapse-tags="1" - style="width: 240px" remote :remote-method="handleInput" filterable @@ -101,7 +98,6 @@ + + + + +
@@ -194,6 +199,7 @@ v-if="!col.hide" :label="col.header" :prop="col.field" + :width="col.width" show-overflow-tooltip :sort-orders="['descending', 'ascending']" :sortable="true" @@ -418,7 +424,8 @@ const state = reactive({ CAREER_ASSISTANCE: '', DESC_CN: '', OQARESULTSTATE: '', - PACKINGGRADE: '' + PACKINGGRADE: '', + SALESHIPREQUESTNAME: '' }, pageNum: 1, pageSize: 10 @@ -548,12 +555,12 @@ onMounted(() => { // { header: "主数量", field: "MATERIALQUANTITY", hide: false }, // { header: "主单位", field: "FNAME", hide: false }, // { header: "仓库编码", field: "ERPLOCATION", hide: false }, - { header: '仓库名称', field: 'ERPLOCATIONDESC', hide: false }, + { header: '仓库名称', field: 'ERPLOCATIONDESC', hide: false, width: 120 }, // { header: "货位编码", field: "LOCATIONNAME", hide: false }, - { header: '货位名称', field: 'LOCATIONNAMEDESC', hide: false }, + { header: '货位名称', field: 'LOCATIONNAMEDESC', hide: false, width: 150 }, { header: '物料编号', field: 'MATERIALSPECNAME', hide: false }, - { header: '品名', field: 'DESC_CN', hide: false }, - { header: '批次号', field: 'CHARGE', hide: false }, + { header: '品名', field: 'DESC_CN', hide: false, width: 120 }, + { header: '批次号', field: 'CHARGE', hide: false, width: 180 }, { header: '阶段', field: 'PHASE', hide: false }, { header: '系统规格', field: 'DESCRIPTION', hide: false }, { header: 'SDK规格', field: 'SPECNAME', hide: false }, @@ -570,6 +577,7 @@ onMounted(() => { // { header: "供应商", field: "SUPPLIERNAME", hide: false }, { header: '业助', field: 'CAREER_ASSISTANCE', hide: false }, { header: '客户', field: 'CUSTOMNO', hide: false }, + { header: '销售订单', field: 'SALESHIPREQUESTNAME', hide: false }, { header: '业务', field: 'SALESPERSON', hide: false }, { header: '事业部', field: 'BUSINESS_UNIT', hide: false } // { header: "管芯类型", field: "DURABLETYPE", hide: false }, @@ -667,6 +675,7 @@ function modifiedRemark() { return } console.log(state.multipleSelection) + state.loadings = true // return let boxLists = [] for (var i = 0; i < state.multipleSelection.length; ++i) { @@ -695,13 +704,14 @@ function modifiedRemark() { updateCareerAssistance(PRINT) .then((res: any) => { console.log(res.success) + state.loadings = false // state.COUSTOMNO = '' if (res.success) { state.SALESHIPREQUESTNAME = '' state.SALESHIPREQUESTDETAILNAME = '' state.CAREER_ASSISTANCE = '' // proxy.$ElMessage.success('备注更新成功'); - ElMessageBox.alert('业助更新成功', '提醒框', { + ElMessageBox.alert('E库存更新成功', '提醒框', { confirmButtonText: 'OK' }) handleQuery()