This commit is contained in:
2025-09-26 15:22:04 +08:00
parent efc5313f80
commit 9d9f3bd270
23 changed files with 684 additions and 207 deletions

View File

@@ -6,41 +6,45 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<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 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 class="zd-row border-bottom">
<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 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 class="zd-row border-bottom">
<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 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 class="zd-row border-bottom">
<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 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 class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !index3 || !index4}" :disabled="disabled" @tap="_sendPointTask">确认</button>
<button class="zd-col-8 button-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !index3 || !index4}" :disabled="disabled" @tap="_sendPointTask">{{$t('button.confirm')}}</button>
</view>
</view>
</template>

View File

@@ -6,10 +6,11 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<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 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>
@@ -18,10 +19,14 @@
<table>
<thead>
<tr>
<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>
</thead>
<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"/> -->
</view>
<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': !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>
</template>

View File

@@ -6,15 +6,17 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<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 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 class="zd-row border-bottom">
<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 class="zd-col-24 filter_select">
<search-box
@@ -24,7 +26,8 @@
</view>
<view class="zd-row border-bottom">
<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 class="zd-col-17">
<input type="text" class="filter_input" v-model="currentData.material_name" @tap="toJump">
@@ -37,13 +40,20 @@
<thead>
<tr>
<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>{{$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>
</thead>
<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"/> -->
</view>
<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="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>
</template>

View File

@@ -6,7 +6,8 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<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 class="zd-col-16">
<search-box
@@ -17,15 +18,17 @@
</view>
<view class="zd-row border-bottom">
<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 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 class="zd-row border-bottom">
<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 class="zd-col-16">
<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>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">叫料托盘数</span>
<view class="zd-col-10">
<!-- <span class="filter_label">叫料托盘数</span> -->
<span class="filter_label">{{$t('filter.callmater-pallet-number')}}</span>
</view>
<view class="zd-col-17">
<view class="zd-col-14">
<input type="number" class="filter_input" v-model="val2">
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<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-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-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>
</template>

View File

@@ -6,7 +6,8 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<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 class="zd-col-24 filter_select">
<search-box
@@ -15,28 +16,19 @@
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">送往区域</span>
<view class="zd-col-9">
<!-- <span class="filter_label">送往区域</span> -->
<span class="filter_label">{{$t('filter.send-area')}}</span>
</view>
<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 class="zd-row">
<!-- <view class="zd-col-1">
</view> -->
<view class="zd-col-6" style="width: 27%;">
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toScanAdd">扫码插入</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>
<button class="zd-col-6 button-primary ftsize1" @tap="toScanAdd">{{$t('button.scan-add')}}</button>
<button class="zd-col-5 button-primary ftsize1" @tap="toAdd">{{$t('button.add-row')}}</button>
<button class="zd-col-5 button-primary ftsize1" @tap="toDel">{{$t('button.del-row')}}</button>
<button class="zd-col-6 button-primary ftsize1" @tap="toCopy">{{$t('button.copy-row')}}</button>
</view>
</view>
<view class="zd_wrapper grid-wraper">
@@ -44,12 +36,18 @@
<table>
<thead>
<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.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>
</thead>
<tbody>
@@ -67,9 +65,8 @@
</view>
</view>
<view class="zd-row submit-bar">
<!-- <button class="zd-col-6 button-default" @tap="clearUp">清空</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">确认下料</button>
<!-- <button class="zd-col-22 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>
</view>
</view>
</template>

View File

@@ -6,7 +6,8 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<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 class="zd-col-24 filter_select">
<search-box
@@ -21,12 +22,18 @@
<table>
<thead>
<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.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>
</thead>
<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"/> -->
</view>
<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" :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>
</template>

View File

@@ -6,7 +6,8 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<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 class="zd-col-24 filter_select">
<search-box
@@ -16,20 +17,10 @@
</view>
</view>
<view class="zd-row">
<!-- <view class="zd-col-1">
</view> -->
<view class="zd-col-6" style="width: 27%;">
<button class="mini-btn" size="mini" style="display: block; margin-top: 9px; width: 103%;" type="primary" @tap="toScanAdd">扫码插入</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>
<button class="zd-col-6 button-primary ftsize1" @tap="toScanAdd">{{$t('button.scan-add')}}</button>
<button class="zd-col-5 button-primary ftsize1" @tap="toAdd">{{$t('button.add-row')}}</button>
<button class="zd-col-5 button-primary ftsize1" @tap="toDel">{{$t('button.del-row')}}</button>
<button class="zd-col-6 button-primary ftsize1" @tap="toCopy">{{$t('button.copy-row')}}</button>
</view>
</view>
<view class="zd_wrapper grid-wraper">
@@ -37,12 +28,18 @@
<table>
<thead>
<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.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>
</thead>
<tbody>
@@ -60,10 +57,12 @@
</view>
</view>
<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}" :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>
</template>

View File

@@ -6,18 +6,20 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<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 class="zd-col-24">
<input type="text" class="filter_input" v-model="val1">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料类型</span>
<view class="zd-col-9">
<!-- <span class="filter_label">物料类型</span> -->
<span class="filter_label">{{$t('filter.wltype')}}</span>
</view>
<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>
@@ -26,10 +28,14 @@
<table>
<thead>
<tr>
<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>
</thead>
<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"/> -->
</view>
<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" :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>
</template>

View File

@@ -5,8 +5,9 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">载具编码</span>
<view class="zd-col-12">
<!-- <span class="filter_label">载具编码</span> -->
<span class="filter_label">{{$t('filter.vehicle-code')}}</span>
</view>
<view class="zd-col-24 filter_select">
<search-box
@@ -21,11 +22,16 @@
<table>
<thead>
<tr>
<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>
</thead>
<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"/> -->
</view>
<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="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>
</template>

View File

@@ -1,15 +1,16 @@
<template>
<view class="home_wraper">
<view class="zd_content">
<view class="header">首页</view>
<view class="header">{{$t('home.title')}}</view>
<view class="userInfo-wrap">
<view class="userInfo">
<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 class="exit" @tap="Quit">
<view class="icon-exit"></view>
<view class="exit-text">退出</view>
<view class="exit-text">{{$t('home.exit')}}</view>
</view>
</view>
<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: '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: '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'}]}],
show: false,
@@ -140,7 +128,7 @@
_font(34rpx,1,#fff)
padding-bottom 18rpx
.p2
_font(26rpx,1,#fff)
_font(24rpx,1,#fff)
.exit
_fj()
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>

View File

@@ -1,23 +1,23 @@
<template>
<view class="zd_content bg">
<view class="p1">欢迎来到</view>
<view class="p2">东丽WMS手持系统</view>
<view class="p1">{{$t('login.text1')}}</view>
<view class="p2">{{$t('login.text2')}}</view>
<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>
<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>
</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 class="zd-col-13 radio-label">{{$t('login.remember')}}</view>
<view class="zd-col-4 setup-text" @tap="setup">{{$t('login.settings')}}</view>
<view class="zd-col-5 setup-text" @tap="isUpdate">{{$t('login.upgrade')}}</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>
<Up-grade v-if="grade === true" @closeUpdate="closeUpdate" :androidUrl="androidUrl"></up-grade>
</view>
@@ -63,7 +63,7 @@
},
setup () {
uni.redirectTo({
url: '/pages/login/setup'
url: '/pages/login/setup2'
})
},
async toLogin() {

View File

@@ -32,7 +32,6 @@
data() {
return {
addrip: this.$store.getters.baseUrl,
acsip: this.$store.getters.acsUrl,
printip: this.$store.getters.printUrl,
setTime: this.$store.getters.setTime / 1000
};
@@ -66,7 +65,7 @@
// 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({
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>