root/hht-ftdl-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jp

Browse Source
This commit is contained in:
xiangxy
2025-09-26 15:22:04 +08:00
parent efc5313f80
commit 9d9f3bd270
23 changed files with 684 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/style/layout.styl
View File

@@ -537,4 +537,11 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
} }
.mini-btn { .mini-btn {
margin-right: 0; margin-right: 0;
}
.ftsize1 {
font-size 20rpx
background #fff
border-color #ff6a00
color #ff6a00
margin-top: 10rpx
} }

3
common/style/mixin.styl
View File

@@ -1,4 +1,7 @@
$red = #ff6a00 $red = #ff6a00
$red1 = #ff6800
$red2 = #ff9856
$red3 = #ff6a00
$green = #6CBE8B $green = #6CBE8B
$yellow = #E9B451 $yellow = #E9B451
$blue = #6798ef $blue = #6798ef

59
locale/en.json
View File

@@ -8,6 +8,20 @@
"button.cancel": "取消", "button.cancel": "取消",
"button.clear": "清空", "button.clear": "清空",
"button.search": "查询", "button.search": "查询",
"button.confirm-quhuo": "确认取货",
"button.scan-add": "扫码插入",
"button.add-row": "插入行",
"button.del-row": "删除行",
"button.copy-row": "复制行",
"button.material-bind": "物料绑定",
"button.empty-vehicle-bind": "空载具绑定",
"button.lock": "锁定",
"button.unlock": "解锁",
"button.confirm-down-material": "确认下料",
"button.reissue": "重新下发",
"button.force-complete": "强制完成",
"button.enter": "进入",
"button.quit": "退出",
"login.username": "用户名", "login.username": "用户名",
"login.password": "密码", "login.password": "密码",
"login.remember": "记住用户名", "login.remember": "记住用户名",
@@ -15,26 +29,61 @@
"login.upgrade": "升级版本", "login.upgrade": "升级版本",
"login.login": "登录", "login.login": "登录",
"login.text1": "欢迎来到", "login.text1": "欢迎来到",
"login.text2": "海亮铜箔手持系统！", "login.text2": "东丽WMS手持系统！",
"setting.language": "语言", "setting.language": "语言",
"setting.server": "服务器地址", "setting.server": "服务器地址",
"setting.refresh": "刷新时间", "setting.refresh": "刷新时间",
"setting.customer-label-printing": "客户标签打印", "setting.customer-label-printing": "客户标签打印",
"setting.language-change-confirm": "应用此设置将重启App", "setting.language-change-confirm": "应用此设置将重启App",
"upgrade.new-version": "发现新版本", "upgrade.new-version": "发现新版本",
"upgrade.text1": "海亮铜箔又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！", "upgrade.text1": "又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！",
"upgrade.text2": "安装包下载中，请稍后", "upgrade.text2": "安装包下载中，请稍后",
"upgrade.upgrade-now": "立即升级", "upgrade.upgrade-now": "立即升级",
"home.title": "首页", "home.title": "首页",
"home.message": "欢迎进入铜箔手持系统！", "home.message": "欢迎进入东丽WMS手持系统！",
"home.exit": "退出", "home.exit": "退出",
"menu.production-management": "生产管理", "menu.kw-management": "库位管理",
"menu.man-get-goods": "人工取货",
"menu.man-load-goods": "人工放货",
"menu.kc-manage": "库存锁定/解锁",
"menu.line-management": "产线管理",
"menu.line-call-mater": "产线叫料",
"menu.line-down-mater": "产线下料",
"menu.task-management": "任务管理",
"menu.work-manage": "作业管理",
"menu.fixedpoint-work": "定点作业",
"menu.inout-area-mark": "进出区域登记",
"filter.area": "区域", "filter.area": "区域",
"filter.point": "点位", "filter.point": "点位",
"filter.quantity": "数量",
"filter.type": "类型", "filter.type": "类型",
"filter.material": "物料",
"filter.wltype": "物料类型",
"filter.material-use-number": "用料数量",
"filter.callmater-pallet-number": "叫料托盘数",
"filter.send-area": "送往区域",
"filter.vehicle-code": "载具编码",
"filter.start-point": "起点",
"filter.end-point": "终点",
"filter.start-area": "起点区域",
"filter.end-area": "终点区域",
"filter.control-area": "管制区域",
"grid.number": "序号", "grid.number": "序号",
"grid.roll-number": "卷号",
"grid.material-code": "物料编码",
"grid.material-name": "物料名称",
"grid.quantity": "数量",
"grid.unit": "单位",
"grid.status": "状态",
"grid.point": "点位",
"grid.select": "选择", "grid.select": "选择",
"grid.task-number": "任务号",
"grid.start-point": "起点",
"grid.end-point": "终点",
"grid.vehicle-code": "载具号",
"grid.enter-time": "进入时间",
"grid.enter-man": "进入人",
"grid.enter-area": "进入区域",
"filter.wltype": "Material Type",
"toast.select-row": "请选择一行", "toast.select-row": "请选择一行",
"toast.device-not-empty": "设备不能为空", "toast.device-not-empty": "设备不能为空",
"toast.material-not-empty": "物料不能为空", "toast.material-not-empty": "物料不能为空",

13
locale/index.js
View File

@@ -1,11 +1,16 @@
import en from './en.json' import en from './en.json'
import zhHans from './zh-Hans.json' import zhHans from './zh-Hans.json'
import id from './id.json' import jp from './jp.json'
// const messages = {
// 'en': Object.assign(en, en1),
// 'zh-Hans': Object.assign(zhHans, zhHans1),
// 'jp': Object.assign(jp, jp1)
// }
const messages = { const messages = {
'en': Object.assign(en, en1), 'en': en,
'zh-Hans': Object.assign(zhHans, zhHans1), 'zh-Hans': zhHans,
'id': Object.assign(id, id1) 'jp': jp
} }
let i18nConfig = { let i18nConfig = {

133
locale/jp.json
View File

@@ -1,45 +1,94 @@
{ {
"utils.loading": "加载中...", "utils.loading": "ロード中..",
"uni.dataSelect.placeholder": "请选择", "uni.dataSelect.placeholder": "選択してください",
"uni.dataSelect.emptyTips": "无选项", "uni.dataSelect.emptyTips": "オプションなし",
"utils.read-more": "查看更多", "utils.read-more": "詳細を表示",
"utils.no-more": "没有更多", "utils.no-more": "これ以上ない",
"button.confirm": "确定", "button.confirm": "を選択して、",
"button.cancel": "取消", "button.cancel": "キャンセル",
"button.clear": "清空", "button.clear": "クリアランス",
"button.search": "查询", "button.search": "クエリー＃クエリー＃",
"login.username": "用户名", "button.confirm-quhuo": "引取確認",
"login.password": "密码", "button.scan-add": "スイープコード挿入",
"login.remember": "记住用户名", "button.add-row": "行の挿入",
"login.settings": "设置", "button.del-row": "行の削除",
"login.upgrade": "升级版本", "button.copy-row": "行のコピー",
"login.login": "登录", "button.material-bind": "品目バインディング",
"login.text1": "欢迎来到", "button.empty-vehicle-bind": "ダミーバインド",
"login.text2": "海亮铜箔手持系统！", "button.lock": "ロック＃ロック＃",
"setting.language": "语言", "button.unlock": "ロック解除",
"setting.server": "服务器地址", "button.confirm-down-material": "原料投入の確認",
"setting.refresh": "刷新时间", "button.reissue": "再送",
"setting.customer-label-printing": "客户标签打印", "button.force-complete": "強制完了",
"setting.language-change-confirm": "应用此设置将重启App", "button.enter": "に入る",
"upgrade.new-version": "发现新版本", "button.quit": "終了",
"upgrade.text1": "海亮铜箔又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！", "login.username": "ユーザー名",
"upgrade.text2": "安装包下载中，请稍后", "login.password": "パスワード",
"upgrade.upgrade-now": "立即升级", "login.remember": "ユーザー名を記憶する",
"home.title": "首页", "login.settings": "設定＃セッテイ＃",
"home.message": "欢迎进入铜箔手持系统！", "login.upgrade": "バージョンのアップグレード",
"home.exit": "退出", "login.login": "ログイン＃ログイン＃",
"menu.production-management": "生产管理", "login.text1": "ようこそ",
"filter.area": "区域", "login.text2": "東レのWSSハンドヘルドシステム！",
"filter.point": "点位", "setting.language": "言語",
"filter.quantity": "数量", "setting.server": "サーバアドレス",
"filter.type": "类型", "setting.refresh": "リフレッシュ時間",
"grid.number": "序号", "setting.customer-label-printing": "顧客ラベル印刷",
"grid.select": "选择", "setting.language-change-confirm": "この設定を適用するとAppが再起動されます",
"toast.select-row": "请选择一行", "upgrade.new-version": "新しいバージョンの検出",
"toast.device-not-empty": "设备不能为空", "upgrade.text1": "また新しいバージョンがあり、最新バージョンにアップグレードして、より豊富で安定した、迅速な機能と体験を楽しむことができます！",
"toast.material-not-empty": "物料不能为空", "upgrade.text2": "インストールパッケージのダウンロード中、しばらくお待ちください",
"toast.quantity-not-empty": "数量不能为空", "upgrade.upgrade-now": "今すぐアップグレード",
"toast.scan-wooden-box-code": "请扫木箱码", "home.title": "トップページ",
"select.coaster": "小托盘", "home.message": "東レのWSSハンドヘルドシステムへようこそ！",
"home.exit": "終了",
"menu.kw-management": "ライブラリビット管理",
"menu.man-get-goods": "手動による集荷",
"menu.man-load-goods": "手動で荷を下ろす",
"menu.kc-manage": "在庫ロック/ロック解除",
"menu.line-management": "生産ライン管理",
"menu.line-call-mater": "ラインフィード",
"menu.line-down-mater": "ラインダウン",
"menu.task-management": "タスク管理",
"menu.work-manage": "ジョブ管理",
"menu.fixedpoint-work": "ポインティングジョブ",
"menu.inout-area-mark": "入退場区域登録",
"filter.area": "領域",
"filter.point": "ポイント",
"filter.type": "を選択してオプションを設定します。",
"filter.material": "品目",
"filter.wltype": "品目タイプ",
"filter.material-use-number": "材料使用量",
"filter.callmater-pallet-number": "フィードトレイ数",
"filter.send-area": "搬送エリア",
"filter.vehicle-code": "キャリアコード",
"filter.start-point": "開始点",
"filter.end-point": "終点",
"filter.start-area": "始点領域",
"filter.end-area": "終点領域",
"filter.control-area": "管制区域",
"grid.number": "シーケンス番号",
"grid.roll-number": "ボリューム番号",
"grid.material-code": "品目コード",
"grid.material-name": "品目名",
"grid.quantity": "数量",
"grid.unit": "単位",
"grid.status": "ステータス",
"grid.point": "ポイント",
"grid.select": "せんたく",
"grid.task-number": "タスク番号",
"grid.start-point": "開始点",
"grid.end-point": "終点",
"grid.vehicle-code": "キャリア番号",
"grid.enter-time": "にゅうりょくじかん",
"grid.enter-man": "入場者",
"grid.enter-area": "ゾーンに入る",
"grid.wltype": "品目タイプ",
"toast.select-row": "行を選択してください",
"toast.device-not-empty": "デバイスを空にすることはできません",
"toast.material-not-empty": "品目を空にすることはできません",
"toast.quantity-not-empty": "数量は空にできません",
"toast.scan-wooden-box-code": "木箱のコードを掃いてください",
"select.coaster": "ミニトレイ",
"unit.minute": "分" "unit.minute": "分"
} }

60
locale/uni-app.jp.json
View File

@@ -1,35 +1,35 @@
{ {
"common": { "common": {
"uni.app.quit": "Tekan lagi untuk keluar dari aplikasi", "uni.app.quit": "もう一度押すとアプリケーションを終了します",
"uni.async.error": "Sambungan ke timeout server, klik pada layar untuk mencoba lagi", "uni.async.error": "接続サーバーのタイムアウト、画面をクリックして再試行",
"uni.showActionSheet.cancel": "Batalkan", "uni.showActionSheet.cancel": "キャンセル",
"uni.showToast.unpaired": "Silakan perhatikan bahwa showToast dan hideToast harus dipasang untuk digunakan", "uni.showToast.unpaired": "showToastとhideToastはペアで使用する必要がありますので注意してください",
"uni.showLoading.unpaired": "Silakan perhatikan bahwa ShowLoading dan hideLoading harus dipasang untuk digunakan", "uni.showLoading.unpaired": "showLoadingとhideLoadingはペアで使用する必要がありますので注意してください",
"uni.showModal.cancel": "Batalkan", "uni.showModal.cancel": "キャンセル",
"uni.showModal.confirm": "OK", "uni.showModal.confirm": "を選択して、",
"uni.chooseImage.cancel": "Batalkan", "uni.chooseImage.cancel": "キャンセル",
"uni.chooseImage.sourceType.album": "Pilih dari album", "uni.chooseImage.sourceType.album": "アルバムから選択",
"uni.chooseImage.sourceType.camera": "Kamera", "uni.chooseImage.sourceType.camera": "撮影する",
"uni.chooseVideo.cancel": "Batalkan", "uni.chooseVideo.cancel": "キャンセル",
"uni.chooseVideo.sourceType.album": "Pilih dari album", "uni.chooseVideo.sourceType.album": "アルバムから選択",
"uni.chooseVideo.sourceType.camera": "Kamera", "uni.chooseVideo.sourceType.camera": "撮影する",
"uni.previewImage.cancel": "Batalkan", "uni.previewImage.cancel": "キャンセル",
"uni.previewImage.button.save": "Simpan Gambar", "uni.previewImage.button.save": "画像を保存",
"uni.previewImage.save.success": "Gambar yang disimpan dengan sukses ke album", "uni.previewImage.save.success": "アルバムへの画像の保存に成功しました",
"uni.previewImage.save.fail": "Tidak dapat menyimpan gambar ke album", "uni.previewImage.save.fail": "画像をアルバムに保存できませんでした",
"uni.setClipboardData.success": "Kandungan disalin", "uni.setClipboardData.success": "コンテンツがコピーされました",
"uni.scanCode.title": "Memindai kode", "uni.scanCode.title": "スイープコード",
"uni.scanCode.album": "Daftar Trek", "uni.scanCode.album": "アルバム冊",
"uni.scanCode.fail": "Pengenalan gagal", "uni.scanCode.fail": "認識に失敗しました",
"uni.scanCode.flash.on": "Sentuh dipecahkan", "uni.scanCode.flash.on": "そっと照らす",
"uni.scanCode.flash.off": "Tap untuk ditutup", "uni.scanCode.flash.off": "ワンタッチオフ",
"uni.startSoterAuthentication.authContent": "Pengenalan sidik jari...", "uni.startSoterAuthentication.authContent": "指紋認識中..",
"uni.picker.done": "Selesai", "uni.picker.done": "完了",
"uni.picker.cancel": "Batalkan", "uni.picker.cancel": "キャンセル",
"uni.video.danmu": "Percakapan peluru", "uni.video.danmu": "弾幕",
"uni.video.volume": "Volume", "uni.video.volume": "音量",
"uni.button.feedback.title": "Balasan masalah", "uni.button.feedback.title": "もんだいフィードバック",
"uni.button.feedback.send": "kirim" "uni.button.feedback.send": "送信"
}, },
"ios": {}, "ios": {},
"android": {} "android": {}

4
locale/zh-Hans.json
View File

@@ -10,7 +10,7 @@
"button.search": "查询", "button.search": "查询",
"button.confirm-quhuo": "确认取货", "button.confirm-quhuo": "确认取货",
"button.scan-add": "扫码插入", "button.scan-add": "扫码插入",
"button.scan-row": "插入行", "button.add-row": "插入行",
"button.del-row": "删除行", "button.del-row": "删除行",
"button.copy-row": "复制行", "button.copy-row": "复制行",
"button.material-bind": "物料绑定", "button.material-bind": "物料绑定",
@@ -57,6 +57,7 @@
"filter.point": "点位", "filter.point": "点位",
"filter.type": "类型", "filter.type": "类型",
"filter.material": "物料", "filter.material": "物料",
"filter.wltype": "物料类型",
"filter.material-use-number": "用料数量", "filter.material-use-number": "用料数量",
"filter.callmater-pallet-number": "叫料托盘数", "filter.callmater-pallet-number": "叫料托盘数",
"filter.send-area": "送往区域", "filter.send-area": "送往区域",
@@ -82,6 +83,7 @@
"grid.enter-time": "进入时间", "grid.enter-time": "进入时间",
"grid.enter-man": "进入人", "grid.enter-man": "进入人",
"grid.enter-area": "进入区域", "grid.enter-area": "进入区域",
"grid.wltype": "物料类型",
"toast.select-row": "请选择一行", "toast.select-row": "请选择一行",
"toast.device-not-empty": "设备不能为空", "toast.device-not-empty": "设备不能为空",
"toast.material-not-empty": "物料不能为空", "toast.material-not-empty": "物料不能为空",

2
main.js
View File

@@ -1,5 +1,6 @@
import App from './App' import App from './App'
import Vue from 'vue' import Vue from 'vue'
import i18n from './locale/index.js'
Vue.config.productionTip = false Vue.config.productionTip = false
App.mpType = 'app' App.mpType = 'app'
@@ -32,6 +33,7 @@ Vue.prototype.$getStatusText = function(statusMap, status) {
import store from '@/vuex/store.js' import store from '@/vuex/store.js'
const app = new Vue({ const app = new Vue({
i18n,
...App, ...App,
store store
}) })

8
pages.json
View File

@@ -11,13 +11,19 @@
"style": { "style": {
"navigationStyle": "custom" "navigationStyle": "custom"
} }
} }
,{ ,{
"path" : "pages/login/setup", "path" : "pages/login/setup",
"style": { "style": {
"navigationStyle": "custom" "navigationStyle": "custom"
} }
} }
,{
"path" : "pages/login/setup2",
"style": {
"navigationStyle": "custom"
}
}
,{ ,{
"path" : "pages/login/upgrade", "path" : "pages/login/upgrade",
"style": { "style": {

24
pages/ftdl/fixedpoint-work.vue
View File

@@ -6,41 +6,45 @@
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">起点区域</span> <!-- <span class="filter_label">起点区域</span> -->
<span class="filter_label">{{$t('filter.start-area')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select> <uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
</view> </view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">起点</span> <!-- <span class="filter_label">起点</span> -->
<span class="filter_label">{{$t('filter.start-point')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select> <uni-data-select v-model="index3" :localdata="options3" placeholder="" @change="selectChange3"></uni-data-select>
</view> </view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">终点区域</span> <!-- <span class="filter_label">终点区域</span> -->
<span class="filter_label">{{$t('filter.end-area')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select> <uni-data-select v-model="index2" :localdata="options2" placeholder="" @change="selectChange2"></uni-data-select>
</view> </view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">终点</span> <!-- <span class="filter_label">终点</span> -->
<span class="filter_label">{{$t('filter.end-point')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index4" :localdata="options4" @change="selectChange4"></uni-data-select> <uni-data-select v-model="index4" :localdata="options4" placeholder="" @change="selectChange4"></uni-data-select>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button> <button class="zd-col-8 button-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !index3 || !index4}" :disabled="disabled" @tap="_sendPointTask">确认</button> <button class="zd-col-15 button-primary" :class="{'button-info': !index3 || !index4}" :disabled="disabled" @tap="_sendPointTask">{{$t('button.confirm')}}</button>
</view> </view>
</view> </view>
</template> </template>

20
pages/ftdl/inout-area-mark.vue
View File

@@ -6,10 +6,11 @@
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">管制区域</span> <!-- <span class="filter_label">管制区域</span> -->
<span class="filter_label">{{$t('filter.control-area')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select> <uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
</view> </view>
</view> </view>
</view> </view>
@@ -18,10 +19,14 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th>序号</th> <!-- <th>序号</th>
<th>进入时间</th> <th>进入时间</th>
<th>进入人</th> <th>进入人</th>
<th>进入区域</th> <th>进入区域</th> -->
<th>{{$t('grid.number')}}</th>
<th>{{$t('grid.enter-time')}}</th>
<th>{{$t('grid.enter-man')}}</th>
<th>{{$t('grid.enter-area')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -38,9 +43,12 @@
<!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> --> <!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> -->
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-6 button-primary" @tap="searchList">查询</button> <!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_inArea">进入</button> <button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_inArea">进入</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_outArea">退出</button> <button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_outArea">退出</button> -->
<button class="zd-col-7 button-primary" @tap="searchList">{{$t('button.search')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_inArea">{{$t('button.enter')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_outArea">{{$t('button.quit')}}</button>
</view> </view>
</view> </view>
</template> </template>

30
pages/ftdl/kc-manage.vue
View File

@@ -6,15 +6,17 @@
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">区域</span> <!-- <span class="filter_label">区域</span> -->
<span class="filter_label">{{$t('filter.area')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select> <uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
</view> </view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">点位</span> <!-- <span class="filter_label">点位</span> -->
<span class="filter_label">{{$t('filter.point')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<search-box <search-box
@@ -24,7 +26,8 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">物料</span> <!-- <span class="filter_label">物料</span> -->
<span class="filter_label">{{$t('filter.material')}}</span>
</view> </view>
<view class="zd-col-17"> <view class="zd-col-17">
<input type="text" class="filter_input" v-model="currentData.material_name" @tap="toJump"> <input type="text" class="filter_input" v-model="currentData.material_name" @tap="toJump">
@@ -37,13 +40,20 @@
<thead> <thead>
<tr> <tr>
<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th> <th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
<th>状态</th> <!-- <th>状态</th>
<th>点位</th> <th>点位</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料名称</th>
<th>数量</th> <th>数量</th>
<th>单位</th> <th>单位</th>
<th>卷号</th> <th>卷号</th> -->
<th>{{$t('grid.status')}}</th>
<th>{{$t('grid.point')}}</th>
<th>{{$t('grid.material-code')}}</th>
<th>{{$t('grid.material-name')}}</th>
<th>{{$t('grid.quantity')}}</th>
<th>{{$t('grid.unit')}}</th>
<th>{{$t('grid.roll-number')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -64,10 +74,12 @@
<!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> --> <!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> -->
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<!-- <button class="zd-col-6 button-default" @tap="clearUp">清空</button> --> <!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button>
<button class="zd-col-6 button-primary" @tap="searchList">查询</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled" @tap="_lock">锁定</button> <button class="zd-col-8 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled" @tap="_lock">锁定</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled2" @tap="_unlock">解锁</button> <button class="zd-col-8 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled2" @tap="_unlock">解锁</button> -->
<button class="zd-col-8 button-primary" @tap="searchList">{{$t('button.search')}}</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled" @tap="_lock">{{$t('button.lock')}}</button>
<button class="zd-col-6 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled2" @tap="_unlock">{{$t('button.unlock')}}</button>
</view> </view>
</view> </view>
</template> </template>

24
pages/ftdl/line-call-mater.vue
View File

@@ -6,7 +6,8 @@
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-8"> <view class="zd-col-8">
<span class="filter_label">区域</span> <!-- <span class="filter_label">区域</span> -->
<span class="filter_label">{{$t('filter.area')}}</span>
</view> </view>
<view class="zd-col-16"> <view class="zd-col-16">
<search-box <search-box
@@ -17,15 +18,17 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">物料</span> <!-- <span class="filter_label">物料</span> -->
<span class="filter_label">{{$t('filter.material')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select> <uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
</view> </view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-6"> <view class="zd-col-6">
<span class="filter_label">用料数量</span> <!-- <span class="filter_label">用料数量</span> -->
<span class="filter_label">{{$t('filter.material-use-number')}}</span>
</view> </view>
<view class="zd-col-16"> <view class="zd-col-16">
<input type="number" v-model="val3" class="filter_input"> <input type="number" v-model="val3" class="filter_input">
@@ -33,18 +36,21 @@
<view class="zd-col-2"><span class="filter_unit">{{unit}}</span></view> <view class="zd-col-2"><span class="filter_unit">{{unit}}</span></view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-10">
<span class="filter_label">叫料托盘数</span> <!-- <span class="filter_label">叫料托盘数</span> -->
<span class="filter_label">{{$t('filter.callmater-pallet-number')}}</span>
</view> </view>
<view class="zd-col-17"> <view class="zd-col-14">
<input type="number" class="filter_input" v-model="val2"> <input type="number" class="filter_input" v-model="val2">
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button> <!-- <button class="zd-col-6 button-default" @tap="clearUp">清空</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_loading">确认</button> <button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_loading">确认</button> -->
<button class="zd-col-8 button-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-14 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_loading">{{$t('button.confirm')}}</button>
</view> </view>
</view> </view>
</template> </template>

43
pages/ftdl/line-down-mater.vue
View File

@@ -6,7 +6,8 @@
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">点位</span> <!-- <span class="filter_label">点位</span> -->
<span class="filter_label">{{$t('filter.point')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<search-box <search-box
@@ -15,28 +16,19 @@
</view> </view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-9">
<span class="filter_label">送往区域</span> <!-- <span class="filter_label">送往区域</span> -->
<span class="filter_label">{{$t('filter.send-area')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select> <uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
</view> </view>
</view> </view>
<view class="zd-row"> <view class="zd-row">
<!-- <view class="zd-col-1"> <button class="zd-col-6 button-primary ftsize1" @tap="toScanAdd">{{$t('button.scan-add')}}</button>
</view> --> <button class="zd-col-5 button-primary ftsize1" @tap="toAdd">{{$t('button.add-row')}}</button>
<view class="zd-col-6" style="width: 27%;"> <button class="zd-col-5 button-primary ftsize1" @tap="toDel">{{$t('button.del-row')}}</button>
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toScanAdd">扫码插入</button> <button class="zd-col-6 button-primary ftsize1" @tap="toCopy">{{$t('button.copy-row')}}</button>
</view>
<view class="zd-col-6" style="width: 22%;">
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toAdd">插入行</button>
</view>
<view class="zd-col-6" style="width: 22%;">
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toDel">删除行</button>
</view>
<view class="zd-col-6" style="width: 22%;">
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toCopy">复制行</button>
</view>
</view> </view>
</view> </view>
<view class="zd_wrapper grid-wraper"> <view class="zd_wrapper grid-wraper">
@@ -44,12 +36,18 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th>序号</th> <!-- <th>序号</th>
<th>卷号</th> <th>卷号</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料名称</th>
<th>数量</th> <th>数量</th>
<th>单位</th> <th>单位</th> -->
<th>{{$t('grid.number')}}</th>
<th>{{$t('grid.roll-number')}}</th>
<th>{{$t('grid.material-code')}}</th>
<th>{{$t('grid.material-name')}}</th>
<th>{{$t('grid.quantity')}}</th>
<th>{{$t('grid.unit')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -67,9 +65,8 @@
</view> </view>
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<!-- <button class="zd-col-6 button-default" @tap="clearUp">清空</button> --> <!-- <button class="zd-col-22 button-primary" :class="{'button-info': !val1 || !dataList.length || !index}" :disabled="disabled" @tap="_blanking">确认下料</button> -->
<!-- <button class="zd-col-11 button-primary" :class="{'button-info': !val1 || !dataList.length || !index}" :disabled="disabled" @tap="_blanking">确认下料</button> --> <button class="zd-col-22 button-primary" :class="{'button-info': !val1 || !dataList.length || !index}" :disabled="disabled" @tap="_blanking">{{$t('button.confirm-down-material')}}</button>
<button class="zd-col-22 button-primary" :class="{'button-info': !val1 || !dataList.length || !index}" :disabled="disabled" @tap="_blanking">确认下料</button>
</view> </view>
</view> </view>
</template> </template>

20
pages/ftdl/man-get-goods.vue
View File

@@ -6,7 +6,8 @@
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">点位</span> <!-- <span class="filter_label">点位</span> -->
<span class="filter_label">{{$t('filter.point')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<search-box <search-box
@@ -21,12 +22,18 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th>序号</th> <!-- <th>序号</th>
<th>卷号</th> <th>卷号</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料名称</th>
<th>数量</th> <th>数量</th>
<th>单位</th> <th>单位</th> -->
<th>{{$t('grid.number')}}</th>
<th>{{$t('grid.roll-number')}}</th>
<th>{{$t('grid.material-code')}}</th>
<th>{{$t('grid.material-name')}}</th>
<th>{{$t('grid.quantity')}}</th>
<th>{{$t('grid.unit')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -45,9 +52,12 @@
<!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> --> <!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> -->
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button> <!-- <button class="zd-col-6 button-default" @tap="clearUp">清空</button>
<button class="zd-col-7 button-primary" @tap="searchList">查询</button> <button class="zd-col-7 button-primary" @tap="searchList">查询</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_comfirmGetting">确认取货</button> <button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_comfirmGetting">确认取货</button> -->
<button class="zd-col-8 button-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-7 button-primary" @tap="searchList">{{$t('button.search')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_comfirmGetting">{{$t('button.confirm-quhuo')}}</button>
</view> </view>
</view> </view>
</template> </template>

39
pages/ftdl/man-load-goods.vue
View File

@@ -6,7 +6,8 @@
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">点位</span> <!-- <span class="filter_label">点位</span> -->
<span class="filter_label">{{$t('filter.point')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<search-box <search-box
@@ -16,20 +17,10 @@
</view> </view>
</view> </view>
<view class="zd-row"> <view class="zd-row">
<!-- <view class="zd-col-1"> <button class="zd-col-6 button-primary ftsize1" @tap="toScanAdd">{{$t('button.scan-add')}}</button>
</view> --> <button class="zd-col-5 button-primary ftsize1" @tap="toAdd">{{$t('button.add-row')}}</button>
<view class="zd-col-6" style="width: 27%;"> <button class="zd-col-5 button-primary ftsize1" @tap="toDel">{{$t('button.del-row')}}</button>
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toScanAdd">扫码插入</button> <button class="zd-col-6 button-primary ftsize1" @tap="toCopy">{{$t('button.copy-row')}}</button>
</view>
<view class="zd-col-6" style="width: 22%;">
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toAdd">插入行</button>
</view>
<view class="zd-col-6" style="width: 22%;">
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toDel">删除行</button>
</view>
<view class="zd-col-6" style="width: 22%;">
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toCopy">复制行</button>
</view>
</view> </view>
</view> </view>
<view class="zd_wrapper grid-wraper"> <view class="zd_wrapper grid-wraper">
@@ -37,12 +28,18 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th>序号</th> <!-- <th>序号</th>
<th>卷号</th> <th>卷号</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料名称</th>
<th>数量</th> <th>数量</th>
<th>单位</th> <th>单位</th> -->
<th>{{$t('grid.number')}}</th>
<th>{{$t('grid.roll-number')}}</th>
<th>{{$t('grid.material-code')}}</th>
<th>{{$t('grid.material-name')}}</th>
<th>{{$t('grid.quantity')}}</th>
<th>{{$t('grid.unit')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -60,10 +57,12 @@
</view> </view>
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<!-- <button class="zd-col-6 button-default" @tap="clearUp">清空</button> --> <!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button>
<button class="zd-col-6 button-primary" @tap="searchList">查询</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_materialBinding">物料绑定</button> <button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_materialBinding">物料绑定</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="_vehicleBinding">空载具绑定</button> <button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="_vehicleBinding">空载具绑定</button> -->
<button class="zd-col-8 button-primary" @tap="searchList">{{$t('button.search')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_materialBinding">{{$t('button.material-bind')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="_vehicleBinding">{{$t('button.empty-vehicle-bind')}}</button>
</view> </view>
</view> </view>
</template> </template>

25
pages/ftdl/mater-list0.vue
View File

@@ -6,18 +6,20 @@
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label">物料</span> <!-- <span class="filter_label">物料</span> -->
<span class="filter_label">{{$t('filter.material')}}</span>
</view> </view>
<view class="zd-col-24"> <view class="zd-col-24">
<input type="text" class="filter_input" v-model="val1"> <input type="text" class="filter_input" v-model="val1">
</view> </view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-9">
<span class="filter_label">物料类型</span> <!-- <span class="filter_label">物料类型</span> -->
<span class="filter_label">{{$t('filter.wltype')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select> <uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
</view> </view>
</view> </view>
</view> </view>
@@ -26,10 +28,14 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th>物料编码</th> <!-- <th>物料编码</th>
<th>物料名称</th> <th>物料名称</th>
<th>单位</th> <th>单位</th>
<th>物料类型</th> <th>物料类型</th> -->
<th>{{$t('grid.material-code')}}</th>
<th>{{$t('grid.material-name')}}</th>
<th>{{$t('grid.unit')}}</th>
<th>{{$t('grid.wltype')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -46,9 +52,12 @@
<!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> --> <!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> -->
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="toEmpty">清空</button> <!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-8 button-primary" @tap="searchList">查询</button> <button class="zd-col-8 button-primary" @tap="searchList">查询</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button> <button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button> -->
<button class="zd-col-8 button-default" @tap="toEmpty">{{$t('button.clear')}}</button>
<button class="zd-col-8 button-primary" @tap="searchList">{{$t('button.search')}}</button>
<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" @tap="toSure">{{$t('button.confirm')}}</button>
</view> </view>
</view> </view>
</template> </template>

21
pages/ftdl/work-manage.vue
View File

@@ -5,8 +5,9 @@
<view class="zd_content"> <view class="zd_content">
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-12">
<span class="filter_label">载具编码</span> <!-- <span class="filter_label">载具编码</span> -->
<span class="filter_label">{{$t('filter.vehicle-code')}}</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<search-box <search-box
@@ -21,11 +22,16 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th>任务号</th> <!-- <th>任务号</th>
<th>起点</th> <th>起点</th>
<th>终点</th> <th>终点</th>
<th>状态</th> <th>状态</th>
<th>载具号</th> <th>载具号</th> -->
<th>{{$t('grid.task-number')}}</th>
<th>{{$t('grid.start-point')}}</th>
<th>{{$t('grid.end-point')}}</th>
<th>{{$t('grid.status')}}</th>
<th>{{$t('grid.vehicle-code')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -43,9 +49,12 @@
<!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> --> <!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> -->
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-6 button-primary" @tap="searchList">查询</button> <!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_againTask">重新下发</button> <button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_againTask">重新下发</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_forceConfirm">强制完成</button> <button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_forceConfirm">强制完成</button> -->
<button class="zd-col-8 button-primary" @tap="searchList">{{$t('button.search')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_againTask">{{$t('button.reissue')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_forceConfirm">{{$t('button.force-complete')}}</button>
</view> </view>
</view> </view>
</template> </template>

22
pages/home/home.vue
View File

@@ -1,15 +1,16 @@
<template> <template>
<view class="home_wraper"> <view class="home_wraper">
<view class="zd_content"> <view class="zd_content">
<view class="header">首页</view> <view class="header">{{$t('home.title')}}</view>
<view class="userInfo-wrap"> <view class="userInfo-wrap">
<view class="userInfo"> <view class="userInfo">
<text v-if="userName !== ''" class="p1">{{userName}}</text> <text v-if="userName !== ''" class="p1">{{userName}}</text>
<text class="p2">欢迎进入东丽WMS手持系统！</text> <!-- <text class="p2">欢迎进入东丽WMS手持系统！</text> -->
<text class="p2">{{$t('home.message')}}</text>
</view> </view>
<view class="exit" @tap="Quit"> <view class="exit" @tap="Quit">
<view class="icon-exit"></view> <view class="icon-exit"></view>
<view class="exit-text">退出</view> <view class="exit-text">{{$t('home.exit')}}</view>
</view> </view>
</view> </view>
<view class="zd_home_wrapper"> <view class="zd_home_wrapper">
@@ -45,19 +46,6 @@
{title: '产线管理', path: 'RF04', sonTree: [{title: '产线叫料', path: '/pages/ftdl/line-call-mater'}, {title: '产线下料', path: '/pages/ftdl/line-down-mater'}]}, {title: '产线管理', path: 'RF04', sonTree: [{title: '产线叫料', path: '/pages/ftdl/line-call-mater'}, {title: '产线下料', path: '/pages/ftdl/line-down-mater'}]},
{title: '任务管理', path: 'RF07', sonTree: [{title: '作业管理', path: '/pages/ftdl/work-manage'}, {title: '定点作业', path: '/pages/ftdl/fixedpoint-work'}]}, {title: '任务管理', path: 'RF07', sonTree: [{title: '作业管理', path: '/pages/ftdl/work-manage'}, {title: '定点作业', path: '/pages/ftdl/fixedpoint-work'}]},
{title: '进出区域登记', path: 'RF01', sonTree: [{title: '进出区域登记', path: '/pages/ftdl/inout-area-mark'}]} {title: '进出区域登记', path: 'RF01', sonTree: [{title: '进出区域登记', path: '/pages/ftdl/inout-area-mark'}]}
// {title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group2'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
// {title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线转运', path: '/pages/outbound/line-transfer2'}]},
// {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
// {title: '出库管理', path: 'RF02', sonTree: [{title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},
// {title: '入库管理', path: 'RF01', sonTree: [{title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
// {title: '出库管理', path: 'RF02', sonTree: [{title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]}
// {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
// {title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '盘点出库', path: '/pages/outbound/stock-out-store'}, {title: '物料出库', path: '/pages/outbound/mater-outstore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]},
// {title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
// {title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
// {title: '产线叫料', path: 'RF10', sonTree: [{title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]},
// {title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]},
// {title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}
], ],
// menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}], // menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}],
show: false, show: false,
@@ -140,7 +128,7 @@
_font(34rpx,1,#fff) _font(34rpx,1,#fff)
padding-bottom 18rpx padding-bottom 18rpx
.p2 .p2
_font(26rpx,1,#fff) _font(24rpx,1,#fff)
.exit .exit
_fj() _fj()
height 50rpx height 50rpx

188
pages/login/login.1.vue Normal file
View File

@@ -0,0 +1,188 @@
<template>
<view class="zd_content bg">
<view class="p1">欢迎来到</view>
<view class="p2">东丽WMS手持系统！</view>
<view class="input-box">
<input class="large-input" type="text" placeholder="请输入用户名" v-model="user">
</view>
<div class="input-box">
<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password" autocomplete=“off”>
<uni-icons :type="showPassword ? 'eye-filled' : 'eye'" size="20" :color="showPassword ? '#ff6a00' : '#999'" @tap="showPassword = !showPassword"></uni-icons>
</div>
<view class="zd-row radio-box">
<view class="zd-col-2 zd-row jccenter radio-icon-wrap" :class="{'radio-icon-wrap_checked': saveUser}" @tap="toSaveUser">
<uni-icons type="checkmarkempty" size="14" :color="saveUser ? '#ff6a00' : '#fff'"></uni-icons>
</view>
<view class="zd-col-13 radio-label">记住用户名</view>
<view class="zd-col-4 setup-text" @tap="setup">设置</view>
<view class="zd-col-5 setup-text" @tap="isUpdate">升级版本</view>
</view>
<button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button>
<view v-if="version !== ''" class="version-name">v{{version}}</view>
<Up-grade v-if="grade === true" @closeUpdate="closeUpdate" :androidUrl="androidUrl"></up-grade>
</view>
</template>
<script>
import { RSAencrypt } from '@/utils/jsencrypt.js'
import {pdaUpdate, handLogin} from '@/utils/getData3.js'
import UpGrade from './upgrade.vue'
export default {
components: {
UpGrade
},
data() {
return {
user: this.$store.getters.loginName ? this.$store.getters.loginName : '',
password: '',
showPassword: false,
saveUser: this.$store.getters.loginName ? true : false,
disabled: false,
version: '',
versionCode: '',
grade: false,
androidUrl: ''
}
},
created () {
//#ifdef APP-PLUS
// 获取本地应用资源版本号
plus.runtime.getProperty(plus.runtime.appid, (info) => {
// console.log(JSON.stringify(info));
this.version = info.version;
this.versionCode = info.versionCode ;
})
//#endif
},
methods: {
isUpdate () {
this._pdaUpdate()
},
toSaveUser() {
this.saveUser = !this.saveUser
},
setup () {
uni.redirectTo({
url: '/pages/login/setup2'
})
},
async toLogin() {
// uni.redirectTo({
// url: '/pages/home/home'
// })
this.disabled = true
if (this.user === '') {
uni.showToast({
title: '用户名不能为空',
icon: 'none'
})
this.disabled = false
return
}
if (this.password === '') {
uni.showToast({
title: '密码不能为空',
icon: 'none'
})
this.disabled = false
return
}
try {
let res = await handLogin(this.user, RSAencrypt(this.password))
if (res.code === '200') {
if (this.saveUser) {
this.$store.dispatch('saveLoginName', this.user)
} else {
this.$store.dispatch('delLoginName', '')
}
this.$store.dispatch('saveUserInfo', JSON.stringify(res.data.user))
this.$store.dispatch('saveToken', res.data.token)
uni.redirectTo({
url: '/pages/home/home'
})
} else {
console.log(11111)
uni.showToast({
title: res.message,
icon: 'none'
})
}
this.disabled = false
} catch (e) {
this.disabled = false
}
},
async _pdaUpdate () {
let res = await pdaUpdate()
// if (res.versionName === this.version) {
// uni.showToast({
// title: '当前为最新版本',
// icon: 'none'
// })
// } else {
// this.grade = true
// this.androidUrl = res.url
// }
this.grade = true
this.androidUrl = res.url
},
closeUpdate () {
this.grade = false
}
}
}
</script>
<style lang="stylus" scoped>
@import '../../common/style/mixin.styl';
.p1
_font(40rpx,75rpx,#444,666)
padding-top: 190rpx
.p2
_font(44rpx,1,#444,600)
padding: 10rpx 0 55rpx 0
.input-box
_fj()
margin-top 68rpx
height 75rpx
border-bottom 1rpx solid #e2e2e2
.large-input
_wh(calc(100% - 100rpx), 74rpx)
_font(32rpx,74rpx,#999)
padding-left 10rpx
.radio-box
margin 25rpx 0 70rpx 0
.radio-icon-wrap
_wh(34rpx, 34rpx)
border 1rpx solid #999
border-radius 4rpx
text-align center
line-height 40rpx
.radio-icon-wrap_checked
border-color $red
.radio-label
_font(28rpx, 28rpx,#333)
.setup-text
_font(28rpx, 28rpx,$red,,right)
.bg
background-color: #fff;
_bis('../../static/image/login_bg.png', 100%,,bottom)
.login-btn
width 100%
border-radius 46rpx
_font(36rpx,92rpx,#fff,,center)
background-color $red
.zd_content
position: relative
top 0
height: 100%
padding-left 40rpx
padding-right 40rpx
background-color: #fff
overflow: hidden
.version-name
width 100%
position: absolute
bottom: 30rpx
_font(30rpx, 60rpx, #999,,center)
</style>

18
pages/login/login.vue
View File

@@ -1,23 +1,23 @@
<template> <template>
<view class="zd_content bg"> <view class="zd_content bg">
<view class="p1">欢迎来到</view> <view class="p1">{{$t('login.text1')}}</view>
<view class="p2">东丽WMS手持系统！</view> <view class="p2">{{$t('login.text2')}}</view>
<view class="input-box"> <view class="input-box">
<input class="large-input" type="text" placeholder="请输入用户名" v-model="user"> <input class="large-input" type="text" :placeholder="$t('login.username')" v-model="user">
</view> </view>
<div class="input-box"> <div class="input-box">
<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password" autocomplete=“off”> <input class="large-input" :password="!showPassword" :placeholder="$t('login.password')" v-model="password" autocomplete=“off”>
<uni-icons :type="showPassword ? 'eye-filled' : 'eye'" size="20" :color="showPassword ? '#ff6a00' : '#999'" @tap="showPassword = !showPassword"></uni-icons> <uni-icons :type="showPassword ? 'eye-filled' : 'eye'" size="20" :color="showPassword ? '#ff6a00' : '#999'" @tap="showPassword = !showPassword"></uni-icons>
</div> </div>
<view class="zd-row radio-box"> <view class="zd-row radio-box">
<view class="zd-col-2 zd-row jccenter radio-icon-wrap" :class="{'radio-icon-wrap_checked': saveUser}" @tap="toSaveUser"> <view class="zd-col-2 zd-row jccenter radio-icon-wrap" :class="{'radio-icon-wrap_checked': saveUser}" @tap="toSaveUser">
<uni-icons type="checkmarkempty" size="14" :color="saveUser ? '#ff6a00' : '#fff'"></uni-icons> <uni-icons type="checkmarkempty" size="14" :color="saveUser ? '#ff6a00' : '#fff'"></uni-icons>
</view> </view>
<view class="zd-col-13 radio-label">记住用户名</view> <view class="zd-col-13 radio-label">{{$t('login.remember')}}</view>
<view class="zd-col-4 setup-text" @tap="setup">设置</view> <view class="zd-col-4 setup-text" @tap="setup">{{$t('login.settings')}}</view>
<view class="zd-col-5 setup-text" @tap="isUpdate">升级版本</view> <view class="zd-col-5 setup-text" @tap="isUpdate">{{$t('login.upgrade')}}</view>
</view> </view>
<button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button> <button class="login-btn" :disabled="disabled" @tap="toLogin">{{$t('login.login')}}</button>
<view v-if="version !== ''" class="version-name">v{{version}}</view> <view v-if="version !== ''" class="version-name">v{{version}}</view>
<Up-grade v-if="grade === true" @closeUpdate="closeUpdate" :androidUrl="androidUrl"></up-grade> <Up-grade v-if="grade === true" @closeUpdate="closeUpdate" :androidUrl="androidUrl"></up-grade>
</view> </view>
@@ -63,7 +63,7 @@
}, },
setup () { setup () {
uni.redirectTo({ uni.redirectTo({
url: '/pages/login/setup' url: '/pages/login/setup2'
}) })
}, },
async toLogin() { async toLogin() {

3
pages/login/setup.vue
View File

@@ -32,7 +32,6 @@
data() { data() {
return { return {
addrip: this.$store.getters.baseUrl, addrip: this.$store.getters.baseUrl,
acsip: this.$store.getters.acsUrl,
printip: this.$store.getters.printUrl, printip: this.$store.getters.printUrl,
setTime: this.$store.getters.setTime / 1000 setTime: this.$store.getters.setTime / 1000
}; };
@@ -66,7 +65,7 @@
// return // return
// } // }
// 存值 // 存值
this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, printUrl: this.printip, setTime: this.setTime * 1000}) this.$store.dispatch('setConfig',{baseUrl: this.addrip, printUrl: this.printip, setTime: this.setTime * 1000})
uni.redirectTo({ uni.redirectTo({
url: '/pages/login/login' url: '/pages/login/login'
}) })

125
pages/login/setup2.vue Normal file
View File

@@ -0,0 +1,125 @@
<template>
<view class="zd_container">
<nav-bar title="设置" :inner2="true" @goIn="goIn" :show="false"></nav-bar>
<view class="zd_content">
<!-- <view class="zd_wrapper">
<view class="zd-row">
<view class="zd-col-8 input-label">{{$t('setting.language')}}</view>
<view class="zd-col-16">
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
</view>
</view>
</view> -->
<view class="zd_wrapper">
<view class="zd-row">
<view class="zd-col-8 input-label">{{$t('setting.server')}}</view>
<view class="zd-col-16"><input type="text" class="setup-input" v-model="addrip"></view>
</view>
</view>
<!-- <view class="zd_wrapper">
<view class="zd-row">
<view class="zd-col-8 input-label">{{$t('setting.refresh')}}(s)</view>
<view class="zd-col-16"><input type="text" class="setup-input" v-model="setTime"></view>
</view>
</view> -->
</view>
<view class="zd-row submit-bar">
<button class="zd-col-24 button-primary" @click="_submit">{{$t('button.confirm')}}</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
export default {
components: {
NavBar
},
data() {
return {
options: [],
index: '',
addrip: this.$store.getters.baseUrl,
setTime: this.$store.getters.setTime / 1000,
// options1: [{text: '中文',value: 'zh-Hans'}, {text: 'English', value: 'en'}, {text: 'Japanese', value: 'jp'}],
options1: [{text: '中文',value: 'zh-Hans'}, {text: 'Japanese', value: 'jp'}],
index1: '',
systemLocale: '',
applicationLocale: ''
};
},
onLoad() {
let systemInfo = uni.getSystemInfoSync();
this.systemLocale = systemInfo.language;
this.applicationLocale = uni.getLocale();
this.index1 = this.applicationLocale.split('-')[0]
this.isAndroid = systemInfo.platform.toLowerCase() === 'android';
uni.onLocaleChange((e) => {
this.applicationLocale = e.locale;
})
},
methods: {
onLocaleChange(e) {
if (this.isAndroid) {
uni.showModal({
content: this.$t('setting.language-change-confirm'),
success: (res) => {
if (res.confirm) {
uni.setLocale(e);
}
}
})
} else {
uni.setLocale(e);
this.$i18n.locale = e;
}
},
selectChange1(e) {
this.onLocaleChange(e)
this.index1 = e
},
goIn () {
uni.redirectTo({
url: '/pages/login/login'
})
},
/** 选择器 */
selectChange(e) {
this.index = e
},
_submit () {
if (this.addrip === '') {
uni.showToast({
title: '服务器地址',
icon: 'none'
})
return
}
if (this.setTime === '') {
uni.showToast({
title: '请填写刷新时间',
icon: 'none'
})
return
}
// 存值
this.$store.dispatch('setConfig',{baseUrl: this.addrip, setTime: this.setTime * 1000, setPrintName: this.index})
uni.redirectTo({
url: '/pages/login/login'
})
}
}
}
</script>
<style lang="stylus" scoped>
@import '../../common/style/mixin.styl';
.input-label
wh(200rpx, 58rpx)
_font(28rpx,58rpx,#464646)
.setup-input
_wh(100%, 58rpx)
background #fff
_font(28rpx,58rpx,#323232)
padding 0 10rpx
</style>