From 73c8a1a36826bbedd8e08e6ed68f4fb443db24b9 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 4 Nov 2024 10:03:28 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AD=90=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E3=80=81=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E3=80=81=E6=80=BB?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E6=80=BB=E5=8A=A9=E5=AE=A1=E6=89=B9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E3=80=81=E4=B8=9A=E5=8A=A1=E7=BB=8F=E7=90=86=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2=E3=80=81=E4=B8=9A=E5=8A=A1=E4=B8=BB?= =?UTF-8?q?=E7=AE=A1=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/system/salesOrder/add.html | 2 ++ .../src/main/resources/templates/system/salesOrder/detail.html | 2 ++ .../src/main/resources/templates/system/salesOrder/edit.html | 2 ++ .../resources/templates/system/salesOrder/taskModifyApply.html | 2 ++ .../resources/templates/system/salesOrder/taskYwjlVerify.html | 1 + .../resources/templates/system/salesOrder/taskYwzgVerify.html | 1 + .../resources/templates/system/salesOrder/taskZozjVerify.html | 1 + 7 files changed, 11 insertions(+) diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index a64753fb..9125e8c1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -348,6 +348,7 @@ {title: '图片',field: 'photoUrl',align: 'center',formatter: function(value, row, index) {return $.table.imageView(value);} }, {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}}, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, { title: '入库部门',field: 'warehouseDept',align: 'center', @@ -861,6 +862,7 @@ materialType: rowData.materialType, describe: rowData.describe, brand: rowData.brand, + materialModel: rowData.materialModel, unit: rowData.unit, processMethod: rowData.processMethod, photoUrl: rowData.photoUrl, diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html index 5cdd4c97..feef0248 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html @@ -352,6 +352,7 @@ {title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);} }, {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}}, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, {title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, @@ -540,6 +541,7 @@ materialName: rowData.materialName, materialType: rowData.materialType, describe: rowData.describe, + materialModel: rowData.materialModel, brand: rowData.brand, photoUrl: rowData.photoUrl, unit: rowData.unit, diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html index 3c58ff1f..5bbf6d81 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html @@ -373,6 +373,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) { @@ -725,6 +726,7 @@ materialName: rowData[i].materialName, materialType: rowData[i].materialType, describe: rowData[i].describe, + materialModel: rowData[i].materialModel, brand: rowData[i].brand, photoUrl: rowData[i].photoUrl, warehouseDept:rowData[i].warehouseDept, diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html index 3b0aeb03..d66353b8 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html @@ -360,6 +360,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) { @@ -593,6 +594,7 @@ materialName: rowData.materialName, materialType: rowData.materialType, describe: rowData.describe, + materialModel: rowData.materialModel, brand: rowData.brand, unit: rowData.unit, processMethod: rowData.processMethod, diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html index 413f1999..3eddc232 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html @@ -352,6 +352,7 @@ {title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);} }, {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}}, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html index ccb56d42..b38702ea 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html @@ -351,6 +351,7 @@ {title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);} }, {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}}, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html index a29e82f2..c79cc9df 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html @@ -352,6 +352,7 @@ {title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);} }, {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}}, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},