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

sov

Browse Source
This commit is contained in:
xiangxy
2025-06-11 13:36:36 +08:00
parent b22befa68a 1e59224993
commit b3c4799855
36 changed files with 529 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/style/layout.styl
View File

@@ -391,9 +391,12 @@ uni-button:after {
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
}
.btn-submit {
display: grid;
place-items: center; /* 垂直和水平居中 */
padding: 0;
font-size: 28rpx;
line-height: 73rpx;
line-height: 28rpx;
height: 73rpx;
border-radius: 10rpx;
border-width: 2rpx;
border-style: solid;

3
common/style/reset.css
View File

@@ -140,6 +140,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
.h-50 {
height: 50% !important;
}
.mgt40 {
margin-top: 40rpx;
}
.mgb10 {
margin-bottom: 10rpx;
}

6
components/SearchPopup.vue
View File

@@ -1,7 +1,7 @@
<template>
<view class="msg_l_wrapper" :class="{ active: visible }">
<view class="zd-row header">
<span class="page_name">搜索</span>
<span class="page_name">{{$t('button.search')}}</span>
<uni-icons type="closeempty" size="20" @tap="handleClose"></uni-icons>
</view>
<view class="search-container">
@@ -16,10 +16,10 @@
</view>
<view class="zd-row submitbar">
<view class="zd-col-4">
<button class="btn-submit btn-cancle" @tap="handleClear">全部清除</button>
<button class="btn-submit btn-cancle" @tap="handleClear">{{$t('button.clear')}}</button>
</view>
<view class="zd-col-4">
<button class="btn-submit btn-success" @tap="handleSearch">查询</button>
<button class="btn-submit btn-success" @tap="handleSearch">{{$t('button.search')}}</button>
</view>
</view>
</view>

27
locale/en.json
View File

@@ -4,7 +4,7 @@
"uni.dataSelect.emptyTips": "No options available",
"utils.read-more": "Read more",
"utils.no-more": "No more",
"button.confirm": "OK",
"button.confirm": "Submit",
"button.cancel": "Cancel",
"button.clear": "Clear",
"button.search": "Query",
@@ -33,6 +33,20 @@
"button.print": "Print",
"button.force-complete": "Force Complete",
"button.reissue": "Reissue",
"button.ready": "Ready to go",
"button.start-work-order": "Start work order",
"button.add-order": "Add order",
"button.roll-down": "Normal roll down",
"button.single-volume": "Single Volume",
"button.upper-axis": "Single upper axis",
"button.lower-axis": "single lower axis",
"button.enter-box": "Enter box",
"button.out-box": "Out box",
"button.quality-approved": "Quality approved",
"button.all-clear": "All-clear",
"button.load-mater": "Loading materials",
"button.mater-return": "Material return",
"button.allow-entry": "Allow entry",
"login.username": "User name",
"login.password": "Password",
"login.remember": "Remember username",
@@ -103,7 +117,9 @@
"filter.vehicle-code": "Vehicle code",
"filter.last-roll-down": "Last roll down",
"filter.cache-point": "Cache point",
"filter.wooden-box-code": "Wooden box code",
"filter.box-no": "wooden box No",
"filter.box-code": "wooden box code",
"filter.box-type": "wooden box type",
"filter.virtual-library": "Virtual library",
"filter.remark": "Remark",
"filter.document-type": "Document type",
@@ -111,6 +127,11 @@
"filter.warehouse-area": "Warehouse area",
"filter.vehicle-type": "Vehicle type",
"filter.layers": "Layers",
"filter.temperature": "Temperature",
"filter.time":"Time",
"filter.end": "End",
"filter.control-point": "Control point",
"filter.inspection-results": "Inspection results",
"grid.number": "No.",
"grid.select": "Select",
"grid.work-order-number": "Work order number",
@@ -171,6 +192,8 @@
"grid.is-stock": "Is there stock available",
"grid.assign-person": "Assign person",
"grid.allocate-time": "Allocate time",
"grid.sub-roll": "Sub roll ",
"grid.subtube": "Subtube ",
"toast.point-not-empty": "The point cannot be empty",
"toast.select-cache-point": "Please select a cache point",
"toast.select-device": "Please select a device",

29
locale/id.json
View File

@@ -4,7 +4,7 @@
"uni.dataSelect.emptyTips": "Tidak ada pilihan tersedia",
"utils.read-more": "Lihat lebih",
"utils.no-more": "Tidak lagi",
"button.confirm": "OK",
"button.confirm": "Kirimkan",
"button.cancel": "Batalkan",
"button.clear": "Hapus",
"button.search": "pertanyaan",
@@ -33,7 +33,21 @@
"button.print": "Mencetak",
"button.force-complete": "Pelengkapan terpaksa",
"button.reissue": "Keluaran ulang",
"login.username": "Nama pengguna",
"button.ready-to-go": "Siapkan",
"button.start-work-order": "Mulai tugas",
"button.add-order": "Tambahkan pesanan",
"button.roll-down": "Roll bawah normal",
"button.single-volume": "Gulung Tunggal",
"button.upper-axis": "Satu poros atas",
"button.lower-axis": "Satu poros bawah",
"button.enter-box": "Kotak masuk",
"button.out-box": "Kotak keluar",
"button.quality-approved": "Pemeriksaan Kualitas",
"button.all-clear": "Menghapus peringatan",
"button.load-mater": "Tambahan",
"button.mater-return": "Kembalikan",
"button.allow-entry": "Izinkan Masuk",
"login.username": "Mulai tugas",
"login.password": "Sandi",
"login.remember": "Ingat nama pengguna",
"login.settings": "Pengaturan",
@@ -103,7 +117,9 @@
"filter.vehicle-code": "Kode kendaraan",
"filter.last-roll-down": "Roll terakhir turun",
"filter.cache-point": "Titik Cache",
"filter.wooden-box-code": "Kode kotak kayu",
"filter.box-no": "Nomor kotak kayu",
"filter.box-code": "Kode Kotak Kayu",
"filter.box-type": "jenis kotak kayu",
"filter.virtual-library": "Pustaka Virtual",
"filter.remark": "komentar",
"filter.document-type": "Jenis dokumen",
@@ -111,6 +127,11 @@
"filter.warehouse-area": "Daerah gudang",
"filter.vehicle-type": "Jenis kendaraan",
"filter.layers": "lapisan",
"filter.temperature": "suhu",
"filter.time":"Waktu",
"filter.end": "Akhir",
"filter.control-point": "Titik Kontrol",
"filter.inspection-results": "Hasil ujian",
"grid.number": "Nomor",
"grid.select": "Pilihan",
"grid.work-order-number": "Nomor urutan kerja",
@@ -171,6 +192,8 @@
"grid.is-stock": "Apakah ada saham tersedia",
"grid.assign-person": "Pengasih",
"grid.allocate-time": "Tugaskan waktu",
"grid.sub-roll": "Subvolume",
"grid.subtube": "Subsidiar",
"toast.point-not-empty": "Titik tidak dapat kosong",
"toast.select-cache-point": "Silakan pilih lokasi cache",
"toast.select-device": "Silakan pilih perangkat",

25
locale/zh-Hans.json
View File

@@ -33,6 +33,20 @@
"button.print": "打印",
"button.force-complete": "强制完成",
"button.reissue": "重新下发",
"button.ready-to-go": "准备就绪",
"button.start-work-order": "开始工单",
"button.add-order": "新增工单",
"button.roll-down": "正常下卷",
"button.single-volume": "单下卷",
"button.upper-axis": "单上轴",
"button.lower-axis": "单下轴",
"button.enter-box": "入箱",
"button.out-box": "出箱",
"button.quality-approved": "质检合格",
"button.all-clear": "解警",
"button.load-mater": "上料",
"button.mater-return": "退料",
"button.allow-entry": "允许进入",
"login.username": "用户名",
"login.password": "密码",
"login.remember": "记住用户名",
@@ -103,7 +117,9 @@
"filter.vehicle-code": "载具码",
"filter.last-roll-down": "末次下卷",
"filter.cache-point": "缓存点位",
"filter.wooden-box-code": "木箱码",
"filter.box-no": "木箱号",
"filter.box-code": "木箱编码",
"filter.box-type": "木箱料号",
"filter.virtual-library": "虚拟库",
"filter.remark": "备注",
"filter.document-type": "单据类型",
@@ -111,6 +127,11 @@
"filter.warehouse-area": "库区",
"filter.vehicle-type": "载具类型",
"filter.layers": "层数",
"filter.temperature": "温度",
"filter.time":"时间",
"filter.end": "终点",
"filter.control-point": "管制点",
"filter.inspection-results": "检验结果",
"grid.number": "序号",
"grid.select": "选择",
"grid.work-order-number": "工单号",
@@ -171,6 +192,8 @@
"grid.is-stock": "是否有货",
"grid.assign-person": "分配人",
"grid.allocate-time": "分配时间",
"grid.sub-roll": "子卷",
"grid.subtube": "子管",
"toast.point-not-empty": "点位不能为空",
"toast.select-cache-point": "请选择缓存点位",
"toast.select-device": "请选择设备",

16
pages.json
View File

@@ -719,6 +719,22 @@
}
}
,{
"path" : "pages/SecondPhase/production/MjMake",
"style" :
{
"navigationStyle": "custom"
}
}
,{
"path" : "pages/SecondPhase/production/SboCool",
"style" :
{
"navigationStyle": "custom"
}
}
],
"globalStyle": {
// "pageOrientation": "landscape",

6
pages/SecondPhase/BoxReturn.vue
View File

@@ -16,7 +16,7 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">木箱码</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<search-box
@@ -27,8 +27,8 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_boxReturn">确认</button>
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_boxReturn">{{$t('button.confirm')}}</button>
</view>
</view>
</template>

2
pages/SecondPhase/DeliveryUnbind.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">{{$t('filter.wooden-box-code')}}</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" />

26
pages/SecondPhase/DeliveryUnbindConfirm.vue
View File

@@ -5,7 +5,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">木箱号</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" @handleChange="handleChange"/>
@@ -23,13 +23,13 @@
<table>
<thead>
<tr>
<th class="fontcol2">木箱号</th>
<th>点位编码</th>
<th class="fontcol2">{{$t('filter.box-no')}}</th>
<th>{{$t('grid.point-code')}}</th>
<th>点位名称</th>
<th>重量</th>
<th>产品编码</th>
<th>{{$t('grid.weight')}}</th>
<th>{{$t('grid.product-code')}}</th>
<th>产品名称</th>
<th>订单号</th>
<th>{{$t('grid.order-number')}}</th>
</tr>
</thead>
<tbody>
@@ -48,9 +48,9 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-5 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': dataList.length === 0}" :disabled="disabled" @tap="_twoPdaOutConfirm">确认</button>
<button class="zd-col-8 btn-submit btn-success letter-30" @tap="_twoPdaIvtDtlQuery(val1)">查询</button>
<button class="zd-col-5 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': dataList.length === 0}" :disabled="disabled" @tap="_twoPdaOutConfirm">{{$t('button.confirm')}}</button>
<button class="zd-col-8 btn-submit btn-success letter-30" @tap="_twoPdaIvtDtlQuery(val1)">{{$t('button.search')}}</button>
</view>
<view class="msg_wrapper" :class="show ? 'popshow' : 'pophide'">
<view class="pop-line"></view>
@@ -60,14 +60,14 @@
<table>
<thead>
<tr>
<th>木箱号</th>
<th>子卷号</th>
<th>{{$t('filter.box-no')}}</th>
<th>{{$t('grid.sub-roll-number')}}</th>
<th>sap批次</th>
<th>净重</th>
<th>状态</th>
<th>订单号</th>
<th>{{$t('grid.order-number')}}</th>
<th>客户编码</th>
<th>客户名称</th>
<th>{{$t('grid.customer-name')}}</th>
<th>幅宽</th>
<th>厚度</th>
<th>长度</th>

2
pages/SecondPhase/EmptyBoxInStore.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">{{$t('filter.wooden-box-code')}}</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<link-scan ref="scanChild" @getScanlist="getScanlist"/>

10
pages/SecondPhase/EmptyBoxOutStore.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">木箱号</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" @handleChange="handleChange1" />
@@ -33,15 +33,15 @@
<table>
<thead>
<tr>
<th>选择</th>
<th>木箱号</th>
<th>{{$t('grid.select')}}</th>
<th>{{$t('filter.box-no')}}</th>
<th>木箱料号</th>
<th>木箱描述</th>
<th>最大子卷数</th>
<th>木箱长度</th>
<th>木箱宽度</th>
<th>木箱高度</th>
<th>载具类型</th>
<th>{{$t('filter.vehicle-type')}}</th>
<th>木箱重量</th>
<th>仓位</th>
</tr>
@@ -66,7 +66,7 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !checkArr.length}" :disabled="disabled" @tap="_twoBoxOut">出库确认</button>
</view>
<up-top ref="UT" :scrollTop="top"></up-top>

4
pages/SecondPhase/ManMaintain.vue
View File

@@ -21,8 +21,8 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_updatePackagePoint">确认</button>
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_updatePackagePoint">{{$t('button.confirm')}}</button>
</view>
</view>
</template>

4
pages/SecondPhase/SubRollPackUnbind.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">子卷号</span>
<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
</view>
<view class="filter_input_wraper">
<search-box
@@ -17,7 +17,7 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_toEndSub">子卷包装解绑</button>
</view>
</view>

6
pages/SecondPhase/finished/BoxWeight.vue
View File

@@ -6,14 +6,14 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">木箱</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" @handleChange="handleChange"/>
</view>
</view>
<view class="filter_item">
<view class="filter_label">重量</view>
<view class="filter_label">{{$t('grid.weight')}}</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val2" :class="{'filter_input_disabled': disabled1}" :disabled="disabled1">
</view>
@@ -21,7 +21,7 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_saveBoxInfo">保存</button>
</view>
</view>

8
pages/SecondPhase/finished/ReturnToStore.vue
View File

@@ -5,14 +5,14 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">单据类型</view>
<view class="filter_label">{{$t('filter.document-type')}}</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">木箱号</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" />
@@ -20,7 +20,7 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">点位</span>
<span class="filter_label">{{$t('grid.point-code')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val2" />
@@ -29,7 +29,7 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index || !val1 || !val2}" :disabled="disabled" @tap="_twoPdaReturnIn">入库</button>
</view>
</view>

10
pages/SecondPhase/finished/abnorToStore.vue
View File

@@ -5,14 +5,14 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">单据类型</view>
<view class="filter_label">{{$t('filter.document-type')}}</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">木箱号</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" />
@@ -28,7 +28,7 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">点位</span>
<span class="filter_label">{{$t('grid.point-code')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val3" />
@@ -37,7 +37,7 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index || !val1 || !val2 || !val3}" :disabled="disabled" @tap="_twoPdaReback">入库</button>
</view>
</view>

8
pages/SecondPhase/lvt/EmptyBox.vue
View File

@@ -20,7 +20,7 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">木箱号</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val3">
@@ -32,7 +32,7 @@
<table>
<thead>
<tr>
<th>木箱号</th>
<th>{{$t('filter.box-no')}}</th>
<th>木箱料号</th>
<th>木箱描述</th>
<th>最大子卷数</th>
@@ -63,8 +63,8 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
<button class="zd-col-15 btn-submit btn-success" @tap="_queryBoxIvt">查询</button>
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success" @tap="_queryBoxIvt">{{$t('button.search')}}</button>
</view>
<up-top ref="UT" :scrollTop="top"></up-top>
</view>

4
pages/SecondPhase/point/ErrorOutUnlock.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">木箱</span>
<span class="filter_label">{{$t('filter.box-no')}}</span>
</view>
<view class="filter_input_wraper">
<search-box ref="scanChild" v-model="val1" @handleChange="handleChange1"
@@ -15,7 +15,7 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">点位</span>
<span class="filter_label">{{$t('grid.point-code')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val2" @handleChange="handleChange2" />

8
pages/SecondPhase/point/ManPass.vue
View File

@@ -5,16 +5,16 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">载具类型</view>
<view class="filter_label">{{$t('filter.vehicle-type')}}</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
</view>
</view>
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="_confirmPass">确认</button>
<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="_confirmPass">{{$t('button.confirm')}}</button>
<button class="zd-col-8 btn-submit btn-success" @tap="btn_active=true">出库点放行</button>
</view>
<view class="more_btns_wraper" :class="btn_active ? 'popshow' : 'pophide'">

4
pages/SecondPhase/point/PointManage.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">点位</span>
<span class="filter_label">{{$t('grid.point-code')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" @handleChange="handleChange1"/>
@@ -14,7 +14,7 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">空轴/母卷</span>
<span class="filter_label">空轴/{{$t('filter.mother-roll')}}</span>
</view>
<view class="filter_input_wraper">
<search-box

37
pages/SecondPhase/production/BakeProcess.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">点位</span>
<span class="filter_label">{{$t('grid.point-code')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" @handleChange="handleChange1"/>
@@ -14,31 +14,37 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">母卷</span>
<span class="filter_label">{{$t('filter.mother-roll')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val2" />
</view>
</view>
<view class="filter_item">
<view class="filter_label">温度</view>
<view class="filter_label">{{$t('filter.temperature')}}</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val3">
<input type="number" class="filter_input" v-model="val3">
</view>
</view>
<view class="filter_item">
<view class="filter_label">时间</view>
<view class="filter_label">{{$t('filter.time')}}(分)</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val4">
<input type="number" class="filter_input" v-model="val4">
</view>
</view>
<view class="filter_item">
<view class="filter_label">类型</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options"></uni-data-select>
</view>
</view>
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_ovenInAndOut1('1')">入箱</button>
<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_ovenInAndOut2('2')">出箱</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_inCoolIvt">质检合格</button>
<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled4" @tap="_bakingrelease">解警</button>
<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_ovenInAndOut1('1')">{{$t('button.enter-box')}}</button>
<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_ovenInAndOut2('2')">{{$t('button.out-box')}}</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_inCoolIvt">{{$t('button.quality-approved')}}</button>
<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !((val1 && val2 && index === '1') || (val1 && val2 && val3 && val4 && index === '2'))}" :disabled="disabled4" @tap="_inCoolOrOven">质检不合格</button>
</view>
</view>
</template>
@@ -46,7 +52,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {ovenInAndOut, inCoolIvt, bakingrelease, bakingquery} from '@/utils/getData1.js'
import {ovenInAndOut, inCoolIvt, bakingquery, inCoolOrOven} from '@/utils/getData1.js'
export default {
components: {
NavBar,
@@ -59,6 +65,8 @@
val2: '',
val3: '',
val4: '',
index: '',
options: [{value: '1', text: '入冷却'}, {value: '2', text: '入烘箱'}],
disabled: false,
disabled3: false,
disabled4: false
@@ -138,14 +146,15 @@
this.disabled3 = false
}
},
async _bakingrelease () {
// 质检不合格
async _inCoolOrOven () {
this.disabled4 = true
if (!this.val1) {
if (!((this.val1 && this.val2 && this.index === '1') || (this.val1 && this.val2 && this.val3 && this.val4 && this.index === '2'))) {
this.disabled4 = false
return
}
try {
let res = await bakingrelease(this.val1)
let res = await inCoolOrOven(this.val1, this.val2, this.val3, this.val4, this.index)
uni.showToast({
title: res.message,
icon: 'none'

12
pages/SecondPhase/production/BoxStock.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">子卷号</span>
<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" @handleChange="handleChange" />
@@ -18,18 +18,18 @@
<table>
<thead>
<tr>
<th>木箱号</th>
<th>{{$t('filter.box-no')}}</th>
<th>木箱编码</th>
<th>点位</th>
<th>{{$t('grid.point-code')}}</th>
<th>木箱规格</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i">
<td>{{e.box_no}}</td>
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.struct_code}}</td>
<td>{{e.material_code}}</td>
</tr>
</tbody>
</table>
@@ -38,8 +38,8 @@
<!-- <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 submitbar">
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
<button class="zd-col-15 btn-submit btn-success letter-30" @tap="toSure">查询</button>
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success letter-30" @tap="toSure">{{$t('button.search')}}</button>
</view>
<!-- <up-top ref="UT" :scrollTop="top"></up-top> -->
</view>

16
pages/SecondPhase/production/ManmadeBake.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">点位</span>
<span class="filter_label">{{$t('grid.point-code')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" @handleChange="handleChange1"/>
@@ -14,27 +14,27 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">母卷</span>
<span class="filter_label">{{$t('filter.mother-roll')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val2" />
</view>
</view>
<view class="filter_item">
<view class="filter_label">温度</view>
<view class="filter_label">{{$t('filter.temperature')}}</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val3">
</view>
</view>
<view class="filter_item">
<view class="filter_label">时间</view>
<view class="filter_label">{{$t('filter.time')}}</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val4">
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">终点</span>
<span class="filter_label">{{$t('filter.end')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val5" />
@@ -43,9 +43,9 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut1('1')">入箱</button>
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut2('2')">出箱</button>
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_handleBakingcheckConfirm">质检合格</button>
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut1('1')">{{$t('button.enter-box')}}</button>
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut2('2')">{{$t('button.out-box')}}</button>
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_handleBakingcheckConfirm">{{$t('button.quality-approved')}}</button>
</view>
</view>
</template>

76
pages/SecondPhase/production/MjMake.vue Normal file
View File

@@ -0,0 +1,76 @@
<template>
<view class="zd_container">
<!-- <nav-bar title="母卷决策"></nav-bar> -->
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">{{$t('filter.mother-roll')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" />
</view>
</view>
<view class="filter_item">
<view class="filter_label">类型</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options"></uni-data-select>
</view>
</view>
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 || !index}" :disabled="disabled" @tap="_bakingReBake">{{$t('button.confirm')}}</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {bakingReBake} from '@/utils/getData3.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
title: '',
val1: '',
index: '',
options: [{value: '1', text: '决策入烘箱'}, {value: '2', text: '决策入冷却'}],
disabled: false
};
},
onLoad (options) {
this.title = options.title
},
methods: {
clearUp () {
this.val1 = ''
this.index = ''
this.disabled = false
},
async _bakingReBake () {
this.disabled = true
if (!this.val1 || !this.index) {
this.disabled = false
return
}
try {
let res = await bakingReBake(this.val1, this.index)
uni.showToast({
title: res.message,
icon: 'none'
})
this.clearUp()
} catch (e) {
this.disabled = false
}
}
}
}
</script>

8
pages/SecondPhase/production/PrintTable.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">子卷号</span>
<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" />
@@ -15,19 +15,19 @@
<view class="filter_item">
<view class="filter_label">打印机</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options1" @change="selectChange1"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label">标签类型</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options2" @change="selectChange2"></uni-data-select>
</view>
</view>
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !index1 || !index2}" :disabled="disabled" @tap="_printTable">打印</button>
</view>
</view>

160
pages/SecondPhase/production/SboCool.vue Normal file
View File

@@ -0,0 +1,160 @@
<template>
<view class="zd_container">
<!-- <nav-bar title="冷却区生箔详情"></nav-bar> -->
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">{{$t('filter.area')}}</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">{{$t('grid.point-code')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" />
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">{{$t('grid.mother-roll-number')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val2" />
</view>
</view>
</view>
<view class="zd_wrapper grid-wraper">
<view class="slide_new">
<table>
<thead>
<tr>
<th>{{$t('grid.point-code')}}</th>
<th>{{$t('grid.mother-roll-number')}}</th>
<th>满轴位</th>
<th>满轴位状态</th>
<th>空轴位</th>
<th>空轴位状态</th>
<th>母卷来源</th>
<th>母卷状态</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i">
<td>{{e.point_code}}</td>
<td>{{e.container_name}}</td>
<td>{{e.full_point_code}}</td>
<td>{{e.full_point_status}}</td>
<td>{{e.empty_point_code}}</td>
<td>{{e.empty_point_status}}</td>
<td>{{e.origin}}</td>
<td>{{e.roll_status}}</td>
</tr>
</tbody>
</table>
</view>
</view>
<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 submitbar">
<button class="zd-col-22 btn-submit btn-success" @tap="searchList">{{$t('button.search')}}</button>
</view>
<up-top ref="UT" :scrollTop="top"></up-top>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import UpTop from '@/components/upTop.vue'
import {queryProductArea} from '@/utils/getData1.js'
import {rawQuery} from '@/utils/getData3.js'
export default {
components: {
NavBar,
SearchBox,
UpTop
},
data() {
return {
title: '',
top: 0,
val1: '',
val2: '',
options: [],
index: '',
dataList: [],
reload: false,
status: 'more',
contentText: {
contentdown: '查看更多',
contentrefresh: '加载中',
contentnomore: '没有更多'
},
totalCount: 0,
pageNum: 1,
pageSize: 10
};
},
onPageScroll(e) {
this.$refs.UT.topData(e.scrollTop)
},
onLoad (options) {
this.title = options.title
},
created () {
this._rawQuery()
this._queryProductArea()
},
methods: {
searchList () {
this.dataList = []
this.pageNum = 1
this._rawQuery()
},
/** 生产区域下拉框查询 */
async _queryProductArea () {
let res = await queryProductArea()
this.options = [...res.data]
},
/** 初始化查询 */
async _rawQuery () {
let res = await rawQuery(this.val1, this.val2, this.index, this.pageNum + '', this.pageSize + '')
this.totalCount = res.size
if (res.size > 0) {
const dataMap = res.data
this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
this.reload = false
} else {
this.dataList = []
}
if (this.totalCount == this.dataList.length) {
this.reload = false
this.status = 'noMore'
}
},
onReachBottom () {
if (this.totalCount > this.dataList.length) {
this.status = 'loading'
setTimeout(() => {
this.pageNum++
this._rawQuery()
}, 1000)
} else { //停止加载
this.status = 'noMore'
}
}
}
}
</script>
<style lang="stylus" scoped>
.slide_new table .bgred td:first-child
background-image linear-gradient(to right,#E9B451,#fff)
.slide_new table .bgyellow td:first-child
background-image linear-gradient(to right,#c2cde3,#fff)
</style>

63
pages/SecondPhase/production/SboProcess.vue
View File

@@ -5,8 +5,8 @@
<view class="zd_content">
<view class="zd-row mgb10">
<view class="zd-col-18">
<button class="mgr20" size="mini" type="primary" :disabled="!pkId || disabled2" @tap="_confirmBlanking">准备就绪</button>
<button size="mini" type="primary" :disabled="!pkId || disabled3" @tap="_rawStart">开始工单</button>
<button class="mgr20" size="mini" type="primary" :disabled="!pkId || disabled2" @tap="_confirmBlanking">{{$t('button.ready-to-go')}}</button>
<button size="mini" type="primary" :disabled="!pkId || disabled3" @tap="_rawStart">{{$t('button.start-work-order')}}</button>
</view>
<button class="btn-search-icon" size="mini" @tap="toggleSearchPopup"><uni-icons type="search" size="24" color="#272727"></uni-icons></button>
</view>
@@ -15,18 +15,18 @@
<table>
<thead>
<tr>
<th>状态</th>
<th class="th_2">母卷号</th>
<th>工单号</th>
<th>机台编码</th>
<th>产品编码</th>
<th>理论长度</th>
<th>开始时间</th>
<th>结束时间</th>
<th>总重量</th>
<th>车号</th>
<th>生产区域</th>
<th>更新时间</th>
<th>{{$t('filter.state')}}</th>
<th class="th_2">{{$t('grid.mother-roll-number')}}</th>
<th>{{$t('grid.work-order-number')}}</th>
<th>{{$t('grid.machine-code')}}</th>
<th>{{$t('grid.product-code')}}</th>
<th>{{$t('grid.theoretical-length')}}</th>
<th>{{$t('grid.start-time')}}</th>
<th>{{$t('grid.end-time')}}</th>
<th>{{$t('grid.total-weight')}}</th>
<th>{{$t('grid.car-number')}}</th>
<th>{{$t('grid.production-area')}}</th>
<th>{{$t('grid.update-time')}}</th>
</tr>
</thead>
<tbody>
@@ -51,10 +51,10 @@
<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 submitbar">
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '1' && disabled4" @tap="_rawScrollDowm('1')">正常下卷</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '3' && disabled4" @tap="_rawScrollDowm('3')">单下卷</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '2' && disabled4" @tap="_rawScrollDowm('2')">单上轴</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '4' && disabled4" @tap="_rawScrollDowm('4')">单下轴</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '1' && disabled4" @tap="_rawScrollDowm('1')">{{$t('button.roll-down')}}</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '3' && disabled4" @tap="_rawScrollDowm('3')">{{$t('button.single-volume')}}</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '2' && disabled4" @tap="_rawScrollDowm('2')">{{$t('button.upper-axis')}}</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '4' && disabled4" @tap="_rawScrollDowm('4')">{{$t('button.lower-axis')}}</button>
</view>
<up-top ref="UT" :scrollTop="top"></up-top>
<SearchPopup
@@ -63,11 +63,6 @@
@clear="handleClear"
@search="searchList"
>
<view class="zd-row pdt26 mgb10 jcflexend">
<view class="zd-col-8">
<button size="mini" type="primary" :disabled="disabled1" @tap="_createOrder">新增工单</button>
</view>
</view>
</SearchPopup>
</view>
</template>
@@ -90,12 +85,12 @@
title: '',
top: 0,
initialConditions: [
{ required: false, key: 'scan', label: '点位', value: ''},
{ required: false, key: 'scan', label: '类型', value: '' }
{ required: false, key: 'scan', label: this.$t('grid.point-code'), value: ''},
{ required: false, key: 'scan', label: this.$t('filter.mother-roll'), value: '' }
],
conditions: [
{ required: false, key: 'scan', label: '点位', value: ''},
{ required: false, key: 'scan', label: '类型', value: '' }
{ required: false, key: 'scan', label: this.$t('grid.point-code'), value: ''},
{ required: false, key: 'scan', label: this.$t('filter.mother-roll'), value: '' }
],
dataList: [],
pkId: '',
@@ -177,20 +172,6 @@
this.status = 'noMore'
}
},
// 新增工单
async _createOrder () {
this.disabled1 = true
try {
let res = await createOrder(this.conditions[0].value, this.conditions[1].value)
this.disabled1 = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled1 = false
}
},
// 准备就绪
async _confirmBlanking () {
this.disabled2 = true

28
pages/SecondPhase/production/SboProdProgress.vue
View File

@@ -5,14 +5,14 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">区域</view>
<view class="filter_label">{{$t('filter.area')}}</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">点位</span>
<span class="filter_label">{{$t('grid.point-code')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" />
@@ -20,7 +20,7 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">母卷</span>
<span class="filter_label">{{$t('grid.mother-roll-number')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val2" />
@@ -32,15 +32,15 @@
<table>
<thead>
<tr>
<th>母卷号</th>
<th>开始时间</th>
<th>预计结束时间</th>
<th>机台编码</th>
<th>点位编码</th>
<th>产品编码</th>
<th>理论长度</th>
<th>工单号</th>
<th>剩余时间(分)</th>
<th>{{$t('grid.mother-roll-number')}}</th>
<th>{{$t('grid.start-time')}}</th>
<th>{{$t('grid.expected-end-time')}}</th>
<th>{{$t('grid.machine-code')}}</th>
<th>{{$t('grid.point-code')}}</th>
<th>{{$t('grid.product-code')}}</th>
<th>{{$t('grid.theoretical-length')}}</th>
<th>{{$t('grid.work-order-number')}}</th>
<th>{{$t('grid.remain-time')}}</th>
</tr>
</thead>
<tbody>
@@ -62,7 +62,7 @@
<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 submitbar">
<button class="zd-col-22 btn-submit btn-success" @tap="searchList">查询</button>
<button class="zd-col-22 btn-submit btn-success" @tap="searchList">{{$t('button.search')}}</button>
</view>
<up-top ref="UT" :scrollTop="top"></up-top>
</view>

12
pages/SecondPhase/production/SurfaceProcess.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">点位</span>
<span class="filter_label">{{$t('grid.point-code')}}</span>
</view>
<view class="filter_input_wraper">
<search-box
@@ -16,7 +16,7 @@
</view>
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">母卷</span>
<span class="filter_label">{{$t('filter.mother-roll')}}</span>
</view>
<view class="filter_input_wraper">
<search-box
@@ -27,10 +27,10 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-5 btn-submit btn-default letter-30" @tap="cleanUp">清空</button>
<button class="zd-col-6 btn-submit btn-success letter-30" :disabled="disabled" @tap="_surfaceOperate('1')">上料</button>
<button class="zd-col-6 btn-submit btn-success letter-30" :disabled="disabled" @tap="_surfaceOperate('2')">退料</button>
<button class="zd-col-6 btn-submit btn-success" :disabled="disabled" @tap="_surfaceConfirm">允许进入</button>
<button class="zd-col-5 btn-submit btn-default letter-30" @tap="cleanUp">{{$t('button.clear')}}</button>
<button class="zd-col-6 btn-submit btn-success letter-30" :disabled="disabled" @tap="_surfaceOperate('1')">{{$t('button.load-mater')}}</button>
<button class="zd-col-6 btn-submit btn-success letter-30" :disabled="disabled" @tap="_surfaceOperate('2')">{{$t('button.mater-return')}}</button>
<button class="zd-col-6 btn-submit btn-success" :disabled="disabled" @tap="_surfaceConfirm">{{$t('button.allow-entry')}}</button>
</view>
</view>
</template>

14
pages/SecondPhase/production/ZjCheck.vue
View File

@@ -6,29 +6,29 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">子卷号</span>
<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" />
</view>
</view>
<view class="filter_item">
<view class="filter_label">管制点</view>
<view class="filter_label">{{$t('filter.control-point')}}</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options1" @change="selectChange1"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label">检验结果</view>
<view class="filter_label">{{$t('filter.inspection-results')}}</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
</view>
</view>
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !index1}" :disabled="disabled" @tap="_updatePackageInfo">确认</button>
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !index1}" :disabled="disabled" @tap="_updatePackageInfo">{{$t('button.confirm')}}</button>
</view>
</view>
</template>

24
pages/SecondPhase/production/ZjContainer.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">子卷号</span>
<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" @handleChange="handleChange" />
@@ -18,13 +18,13 @@
<table>
<thead>
<tr>
<th>选择</th>
<th class="th_2">订单号</th>
<th>客户名称</th>
<th>子卷号</th>
<th>子卷规格</th>
<th>子卷重量</th>
<th>子管重量</th>
<th>{{$t('grid.select')}}</th>
<th class="th_2">{{$t('grid.order-number')}}</th>
<th>{{$t('grid.customer-name')}}</th>
<th>{{$t('grid.sub-roll-number')}}</th>
<th>{{$t('grid.sub-roll')}}{{$t('grid.specifications')}}</th>
<th>{{$t('grid.sub-roll')}}{{$t('grid.weight')}}</th>
<th>{{$t('grid.subtube')}}{{$t('grid.weight')}}</th>
<th>木箱料号</th>
</tr>
</thead>
@@ -45,7 +45,7 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !dataList.length}" @tap="toSure">组盘</button>
</view>
<view class="msg_wrapper" :class="show ? 'popshow' : 'pophide'">
@@ -55,7 +55,7 @@
<view :class="!disabled ? 'zd-col-18' : 'zd-col-24'">
<input type="text" placeholder="输入关键字搜索" class="filter_input" :class="{'filter_input_disabled': disabled}" :disabled="disabled" v-model="val2">
</view>
<view v-show="!disabled" class="zd-col-5"><button class="btn-submit btn-success" @tap="_queryBoxSpec">查询</button></view>
<view v-show="!disabled" class="zd-col-5"><button class="btn-submit btn-success" @tap="_queryBoxSpec">{{$t('button.search')}}</button></view>
</view>
</view>
<view class="msg_content msg_content_1 pdb110">
@@ -65,7 +65,7 @@
<thead>
<tr>
<th>木箱规格</th>
<th>物料名称</th>
<th>{{$t('grid.material-name')}}</th>
<th>木箱长度</th>
<th>木箱宽度</th>
<th>木箱高度</th>
@@ -90,7 +90,7 @@
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-success letter-30" @tap="show = false, pkId = '', pkObj = {}">取消</button>
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !pkId}" :disabled="disabled1" @tap="popSure">确定</button>
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !pkId}" :disabled="disabled1" @tap="popSure">{{$t('button.confirm')}}</button>
</view>
</view>
<view v-if="show" class="msg_mask"></view>

8
pages/SecondPhase/production/ZjInStore.vue
View File

@@ -6,7 +6,7 @@
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">子卷号</span>
<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
</view>
<view class="filter_input_wraper">
<search-box v-model="val1" @handleChange="handleChange" />
@@ -27,9 +27,9 @@
<table>
<thead>
<tr>
<th>木箱码</th>
<th>{{$t('filter.box-no')}}</th>
<th>子卷容量</th>
<th>产品描述</th>
<th>{{$t('grid.product-description')}}</th>
<th>sap批次</th>
<th>产品规格(幅宽)</th>
<th>木箱重量</th>
@@ -56,7 +56,7 @@
</view>
</view>
<view class="zd-row submitbar">
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !arr1.length}" :disabled="disabled" @tap="_zjInBoundConfirm">装箱入库</button>
</view>
<up-top ref="UT" :scrollTop="top"></up-top>

11
utils/getData1.js
View File

@@ -142,6 +142,17 @@ export const bakingquery = (pcode) => request({
point_code: pcode
}
})
// 质检不合格
export const inCoolOrOven = (pcode, cname, temp, hours, type) => request({
url: 'api/pda/baking/inCoolOrOven',
data: {
point_code: pcode,
container_name: cname,
temperature: temp,
hours: hours,
type: type,
}
})
/**
* 人工烘烤

22
utils/getData3.js
View File

@@ -558,6 +558,26 @@ export const updatePackagePoint = (ivt, code) => request({
* 分切暂存维护(二期-分切管理)
*/
export const cutCacheInventory = (code, type) => request({
url:'/api/pda/slitter/cutCacheInventory',
url:'api/pda/slitter/cutCacheInventory',
data: {point_code: code, type: type}
})
/**
* 母卷决策
*/
export const bakingReBake = (code, type) => request({
url:'api/pda/baking/reBake',
data: {container_name: code, type: type}
})
/**
* 冷却区生箔详情
*/
export const rawQuery = (pcode, cname, parea, page, size) => request({
url:'api/pda/raw/query',
data: {
point_code: pcode,
container_name: cname,
product_area: parea,
page: page,
size: size
}
})

4
utils/mork2.js
View File

@@ -82,7 +82,9 @@ export const allAuthority = () => {
{menu_id: '8', title: '子卷装箱', path: '/pages/SecondPhase/production/ZjContainer'},
{menu_id: '8', title: '木箱库存', path: '/pages/SecondPhase/production/BoxStock'},
{menu_id: '8', title: '子卷入库', path: '/pages/SecondPhase/production/ZjInStore'},
{menu_id: '8', title: '标签打印', path: '/pages/SecondPhase/production/PrintTable'}
{menu_id: '8', title: '标签打印', path: '/pages/SecondPhase/production/PrintTable'},
{menu_id: '8', title: '母卷决策', path: '/pages/SecondPhase/production/MjMake'},
{menu_id: '8', title: '冷却区生箔详情', path: '/pages/SecondPhase/production/SboCool'}
]},
{menu_id: '5', path: 'RF03', title: '分切管理', sonTree: [
{menu_id: '1', title: '分切上料', path: '/pages/SecondPhase/slitting/SlittingFeeding'},