From 6ec7f029e13497aecdbf094e89dfbe0c27ebc7eb Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Dec 2023 11:47:14 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=92=8C=E7=9B=98=E7=82=B9=E6=98=8E=E7=BB=86=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 6 + src/views/Home/components/material.vue | 126 +++++++++++------- src/views/Home/components/produce.vue | 67 ++++------ src/views/Home/components/product.vue | 123 ++++++++++------- src/views/Home/echarts-data.ts | 14 +- .../countadjustRequestMain.data.ts | 1 + .../countadjustRequestMain/index.vue | 1 + src/views/wms/reportList/index.vue | 9 +- 8 files changed, 193 insertions(+), 154 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index e9e337867..ef5164a6f 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -405,6 +405,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: defaultButtons.defaultFilterBtn(null) // 筛选 ] } + //盘点调整申请筛选 + if (props.fromeWhere == 'countadjustRequest') { + HeadButttondata.value = [ + defaultButtons.defaultFilterBtn(null) // 筛选 + ] + } } // 动态显示操作列按钮 diff --git a/src/views/Home/components/material.vue b/src/views/Home/components/material.vue index fd8d5a2bf..5bae1d6bf 100644 --- a/src/views/Home/components/material.vue +++ b/src/views/Home/components/material.vue @@ -148,19 +148,63 @@
高低储预警
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
待处理任务
- - - - - +
@@ -169,55 +213,41 @@ import * as IndexApi from '@/api/home' import { formatDate } from '@/utils/formatTime' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' -const tableData = [ - { - date: '2016-05-03', - name: 'Tom', - title: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-02', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-04', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-01', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-01', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-01', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - } -] +import { set } from 'lodash-es' +import { EChartsOption } from 'echarts' +import { barOptions } from '../echarts-data' +const lineIndex = ref(0) + const materialData = ref() // 获取原料管理员数据 const getMaterialData = async () => { - IndexApi.getMaterialData().then((res) => { + await IndexApi.getMaterialData().then((res) => { materialData.value = res + getJobCharts() }) } const formatter = (type, dict) => { let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label return str } +const barOptionsData = reactive(barOptions) as EChartsOption +const getJobCharts = async () => { + set( + barOptionsData, + 'xAxis.data', + Object.keys( materialData.value.jobCount) + ) + set(barOptionsData, 'legend.data', ['待处理任务']) + set(barOptionsData, 'series', [ + { + name:'待处理任务', + data: Object.values( materialData.value.jobCount), + type: 'bar', + barMaxWidth:30 + } + ]) + lineIndex.value++ +} onMounted(async () => { await getMaterialData() }) diff --git a/src/views/Home/components/produce.vue b/src/views/Home/components/produce.vue index 8046930a2..3e8701807 100644 --- a/src/views/Home/components/produce.vue +++ b/src/views/Home/components/produce.vue @@ -156,11 +156,7 @@
待处理任务
- - - - - +
@@ -169,55 +165,40 @@ import * as IndexApi from '@/api/home' import { formatDate } from '@/utils/formatTime' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' -const tableData = [ - { - date: '2016-05-03', - name: 'Tom', - title: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-02', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-04', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-01', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-01', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-01', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - } -] +import { set } from 'lodash-es' +import { EChartsOption } from 'echarts' +import { barOptions } from '../echarts-data' +const lineIndex = ref(0) const produceData = ref() // 获取生产管理员首页数据 const getProduceData = async () => { IndexApi.getProduceData().then((res) => { produceData.value = res + getJobCharts() }) } const formatter = (type, dict) => { let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label return str } +const barOptionsData = reactive(barOptions) as EChartsOption +const getJobCharts = async () => { + set( + barOptionsData, + 'xAxis.data', + Object.keys( produceData.value.jobCount) + ) + set(barOptionsData, 'legend.data', ['待处理任务']) + set(barOptionsData, 'series', [ + { + name:'待处理任务', + data: Object.values( produceData.value.jobCount), + type: 'bar', + barMaxWidth:30 + } + ]) + lineIndex.value++ +} onMounted(async () => { await getProduceData() }) diff --git a/src/views/Home/components/product.vue b/src/views/Home/components/product.vue index 560e3a990..f1d7b4353 100644 --- a/src/views/Home/components/product.vue +++ b/src/views/Home/components/product.vue @@ -127,19 +127,63 @@
高低储预警
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
待处理任务
- - - - - +
@@ -148,55 +192,40 @@ import * as IndexApi from '@/api/home' import { formatDate } from '@/utils/formatTime' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' -const tableData = [ - { - date: '2016-05-03', - name: 'Tom', - title: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-02', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-04', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-01', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-01', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - }, - { - date: '2016-05-01', - title: 'Tom', - name: 'Tom', - text: 'No. 189, Grove St, Los Angeles' - } -] +import { set } from 'lodash-es' +import { EChartsOption } from 'echarts' +import { barOptions } from '../echarts-data' +const lineIndex = ref(0) // 获取成品管理员首页首页数据 const productData = ref() const getProductData = async () => { IndexApi.getProductData().then((res) => { productData.value = res + getJobCharts() }) } const formatter = (type, dict) => { let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label return str } +const barOptionsData = reactive(barOptions) as EChartsOption +const getJobCharts = async () => { + set( + barOptionsData, + 'xAxis.data', + Object.keys( productData.value.jobCount) + ) + set(barOptionsData, 'legend.data', ['待处理任务']) + set(barOptionsData, 'series', [ + { + name:'待处理任务', + data: Object.values( productData.value.jobCount), + type: 'bar', + barMaxWidth:30 + } + ]) + lineIndex.value++ +} onMounted(async () => { await getProductData() }) diff --git a/src/views/Home/echarts-data.ts b/src/views/Home/echarts-data.ts index 9e6474d65..15c7b4afd 100644 --- a/src/views/Home/echarts-data.ts +++ b/src/views/Home/echarts-data.ts @@ -96,7 +96,7 @@ export const pieOptions: EChartsOption = { export const barOptions: EChartsOption = { title: { - text: t('analysis.weeklyUserActivity'), + text: '', left: 'center' }, tooltip: { @@ -112,15 +112,7 @@ export const barOptions: EChartsOption = { }, xAxis: { type: 'category', - data: [ - t('analysis.monday'), - t('analysis.tuesday'), - t('analysis.wednesday'), - t('analysis.thursday'), - t('analysis.friday'), - t('analysis.saturday'), - t('analysis.sunday') - ], + data: [], axisTick: { alignWithLabel: true } @@ -131,7 +123,7 @@ export const barOptions: EChartsOption = { series: [ { name: t('analysis.activeQuantity'), - data: [13253, 34235, 26321, 12340, 24643, 1322, 1324], + data: [], type: 'bar' } ] diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index 6072b3f32..493fd7d22 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -658,6 +658,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive([ field: 'action', isDetail: false, isForm: false , + isTable:false, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index f952089db..c1b1a6dd5 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -67,6 +67,7 @@ :apiUpdate="CountadjustRequestDetailApi.updateCountadjustRequestDetail" :apiPage="CountadjustRequestDetailApi.getCountadjustRequestDetailPage" :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail" + fromeWhere="countadjustRequest" :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" /> diff --git a/src/views/wms/reportList/index.vue b/src/views/wms/reportList/index.vue index ec719b6ee..e0e04bb8d 100644 --- a/src/views/wms/reportList/index.vue +++ b/src/views/wms/reportList/index.vue @@ -1,9 +1,8 @@ diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts new file mode 100644 index 000000000..887b6fb6c --- /dev/null +++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts @@ -0,0 +1,145 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const ContainerInitRecordMainRules = reactive({ +}) + +export const ContainerInitRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + isSearch: true, + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table:{ + show:false + } + }, +])) + +export const ContainerInitRecordDetail = useCrudSchemas(reactive([ + { + label: '器具号', + field: 'containerNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '类型', + field: 'type', + sort: 'custom', + form: { + component: 'SelectV2' + }, + table: { + width: 150 + }, + }, + { + label: '总容量', + field: 'capacity', + sort: 'custom', + table: { + width: 150 + }, + }, + + { + label: '状态', + field: 'status', + sort: 'custom', + form: { + component: 'Radio' + }, + table: { + width: 150 + }, + }, + { + label: '货主代码', + field: 'ownerCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + table: { + width: 150 + }, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + +// 表单校验 +export const ContainerInitRecordDetailRules = reactive({ + +}) diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue new file mode 100644 index 000000000..a386987ca --- /dev/null +++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue @@ -0,0 +1,286 @@ + + + From 390a59be19053b9391eec67f2fc430938db93e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 25 Dec 2023 16:04:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=BA=93=E5=86=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychangeRecordMain/index.vue | 2 +- .../inventorychangeRequestMain/index.vue | 55 +++- .../inventorychangeRequestMain.data.ts | 235 ++++++++++-------- 3 files changed, 182 insertions(+), 110 deletions(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue index b9d7286d0..ad3c7e2c7 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue @@ -139,7 +139,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:inventorychange-record-main:export'}), // 导出 - defaultButtons.defaultFreshBtn({hasPermi:'wms:inventorychange-record-main:page'}), // 刷新 + defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 // { diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 52f69be97..577452352 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -108,15 +108,56 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // 明细查询页赋值 row[formField] = val[0][searchField] row['fromPackingNumber'] = val[0]['packingNumber'] - row['itemCode'] = val[0]['itemCode'] + row['toPackingNumber'] = val[0]['packingNumber'] row['fromBatch'] = val[0]['batch'] - row['locationCode'] = val[0]['locationCode'] + row['toBatch'] = val[0]['batch'] row['fromInventoryStatus'] = val[0]['inventoryStatus'] + row['toInventoryStatus'] = val[0]['inventoryStatus'] + row['fromContainerNumber'] = val[0]['containerNumber'] + row['toContainerNumber'] = val[0]['containerNumber'] + row['fromQty'] = val[0]['qty'] + row['toQty'] = val[0]['qty'] + row['fromOwnerCode'] = val[0]['ownerCode'] + row['toOwnerCode'] = val[0]['ownerCode'] + row['fromAltBatch'] = val[0]['altBatch'] + row['toAltBatch'] = val[0]['altBatch'] + row['fromArriveDate'] = val[0]['arriveDate'] + row['toArriveDate'] = val[0]['arriveDate'] + row['fromProduceDate'] = val[0]['produceDate'] + row['toProduceDate'] = val[0]['produceDate'] + row['fromExpireDate'] = val[0]['expireDate'] + row['toExpireDate'] = val[0]['expireDate'] + row['itemCode'] = val[0]['itemCode'] + row['locationCode'] = val[0]['locationCode'] + row['uom'] = val[0]['uom'] + } else { + const setV = {} + setV[formField] = val[0][searchField] + setV['fromPackingNumber'] = val[0]['packingNumber'] + setV['toPackingNumber'] = val[0]['packingNumber'] + setV['fromBatch'] = val[0]['batch'] + setV['toBatch'] = val[0]['batch'] + setV['fromInventoryStatus'] = val[0]['inventoryStatus'] + setV['toInventoryStatus'] = val[0]['inventoryStatus'] + setV['fromContainerNumber'] = val[0]['containerNumber'] + setV['toContainerNumber'] = val[0]['containerNumber'] + setV['fromQty'] = val[0]['qty'] + setV['toQty'] = val[0]['qty'] + setV['fromOwnerCode'] = val[0]['ownerCode'] + setV['toOwnerCode'] = val[0]['ownerCode'] + setV['fromAltBatch'] = val[0]['altBatch'] + setV['toAltBatch'] = val[0]['altBatch'] + setV['fromArriveDate'] = val[0]['arriveDate'] + setV['toArriveDate'] = val[0]['arriveDate'] + setV['fromProduceDate'] = val[0]['produceDate'] + setV['toProduceDate'] = val[0]['produceDate'] + setV['fromExpireDate'] = val[0]['expireDate'] + setV['toExpireDate'] = val[0]['expireDate'] + setV['itemCode'] = val[0]['itemCode'] + setV['locationCode'] = val[0]['locationCode'] + setV['uom'] = val[0]['uom'] + formRef.setValues(setV) } - console.log(116, row) - const setV = {} - setV[formField] = val[0][searchField] - formRef.setValues(setV) }) } // 查询页面返回——详情 @@ -182,7 +223,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), //重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorychange-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorychange-request-main:refused'}), // 驳回 diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 3db76d9cf..9fb835b57 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -8,6 +8,9 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import * as OwnerApi from '@/api/wms/owner' +import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data' + const { t } = useI18n() // 国际化 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 @@ -341,6 +344,43 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive Date: Mon, 25 Dec 2023 16:11:24 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=99=A8=E5=85=B7=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerinitrecord/containerInitRecordMain.data.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts index 887b6fb6c..def028e12 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts @@ -61,6 +61,8 @@ export const ContainerInitRecordDetail = useCrudSchemas(reactive([ { label: '类型', field: 'type', + dictType: DICT_TYPE.CONTAINER_TYPE, + dictClass: 'string', sort: 'custom', form: { component: 'SelectV2' @@ -81,6 +83,8 @@ export const ContainerInitRecordDetail = useCrudSchemas(reactive([ { label: '状态', field: 'status', + dictType: DICT_TYPE.CONTAINER_STATUS, + dictClass: 'string', sort: 'custom', form: { component: 'Radio' From 42065688d0b913d26f2f0463a3e3269cedfc508d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 25 Dec 2023 16:41:51 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMainNo/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index b3120aa1f..0b973e826 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -324,12 +324,12 @@ const buttonTableClick = async (val, row) => { if(itemColumns.field == 'productionLineCodePackage') { // itemColumns.tableForm.isInpuFocusShow = false // itemColumns.tableForm.disabled = true - ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false + ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = false } if(itemColumns.field == 'supplierItemCode') { itemColumns.tableForm.isInpuFocusShow = true itemColumns.tableForm.disabled = false - ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true + ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = true } }) } else { @@ -338,13 +338,13 @@ const buttonTableClick = async (val, row) => { if(itemColumns.field == 'supplierItemCode') { itemColumns.tableForm.isInpuFocusShow = false itemColumns.tableForm.disabled = true - ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false + ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = false } if(itemColumns.field == 'productionLineCodePackage') { item.productionLineCodePackage = item.productionLineCode // itemColumns.tableForm.isInpuFocusShow = true // itemColumns.tableForm.disabled = false - ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true + ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = true } }) } From 6fae7af59fa7cc70ece4498000087e0cf5f2166d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Dec 2023 16:51:00 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E5=88=A0=E9=99=A4bug,=E7=9B=98=E7=82=B9=E8=A7=A3=E5=86=BB?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/countRequestMain/index.ts | 4 ++++ src/components/BasicForm/src/BasicForm.vue | 1 + .../src/TableFormCountPlan.vue | 4 ++++ src/utils/disposition/defaultButtons.ts | 12 ++++++++++++ .../count/countRequestMain/index.vue | 17 ++++++++++++++++- 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/api/wms/countRequestMain/index.ts b/src/api/wms/countRequestMain/index.ts index 1205ae708..cf6c52242 100644 --- a/src/api/wms/countRequestMain/index.ts +++ b/src/api/wms/countRequestMain/index.ts @@ -105,4 +105,8 @@ export const superviseCount = async (data) => { //生成盘点调整申请 export const generateCountadjustRequest = async (id) => { return await request.put({ url: `/wms/count-request-main/generateCountadjustRequest?id=` + id }) +} +//解冻 +export const thaw = async (id) => { + return await request.put({ url: `/wms/count-request-main/thaw?id=` + id }) } \ No newline at end of file diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 9497abdd2..a34f2ebe8 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -90,6 +90,7 @@ ref="tableFormRef" @tableFormChange="tableFormChange" @handleAddTable="handleAddTable" + @handleDeleteTable="handleDeleteTable" />