From 66b9bcfc13d4cdf944b6721261abee441963bab9 Mon Sep 17 00:00:00 2001
From: Cloud Zhang <941187371@qq.com>
Date: 星期四, 16 五月 2024 16:29:49 +0800
Subject: [PATCH] 飞达优化
---
src/views/tigerprojects/mes/smt/feeder/feeder/index.vue | 2
src/views/tigerprojects/mes/smt/feeder/feeder_type/smt_feeder_type.data.ts | 23 ++++-------
src/views/tigerprojects/mes/smt/feeder/feeder/smt_feeder.data.ts | 22 +++++++++--
src/views/tigerprojects/mes/smt/feeder/feeder_type/index.vue | 8 ++--
src/api/tigerapi/mes/smt/feedertype.ts | 18 ++++----
5 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/src/api/tigerapi/mes/smt/feedertype.ts b/src/api/tigerapi/mes/smt/feedertype.ts
index 331ff7c..d292fdc 100644
--- a/src/api/tigerapi/mes/smt/feedertype.ts
+++ b/src/api/tigerapi/mes/smt/feedertype.ts
@@ -16,8 +16,8 @@
order = params.order == 'descend' ? (params.field + ' desc') : params.field
}
let sqlcmd = '1=1';
- if (params?.FEEDER_CODE != undefined && params?.FEEDER_CODE != '') {
- sqlcmd += " And FEEDER_CODE like '%" + params?.FEEDER_CODE + "%'";
+ if (params?.TYPE_CODE != undefined && params?.TYPE_CODE != '') {
+ sqlcmd += " And TYPE_CODE like '%" + params?.TYPE_CODE + "%'";
}
let option = {
@@ -26,7 +26,7 @@
OrgCode: useUserStore().getUserInfo.orgCode as string
}
if (!isNullOrEmpty(params.page)) {
- const usParams = genAction('SMT_FEEDER_HIS', {
+ const usParams = genAction('SMT_FEEDER_TYPE', {
QueryAble_T: '',
where: sqlcmd,
order: order,
@@ -39,7 +39,7 @@
});
return getListByPageAsync(usParams);
} else {
- const usParams = genAction('SMT_FEEDER_HIS', {
+ const usParams = genAction('SMT_FEEDER_TYPE', {
QueryAble_T: '',
where: sqlcmd
});
@@ -80,8 +80,8 @@
AUTH_ORG: params?.AUTH_ORG,
AUTH_PROD: params?.AUTH_PROD,
AUTH_WH: params?.AUTH_WH,
- FEEDER_CODE: params?.FEEDER_CODE,
- FEEDER_NAME: params?.FEEDER_NAME,
+ TYPE_CODE: params?.TYPE_CODE,
+ TYPE_NAME: params?.TYPE_NAME,
REMARK: params?.REMARK,
};
let data;
@@ -96,7 +96,7 @@
// regionitem.ORG_CODE = useUserStore().getUserInfo.orgCode as string;
// regionitem.AUTH_ORG = useUserStore().getUserInfo.orgCode as string;
data = await defHttp.post(
- { url: Api.UpdateEntity, params: genAction('SMT_FEEDER_HIS', item) },
+ { url: Api.UpdateEntity, params: genAction('SMT_FEEDER_TYPE', item) },
{
errorMessageMode: 'none',
isTransformResponse: false,
@@ -117,7 +117,7 @@
// regionitem.ORG_CODE = useUserStore().getUserInfo.orgCode as string;
// regionitem.AUTH_ORG = useUserStore().getUserInfo.orgCode as string;
data = await defHttp.post(
- { url: Api.AddEntity, params: genAction('SMT_FEEDER_HIS', item) },
+ { url: Api.AddEntity, params: genAction('SMT_FEEDER_TYPE', item) },
{
errorMessageMode: 'none',
isTransformResponse: false,
@@ -132,7 +132,7 @@
};
//鍒犻櫎
export const Delete = async (Tool_Id: string) => {
- const usParams = genAction('SMT_FEEDER_HIS', `ID='${Tool_Id}'`)
+ const usParams = genAction('SMT_FEEDER_TYPE', `ID='${Tool_Id}'`)
return await defHttp.post(
{ url: Api.DeleteWhere, params: usParams },
{
diff --git a/src/views/tigerprojects/mes/smt/feeder/feeder/index.vue b/src/views/tigerprojects/mes/smt/feeder/feeder/index.vue
index 7da011c..664e1ca 100644
--- a/src/views/tigerprojects/mes/smt/feeder/feeder/index.vue
+++ b/src/views/tigerprojects/mes/smt/feeder/feeder/index.vue
@@ -88,7 +88,7 @@
'椋炶揪绫诲瀷': element.FEEDER_TYPE,
'鏈�澶т娇鐢ㄦ鏁�': element.MAX_COUNT,
'棰勮浣跨敤娆℃暟': element.ALERT_COUNT,
- '褰撳墠浣跨敤娆℃暟': element.USE_COUNT,
+ '宸蹭娇鐢ㄦ鏁�': element.USED_COUNT,
'鏄惁浣跨敤涓�': element.IS_USE,
'鏄惁鎵撳嵃': element.IS_PRINT,
'宸ュ崟鍙�': element.WORK_ORDER,
diff --git a/src/views/tigerprojects/mes/smt/feeder/feeder/smt_feeder.data.ts b/src/views/tigerprojects/mes/smt/feeder/feeder/smt_feeder.data.ts
index bd58422..72ab68f 100644
--- a/src/views/tigerprojects/mes/smt/feeder/feeder/smt_feeder.data.ts
+++ b/src/views/tigerprojects/mes/smt/feeder/feeder/smt_feeder.data.ts
@@ -84,8 +84,8 @@
resizable:true
},
{
- title: '褰撳墠浣跨敤娆℃暟',
- dataIndex: 'USE_COUNT',
+ title: '宸蹭娇鐢ㄦ鏁�',
+ dataIndex: 'USED_COUNT',
width:100,
sorter: true,
resizable:true
@@ -231,7 +231,7 @@
},
{
label: '褰撳墠浣跨敤娆℃暟',
- field: 'USE_COUNT',
+ field: 'USED_COUNT',
required: true,
colProps: { span: 8 },
component: 'Input',
@@ -315,8 +315,22 @@
label: '鍔犲伐闈�',
field: 'PCB_SURFACE',
required: true,
+ component: 'Select',
colProps: { span: 8 },
- component: 'Input',
+ componentProps: {
+ options: [
+ {
+ label: 'A闈�',
+ value: 'A闈�',
+ key: 'A闈�',
+ },
+ {
+ label: 'B闈�',
+ value: 'B闈�',
+ key: 'B闈�',
+ },
+ ],
+ },
}
,
{
diff --git a/src/views/tigerprojects/mes/smt/feeder/feeder_type/index.vue b/src/views/tigerprojects/mes/smt/feeder/feeder_type/index.vue
index fd1a6a0..ba7e85a 100644
--- a/src/views/tigerprojects/mes/smt/feeder/feeder_type/index.vue
+++ b/src/views/tigerprojects/mes/smt/feeder/feeder_type/index.vue
@@ -83,8 +83,8 @@
getListByPage(col).then((res) => {
res.items.forEach(element => {
arr.push({
- '椋炶揪缂栫爜': element.FEEDER_CODE,
- '椋炶揪鍚嶇О': element.FEEDER_NAME,
+ '椋炶揪绫诲瀷缂栫爜': element.TYPE_CODE,
+ '椋炶揪绫诲瀷鍚嶇О': element.TYPE_NAME,
'澶囨敞': element.REMARK,
'鍒涘缓浜�': element.CREATE_USER,
'鍒涘缓鏃堕棿': element.CREATE_TIME,
@@ -133,7 +133,7 @@
}
//鎶ュ簾
function handleBao(record: any) {
- const apiAction = SaveTool(record, unref(true), true);
+ const apiAction = Save(record, unref(true), true);
apiAction.then((action) => {
if (action.IsSuccessed) {
createMessage.success(t('宸叉姤搴�'));
@@ -145,7 +145,7 @@
}
//鍒犻櫎
function handleDelete(record: any) {
- const apiAction = DeleteTool(record.ID);
+ const apiAction = Delete(record.ID);
apiAction.then((action) => {
if (action.IsSuccessed) {
createMessage.success(t('宸插垹闄�'));
diff --git a/src/views/tigerprojects/mes/smt/feeder/feeder_type/smt_feeder_type.data.ts b/src/views/tigerprojects/mes/smt/feeder/feeder_type/smt_feeder_type.data.ts
index d3b7581..6dbbc7b 100644
--- a/src/views/tigerprojects/mes/smt/feeder/feeder_type/smt_feeder_type.data.ts
+++ b/src/views/tigerprojects/mes/smt/feeder/feeder_type/smt_feeder_type.data.ts
@@ -9,15 +9,15 @@
export const columns: BasicColumn[] = [
{
- title: '椋炶揪缂栫爜',
- dataIndex: 'FEEDER_CODE',
+ title: '椋炶揪绫诲瀷缂栫爜',
+ dataIndex: 'TYPE_CODE',
width:200,
sorter: true,
resizable:true
},
{
- title: '椋炶揪鍚嶇О',
- dataIndex: 'FEEDER_NAME',
+ title: '椋炶揪绫诲瀷鍚嶇О',
+ dataIndex: 'TYPE_NAME',
width: 100,
sorter: true,
resizable:true
@@ -65,22 +65,15 @@
show: false,
},
{
- label: '椋炶揪缂栫爜',
- field: 'FEEDER_CODE',
+ label: '椋炶揪绫诲瀷缂栫爜',
+ field: 'TYPE_CODE',
required: true,
colProps: { span: 8 },
component: 'Input',
},
{
- label: '椋炶揪鍚嶇О',
- field: 'FEEDER_NAME',
- required: true,
- colProps: { span: 8 },
- component: 'Input',
- },
- {
- label: '椋炶揪绫诲瀷',
- field: 'FEEDER_TYPE',
+ label: '椋炶揪绫诲瀷鍚嶇О',
+ field: 'TYPE_NAME',
required: true,
colProps: { span: 8 },
component: 'Input',
--
Gitblit v1.9.3