hanst
/
wms-pda
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

样式调整

master
shenzhouyu 6 months ago
parent
5333ddbed0
commit
7b16adb77c
3 changed files with 67 additions and 148 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      src/views/modules/production-inbound/index.vue
  2. 69
      src/views/modules/production-issue/production-issue-pda.vue
  3. 69
      src/views/modules/production-issue/productionReturnPDA.vue

77
src/views/modules/production-inbound/index.vue
View File

@ -2,8 +2,8 @@
<div> <div>
<div class="pda-container"> <div class="pda-container">
<div class="status-bar"> <div class="status-bar">
<div class="goBack" @click="$router.back()"><i class="el-icon-arrow-left"></i>上一页</div>
<div class="goBack">生产入库</div>
<div class="goBack" @click="goBack"><i class="el-icon-arrow-left"></i>上一页</div>
<div class="goBack">{{ functionTitle }}</div>
<div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div> <div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div>
</div> </div>
<div style="overflow-y: auto"> <div style="overflow-y: auto">
@ -36,11 +36,6 @@
<!-- 包装创建 --> <!-- 包装创建 -->
<div class="package-create" v-if="selectedFunction === 'package'"> <div class="package-create" v-if="selectedFunction === 'package'">
<div class="pda-header">
<button class="back-btn" @click="goBack">← 返回</button>
<h2>包装创建</h2>
</div>
<!-- 通知单输入 --> <!-- 通知单输入 -->
<div class="input-section" v-if="!notifyInfo.notifyNo"> <div class="input-section" v-if="!notifyInfo.notifyNo">
<div class="input-group"> <div class="input-group">
@ -146,11 +141,6 @@
<!-- 装托盘 --> <!-- 装托盘 -->
<div class="pallet-pack" v-if="selectedFunction === 'pallet'"> <div class="pallet-pack" v-if="selectedFunction === 'pallet'">
<div class="pda-header">
<button class="back-btn" @click="goBack">← 返回</button>
<h2>装托盘</h2>
</div>
<!-- 托盘输入 --> <!-- 托盘输入 -->
<div class="input-section"> <div class="input-section">
<div class="input-group"> <div class="input-group">
@ -209,11 +199,6 @@
<!-- 入库登记 --> <!-- 入库登记 -->
<div class="inbound-register" v-if="selectedFunction === 'register'"> <div class="inbound-register" v-if="selectedFunction === 'register'">
<div class="pda-header">
<button class="back-btn" @click="goBack">← 返回</button>
<h2>入库登记</h2>
</div>
<!-- 通知单输入 --> <!-- 通知单输入 -->
<div class="input-section" v-if="!registerForm.notifyNo"> <div class="input-section" v-if="!registerForm.notifyNo">
<div class="input-group"> <div class="input-group">
@ -281,11 +266,6 @@
<!-- 退库操作 --> <!-- 退库操作 -->
<div class="return-operation" v-if="selectedFunction === 'return'"> <div class="return-operation" v-if="selectedFunction === 'return'">
<div class="pda-header">
<button class="back-btn" @click="goBack">← 返回</button>
<h2>退库操作</h2>
</div>
<!-- 通知单输入 --> <!-- 通知单输入 -->
<div class="input-section" v-if="!returnForm.notifyNo"> <div class="input-section" v-if="!returnForm.notifyNo">
<div class="input-group"> <div class="input-group">
@ -479,6 +459,16 @@ export default {
scannedUnits: [] scannedUnits: []
} }
}, },
computed: {
functionTitle() {
if (!this.selectedFunction) return '生产入库';
if (this.selectedFunction === 'package') return '包装创建';
if (this.selectedFunction === 'pallet') return '装托盘';
if (this.selectedFunction === 'register') return '入库登记';
if (this.selectedFunction === 'return') return '退库操作';
return '生产入库';
}
},
methods: { methods: {
selectFunction(func) { selectFunction(func) {
this.selectedFunction = func this.selectedFunction = func
@ -486,8 +476,12 @@ export default {
}, },
goBack() { goBack() {
this.selectedFunction = null
this.resetAll()
if (!this.selectedFunction) {
this.$router.push('/')
} else {
this.selectedFunction = null
this.resetAll()
}
}, },
resetAll() { resetAll() {
@ -1033,31 +1027,6 @@ export default {
color: #666; color: #666;
} }
/* PDA头部 */
.pda-header {
display: flex;
align-items: center;
margin-bottom: 20px;
padding: 10px 0;
border-bottom: 2px solid #007bff;
}
.back-btn {
background: #6c757d;
color: white;
border: none;
padding: 8px 12px;
border-radius: 4px;
margin-right: 15px;
cursor: pointer;
}
.pda-header h2 {
margin: 0;
color: #007bff;
font-size: 20px;
}
/* 输入区域 */ /* 输入区域 */
.input-section, .notify-info, .scan-section, .records-section, .return-type-section { .input-section, .notify-info, .scan-section, .records-section, .return-type-section {
background: white; background: white;
@ -1082,8 +1051,8 @@ export default {
} }
.reset-btn { .reset-btn {
background: #ffc107;
color: #212529;
background: #17b3a3;
color: white;
border: none; border: none;
padding: 6px 12px; padding: 6px 12px;
border-radius: 4px; border-radius: 4px;
@ -1118,7 +1087,7 @@ export default {
} }
.scan-btn, .confirm-btn, .print-btn, .remove-btn { .scan-btn, .confirm-btn, .print-btn, .remove-btn {
background: #007bff;
background: #17b3a3;
color: white; color: white;
border: none; border: none;
padding: 10px 15px; padding: 10px 15px;
@ -1129,7 +1098,7 @@ export default {
} }
.scan-btn:hover, .confirm-btn:hover, .print-btn:hover { .scan-btn:hover, .confirm-btn:hover, .print-btn:hover {
background: #0056b3;
background: #13998c;
} }
.remove-btn { .remove-btn {
@ -1142,7 +1111,7 @@ export default {
background: #c82333; background: #c82333;
} }
.confirm-btn:disabled {
.confirm-btn:disabled, .print-btn:disabled {
background: #6c757d; background: #6c757d;
cursor: not-allowed; cursor: not-allowed;
} }

69
src/views/modules/production-issue/production-issue-pda.vue
View File

@ -2,8 +2,8 @@
<div> <div>
<div class="pda-container"> <div class="pda-container">
<div class="status-bar"> <div class="status-bar">
<div class="goBack" @click="$router.back()"><i class="el-icon-arrow-left"></i>上一页</div>
<div class="goBack">生产发料</div>
<div class="goBack" @click="goBack"><i class="el-icon-arrow-left"></i>上一页</div>
<div class="goBack">{{ functionTitle }}</div>
<div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div> <div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div>
</div> </div>
<div style="overflow-y: auto"> <div style="overflow-y: auto">
@ -30,11 +30,6 @@
<!-- 直接发料 --> <!-- 直接发料 -->
<div class="direct-issue" v-if="selectedFunction === 'direct'"> <div class="direct-issue" v-if="selectedFunction === 'direct'">
<div class="pda-header">
<button class="back-btn" @click="goBack">← 返回</button>
<h2>直接发料</h2>
</div>
<!-- 工单输入 --> <!-- 工单输入 -->
<div class="input-section" v-if="!workOrderMaterials.length"> <div class="input-section" v-if="!workOrderMaterials.length">
<div class="input-group"> <div class="input-group">
@ -148,11 +143,6 @@
<!-- 拣选装托盘 --> <!-- 拣选装托盘 -->
<div class="picking-pallet" v-if="selectedFunction === 'picking'"> <div class="picking-pallet" v-if="selectedFunction === 'picking'">
<div class="pda-header">
<button class="back-btn" @click="goBack">← 返回</button>
<h2>拣选装托盘</h2>
</div>
<!-- 申请单输入 --> <!-- 申请单输入 -->
<div class="input-section" v-if="!currentPallet.palletId"> <div class="input-section" v-if="!currentPallet.palletId">
<div class="input-group"> <div class="input-group">
@ -236,11 +226,6 @@
<!-- 申请单发料 --> <!-- 申请单发料 -->
<div class="request-issue" v-if="selectedFunction === 'request'"> <div class="request-issue" v-if="selectedFunction === 'request'">
<div class="pda-header">
<button class="back-btn" @click="goBack">← 返回</button>
<h2>申请单发料</h2>
</div>
<!-- 申请单输入 --> <!-- 申请单输入 -->
<div class="input-section" v-if="!requestMaterials.length"> <div class="input-section" v-if="!requestMaterials.length">
<div class="input-group"> <div class="input-group">
@ -430,6 +415,15 @@ export default {
issueQty: null issueQty: null
} }
}, },
computed: {
functionTitle() {
if (!this.selectedFunction) return '生产发料';
if (this.selectedFunction === 'direct') return '直接发料';
if (this.selectedFunction === 'picking') return '拣选装托盘';
if (this.selectedFunction === 'request') return '申请单发料';
return '生产发料';
}
},
methods: { methods: {
selectFunction(func) { selectFunction(func) {
this.selectedFunction = func this.selectedFunction = func
@ -437,8 +431,12 @@ export default {
}, },
goBack() { goBack() {
this.selectedFunction = null
this.resetAll()
if (!this.selectedFunction) {
this.$router.push('/')
} else {
this.selectedFunction = null
this.resetAll()
}
}, },
resetAll() { resetAll() {
@ -827,31 +825,6 @@ export default {
color: #666; color: #666;
} }
/* PDA头部 */
.pda-header {
display: flex;
align-items: center;
margin-bottom: 20px;
padding: 10px 0;
border-bottom: 2px solid #007bff;
}
.back-btn {
background: #6c757d;
color: white;
border: none;
padding: 8px 12px;
border-radius: 4px;
margin-right: 15px;
cursor: pointer;
}
.pda-header h2 {
margin: 0;
color: #007bff;
font-size: 20px;
}
/* 输入区域 */ /* 输入区域 */
.input-section, .materials-section, .scan-section, .pallet-info, .print-section { .input-section, .materials-section, .scan-section, .pallet-info, .print-section {
background: white; background: white;
@ -876,8 +849,8 @@ export default {
} }
.reset-btn { .reset-btn {
background: #ffc107;
color: #212529;
background: #17b3a3;
color: white;
border: none; border: none;
padding: 6px 12px; padding: 6px 12px;
border-radius: 4px; border-radius: 4px;
@ -910,7 +883,7 @@ export default {
} }
.scan-btn, .confirm-btn, .print-btn { .scan-btn, .confirm-btn, .print-btn {
background: #007bff;
background: #17b3a3;
color: white; color: white;
border: none; border: none;
padding: 10px 15px; padding: 10px 15px;
@ -921,7 +894,7 @@ export default {
} }
.scan-btn:hover, .confirm-btn:hover, .print-btn:hover { .scan-btn:hover, .confirm-btn:hover, .print-btn:hover {
background: #0056b3;
background: #13998c;
} }
.confirm-btn:disabled, .print-btn:disabled { .confirm-btn:disabled, .print-btn:disabled {

69
src/views/modules/production-issue/productionReturnPDA.vue
View File

@ -2,8 +2,8 @@
<div> <div>
<div class="pda-container"> <div class="pda-container">
<div class="status-bar"> <div class="status-bar">
<div class="goBack" @click="$router.back()"><i class="el-icon-arrow-left"></i>上一页</div>
<div class="goBack">生产订单退料</div>
<div class="goBack" @click="goBack"><i class="el-icon-arrow-left"></i>上一页</div>
<div class="goBack">{{ functionTitle }}</div>
<div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div> <div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div>
</div> </div>
<div style="overflow-y: auto"> <div style="overflow-y: auto">
@ -24,11 +24,6 @@
<!-- 直接退料 --> <!-- 直接退料 -->
<div class="direct-return" v-if="selectedFunction === 'direct'"> <div class="direct-return" v-if="selectedFunction === 'direct'">
<div class="pda-header">
<button class="back-btn" @click="goBack">← 返回</button>
<h2>直接退料</h2>
</div>
<!-- 工单输入 --> <!-- 工单输入 -->
<div class="input-section" v-if="!workOrderMaterials.length"> <div class="input-section" v-if="!workOrderMaterials.length">
<div class="input-group"> <div class="input-group">
@ -197,11 +192,6 @@
<!-- 基于申请单退料 --> <!-- 基于申请单退料 -->
<div class="request-return" v-if="selectedFunction === 'request'"> <div class="request-return" v-if="selectedFunction === 'request'">
<div class="pda-header">
<button class="back-btn" @click="goBack">← 返回</button>
<h2>基于申请单退料</h2>
</div>
<!-- 申请单输入 --> <!-- 申请单输入 -->
<div class="input-section" v-if="!returnRequestMaterials.length"> <div class="input-section" v-if="!returnRequestMaterials.length">
<div class="input-group"> <div class="input-group">
@ -427,6 +417,14 @@ export default {
returnQty: null returnQty: null
} }
}, },
computed: {
functionTitle() {
if (!this.selectedFunction) return '生产订单退料';
if (this.selectedFunction === 'direct') return '直接退料';
if (this.selectedFunction === 'request') return '基于申请单退料';
return '生产订单退料';
}
},
methods: { methods: {
selectFunction(func) { selectFunction(func) {
this.selectedFunction = func this.selectedFunction = func
@ -434,8 +432,12 @@ export default {
}, },
goBack() { goBack() {
this.selectedFunction = null
this.resetAll()
if (!this.selectedFunction) {
this.$router.push('/')
} else {
this.selectedFunction = null
this.resetAll()
}
}, },
resetAll() { resetAll() {
@ -839,31 +841,6 @@ export default {
color: #666; color: #666;
} }
/* PDA头部 */
.pda-header {
display: flex;
align-items: center;
margin-bottom: 20px;
padding: 10px 0;
border-bottom: 2px solid #dc3545;
}
.back-btn {
background: #6c757d;
color: white;
border: none;
padding: 8px 12px;
border-radius: 4px;
margin-right: 15px;
cursor: pointer;
}
.pda-header h2 {
margin: 0;
color: #dc3545;
font-size: 20px;
}
/* 输入区域 */ /* 输入区域 */
.input-section, .materials-section, .scan-section, .issue-records-section, .return-input-section { .input-section, .materials-section, .scan-section, .issue-records-section, .return-input-section {
background: white; background: white;
@ -888,8 +865,8 @@ export default {
} }
.reset-btn { .reset-btn {
background: #ffc107;
color: #212529;
background: #17b3a3;
color: white;
border: none; border: none;
padding: 6px 12px; padding: 6px 12px;
border-radius: 4px; border-radius: 4px;
@ -921,8 +898,8 @@ export default {
font-size: 16px; font-size: 16px;
} }
.scan-btn, .confirm-btn {
background: #dc3545;
.scan-btn, .confirm-btn, .print-btn {
background: #17b3a3;
color: white; color: white;
border: none; border: none;
padding: 10px 15px; padding: 10px 15px;
@ -932,11 +909,11 @@ export default {
white-space: nowrap; white-space: nowrap;
} }
.scan-btn:hover, .confirm-btn:hover {
background: #c82333;
.scan-btn:hover, .confirm-btn:hover, .print-btn:hover {
background: #13998c;
} }
.confirm-btn:disabled {
.confirm-btn:disabled, .print-btn:disabled {
background: #6c757d; background: #6c757d;
cursor: not-allowed; cursor: not-allowed;
} }

Write Preview
Loading…
Cancel
Save