diff --git a/common/style/layout.styl b/common/style/layout.styl
index 7c4ddc2..8cea0e1 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -606,4 +606,7 @@ uni-button[disabled]:not([type]) {
width: 100%;
border-radius: 20rpx;
background-color: #fff;
+}
+.down_icon {
+ text-align: center;
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index c8eb0db..e2eb46d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "海亮铜箔",
"appid" : "__UNI__3A002CD",
"description" : "海亮铜箔二期手持系统",
- "versionName" : "1.3.6",
- "versionCode" : 136,
+ "versionName" : "1.3.7",
+ "versionCode" : 137,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 261bc32..8889165 100644
--- a/pages.json
+++ b/pages.json
@@ -703,6 +703,14 @@
}
}
+ ,{
+ "path" : "pages/SecondPhase/slitting/CallAxis",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/point/ManPass.vue b/pages/SecondPhase/point/ManPass.vue
index 604d153..d6dc39f 100644
--- a/pages/SecondPhase/point/ManPass.vue
+++ b/pages/SecondPhase/point/ManPass.vue
@@ -13,9 +13,10 @@
-
-
-
+
+
+
+
@@ -31,7 +32,8 @@
\ No newline at end of file
diff --git a/utils/getData3.js b/utils/getData3.js
index 894e1dc..6a7ff79 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -260,6 +260,10 @@ export const queryContainerNameBySaleOrder = (code) => request({
url:'api/pdmBiSubpackagerelation/queryContainerNameBySaleOrder',
data: {type: '1', container_name: code}
})
+export const getSameBoxList = (code) => request({
+ url:'api/samebox/getSameBoxList',
+ data: {box_code: code}
+})
export const queryBoxSpec = (code) => request({
method: 'GET',
url:'api/pdmBiSubpackagerelation/queryBoxSpec',
@@ -287,6 +291,10 @@ export const outPointPass = (code) => request({
url:'api/twoPda/st/outPointPass',
data: {point_code: code}
})
+export const outExcepionPointPass = (code) => request({
+ url:'api/twoPda/st/outExcepionPointPass',
+ data: {point_code: code}
+})
/**
* 打印
@@ -568,4 +576,15 @@ export const updatePackagePoint = (ivt, code) => request({
export const cutCacheInventory = (code, type) => request({
url:'/api/pda/slitter/cutCacheInventory',
data: {point_code: code, type: type}
+})
+/**
+ * 呼叫套轴
+ */
+export const doCallTubeShaftShow = (code) => request({
+ url:'api/pda/slitter/doCallTubeShaftShow',
+ data: {device_code: code}
+})
+export const doCallTubeShaft = (code, row) => request({
+ url:'api/pda/slitter/doCallTubeShaft',
+ data: {device_code: code, row: row}
})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 7e52eec..38a89dc 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -110,6 +110,7 @@ export const allAuthority = () => {
{menu_id: '8', title: '空轴绑定', path: '/pages/SecondPhase/slitting/EmptyAxisBind'},
{menu_id: '8', title: '空轴退回', path: '/pages/SecondPhase/slitting/EmptyAxisReturn'},
{menu_id: '8', title: '分切暂存维护', path: '/pages/SecondPhase/slitting/CacheSave'},
+ {menu_id: '8', title: '呼叫套轴', path: '/pages/SecondPhase/slitting/CallAxis'}
]},
{menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [
{menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'},
@@ -210,6 +211,10 @@ export const queryContainerNameBySaleOrder = () => {
}
return res
}
+export const getSameBoxList = () => {
+ let res = [{text: '物料一', value: '001'}, {text: '物料a', value: '002'}, {text: '物料b', value: '003'}]
+ return res
+}
export const queryBoxSpec = () => {
let res = {
"totalElements": 1,
@@ -281,4 +286,8 @@ export const twoQueryBoxIvt = (code) => {
export const showManualView = (code) => {
let res = [{resource_name: 'B60FQ00003', up_or_down: '1', qzz_size: '6', status: '01', qzz_generation: '5', start_time: '2025-03-11 15:24:26'}]
return res
+}
+export const doCallTubeShaftShow = () => {
+ let res = [{"workorder_id":"1850909252072378369","resource_name":"B50FQ00001","container_name":"BB3X2410280807A2","parent_container_name":"BB3X24102809","split_group":"A","up_or_down":"2","status":"0","qzz_size":"6","tube":"玻璃纤维及其制品|FRP管|6英寸|15|1700|阶梯","qzz_generation":"4","start_time":"","is_paper_ok":"1","qzzno":"","manufacture_sort":"P1"}]
+ return res
}
\ No newline at end of file
diff --git a/utils/utils.js b/utils/utils.js
new file mode 100644
index 0000000..d9f7049
--- /dev/null
+++ b/utils/utils.js
@@ -0,0 +1,19 @@
+export function confirmAction(title = "确认操作", content = "确定要执行此操作吗？", confirmCallback) {
+ return new Promise((resolve, reject) => {
+ uni.showModal({
+ title: title,
+ content: content,
+ showCancel: true,
+ success: (res) => {
+ if (res.confirm) {
+ resolve(true); // 调用确认回调
+ if (confirmCallback) {
+ confirmCallback();
+ }
+ } else if (res.cancel) {
+ resolve(false);
+ }
+ }
+ });
+ });
+}
\ No newline at end of file