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

修改

Browse Source
This commit is contained in:
xiangxy
2025-07-01 14:47:32 +08:00
parent f50619c104
commit bdd392402f
8 changed files with 83 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
locale/en-1.json
View File

@@ -80,6 +80,7 @@
"grid.coretype": "Core type", "grid.coretype": "Core type",
"grid.corename": "Core name", "grid.corename": "Core name",
"grid.areaname": "Area name", "grid.areaname": "Area name",
"grid.signnum": "Allocated quantity",
"select.uppershaft": "Upper shaft", "select.uppershaft": "Upper shaft",
"select.lowershaft": "Lower shaft", "select.lowershaft": "Lower shaft",
"select.leftroll": "Left roll", "select.leftroll": "Left roll",

1
locale/id-1.json
View File

@@ -78,6 +78,7 @@
"grid.coretype": "Jenis inti", "grid.coretype": "Jenis inti",
"grid.corename": "Nama inti", "grid.corename": "Nama inti",
"grid.areaname": "Nama daerah", "grid.areaname": "Nama daerah",
"grid.signnum": "Jumlah yang dialokasikan",
"select.uppershaft": "Poros Atas", "select.uppershaft": "Poros Atas",
"select.lowershaft": "Poros bawah", "select.lowershaft": "Poros bawah",
"select.leftroll": "Gulung Kiri", "select.leftroll": "Gulung Kiri",

1
locale/zh-Hans-1.json
View File

@@ -81,6 +81,7 @@
"grid.coretype": "管芯类型", "grid.coretype": "管芯类型",
"grid.corename": "管芯名称", "grid.corename": "管芯名称",
"grid.areaname": "区域名称", "grid.areaname": "区域名称",
"grid.signnum": "已分配数量",
"select.uppershaft": "上轴", "select.uppershaft": "上轴",
"select.lowershaft": "下轴", "select.lowershaft": "下轴",
"select.leftroll": "左卷", "select.leftroll": "左卷",

63
pages/SecondPhase/slitting/PaperBind.vue
View File

@@ -32,12 +32,41 @@
<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select> <uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select>
</view> </view>
</view> </view>
<view class="zd-row">
<view class="zd-col-19">
</view>
<view class="zd-col-4">
<button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd02">{{$t('button.add')}}</button>
</view>
</view>
</view>
<view class="zd_wrapper grid-wraper">
<view class="slide_new slide">
<table>
<thead>
<tr>
<th width="30%">{{$t('filter.pallet-number')}}</th>
<th width="30%">{{$t('filter.tubecode')}}</th>
<th width="20%">{{$t('filter.rownum')}}</th>
<th width="20%">{{$t('filter.colnum')}}</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i">
<td>{{e.vehicle_code}}</td>
<td>{{e.paper_code}}</td>
<td>{{e.row_num}}</td>
<td>{{e.col_num}}</td>
</tr>
</tbody>
</table>
</view>
</view> </view>
</view> </view>
<view class="zd-row submitbar"> <view class="zd-row submitbar">
<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</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': !val1 || !index1 || !index2 || !val3}" :disabled="disabled" @tap="handleConfirm('1')">{{$t('button.bind')}}</button> <button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !dataList.length}" :disabled="disabled" @tap="handleConfirm('1')">{{$t('button.bind')}}</button>
<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index1 || !index2 || !val3}" :disabled="disabled" @tap="handleConfirm('2')">{{$t('button.cleanup')}}</button> <button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !dataList.length}" :disabled="disabled" @tap="handleConfirm('2')">{{$t('button.cleanup')}}</button>
</view> </view>
</view> </view>
</template> </template>
@@ -62,24 +91,14 @@
index1: '', index1: '',
options2: [{value: '1', text: '1'}, {value: '2', text: '2'}, {value: '3', text: '3'}, {value: '4', text: '4'}, {value: '5', text: '5'}], options2: [{value: '1', text: '1'}, {value: '2', text: '2'}, {value: '3', text: '3'}, {value: '4', text: '4'}, {value: '5', text: '5'}],
index2: '', index2: '',
options: [], dataList: [],
newoptions: [],
disabled: false disabled: false
}; };
}, },
onLoad (options) { onLoad (options) {
this.title = options.title this.title = options.title
}, },
created () {
this._queryPaperMaterial()
},
methods: { methods: {
/**查询物料下拉框*/
async _queryPaperMaterial () {
let res = await queryPaperMaterial()
this.options = [...res.rows]
this.newoptions = [...res.rows]
},
/** 选择器 */ /** 选择器 */
selectChange1 (e) { selectChange1 (e) {
this.index1 = e this.index1 = e
@@ -87,11 +106,20 @@
selectChange2 (e) { selectChange2 (e) {
this.index2 = e this.index2 = e
}, },
showSelector () { handleAdd02 () {
this.newoptions = this.options if (!this.val1 || !this.index1 || !this.index2 || !this.val3) {
return
}
if (this.dataList.length > 0 && (this.index1 !== this.dataList[0].row_num)) {
return
}
if (this.dataList.length > 4) {
return
}
this.dataList.push({vehicle_code: this.val1, row_num: this.index1, col_num: this.index2, paper_code: this.val3})
}, },
async handleConfirm(type) { async handleConfirm(type) {
if (!this.val1 || !this.index1 || !this.index2 || !this.val3) { if (!this.dataList.length) {
return return
} }
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
@@ -102,7 +130,7 @@
async _operateIvt (type) { async _operateIvt (type) {
this.disabled = true this.disabled = true
try { try {
let res = await operateIvt(type, this.val1, this.index1, this.index2, this.val3) let res = await operateIvt(type, this.dataList)
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
icon: 'none' icon: 'none'
@@ -118,6 +146,7 @@
this.val3 = '' this.val3 = ''
this.index1 = '' this.index1 = ''
this.index2 = '' this.index2 = ''
this.dataList = []
} }
} }
} }

26
pages/SecondPhase/slitting/SlittingCutting2.vue
View File

@@ -47,9 +47,9 @@
</view> </view>
</view> </view>
</view> </view>
<view class="zd-col-4"> <!-- <view class="zd-col-4">
<button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd">{{$t('button.add')}}</button> <button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd">{{$t('button.add')}}</button>
</view> </view> -->
</view> </view>
<view class="zd-row"> <view class="zd-row">
<view class="zd-col-19"> <view class="zd-col-19">
@@ -162,17 +162,17 @@
radioChange02 (e) { radioChange02 (e) {
this.index02 = e.detail.value this.index02 = e.detail.value
}, },
handleAdd () { // handleAdd () {
if (!this.val1.trim()) { // if (!this.val1.trim()) {
return // return
} // }
const index = this.dataList.findIndex(item => item === this.val1) // const index = this.dataList.findIndex(item => item === this.val1)
if (index !== -1) { // if (index !== -1) {
this.dataList.splice(index, 1) // this.dataList.splice(index, 1)
} // }
this.dataList.push({container_name: this.val1, site: this.index1}) // this.dataList.push({container_name: this.val1, site: this.index1})
this.val1 = '' // this.val1 = ''
}, // },
handleAdd02 () { handleAdd02 () {
if (!this.val1.trim()) { if (!this.val1.trim()) {
return return

21
pages/SecondPhase/slitting/TubeStock.vue
View File

@@ -4,7 +4,7 @@
<nav-bar :title="title"></nav-bar> <nav-bar :title="title"></nav-bar>
<view class="zd_content"> <view class="zd_content">
<view class="zd_wrapper"> <view class="zd_wrapper">
<view class="filter_item"> <view class="filter_item is-required">
<view class="filter_label">{{$t('filter.area')}}</view> <view class="filter_label">{{$t('filter.area')}}</view>
<view class="filter_input_wraper"> <view class="filter_input_wraper">
<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options1" @change="selectChange1"></uni-data-select> <uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options1" @change="selectChange1"></uni-data-select>
@@ -18,6 +18,16 @@
<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select> <uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select>
</view> </view>
</view> </view>
<view class="filter_item is-required">
<view class="filter_label">{{$t('filter.quantity')}}</view>
<view class="filter_input_wraper">
<NumberInput
v-model="val1"
input-class="filter_input"
mode="integer"
/>
</view>
</view>
</view> </view>
<view class="zd_wrapper grid-wraper"> <view class="zd_wrapper grid-wraper">
<view class="slide_new"> <view class="slide_new">
@@ -29,6 +39,7 @@
<th>{{$t('grid.coretype')}}</th> <th>{{$t('grid.coretype')}}</th>
<th>{{$t('grid.corename')}}</th> <th>{{$t('grid.corename')}}</th>
<th>{{$t('filter.quantity')}}</th> <th>{{$t('filter.quantity')}}</th>
<th>{{$t('grid.signnum')}}</th>
<th>{{$t('filter.point')}}</th> <th>{{$t('filter.point')}}</th>
<th>{{$t('filter.area')}}</th> <th>{{$t('filter.area')}}</th>
<th>{{$t('grid.areaname')}}</th> <th>{{$t('grid.areaname')}}</th>
@@ -41,6 +52,7 @@
<td>{{e.material_code}}</td> <td>{{e.material_code}}</td>
<td>{{e.material_name}}</td> <td>{{e.material_name}}</td>
<td>{{e.total_num}}</td> <td>{{e.total_num}}</td>
<td>{{e.sign_num}}</td>
<td>{{e.point_code}}</td> <td>{{e.point_code}}</td>
<td>{{e.product_area}}</td> <td>{{e.product_area}}</td>
<td>{{e.product_area_name}}</td> <td>{{e.product_area_name}}</td>
@@ -52,7 +64,7 @@
</view> </view>
<view class="zd-row submitbar"> <view class="zd-row submitbar">
<button class="zd-col-5 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</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': !index2}" :disabled="disabled" @tap="handleConfirm">{{$t('button.stockup')}}</button> <button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !index1 || !index2}" :disabled="disabled" @tap="handleConfirm">{{$t('button.stockup')}}</button>
<button class="zd-col-8 btn-submit btn-success" @tap="_showPapervehicleView">{{$t('button.refresh')}}</button> <button class="zd-col-8 btn-submit btn-success" @tap="_showPapervehicleView">{{$t('button.refresh')}}</button>
</view> </view>
<up-top ref="UT" :scrollTop="top"></up-top> <up-top ref="UT" :scrollTop="top"></up-top>
@@ -73,6 +85,7 @@
}, },
data() { data() {
return { return {
val1: '',
pkId: '', pkId: '',
pkObj: {}, pkObj: {},
// val3: '', // val3: '',
@@ -126,7 +139,7 @@
this.dataList = [...res.rows] this.dataList = [...res.rows]
}, },
async handleConfirm() { async handleConfirm() {
if (!this.index1 || !this.index2) { if (this.val1 || !this.index1 || !this.index2) {
return return
} }
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
@@ -161,7 +174,7 @@
this.disabled = false this.disabled = false
}, },
async _showPapervehicleView () { async _showPapervehicleView () {
let res = await showPapervehicleView(this.index1, this.index2) let res = await showPapervehicleView(this.index1, this.index2, this.val1)
if (res) { if (res) {
this.dataList = [...res.rows] this.dataList = [...res.rows]
} }

4
utils/getData3.js
View File

@@ -162,9 +162,9 @@ export const updatePackageInfo2 = (ivt, cn, code) => request({
/** /**
* 纸管绑定 * 纸管绑定
*/ */
export const operateIvt = (type, vcode, rnum, cnum, pcode) => request({ export const operateIvt = (type, rows) => request({
url:'api/pda/stockingivt/operateIvt', url:'api/pda/stockingivt/operateIvt',
data: {type: type, vehicle_code: vcode, row_num: rnum, col_num: cnum, paper_code: pcode} data: {type: type, rows: rows}
}) })
/** /**
* 分切暂存下料纸管绑定 * 分切暂存下料纸管绑定

3
utils/getData4.js
View File

@@ -3,11 +3,12 @@ import request from './request.js'
* add * add
*/ */
// 管芯备货-查询管芯库存 // 管芯备货-查询管芯库存
export const showPapervehicleView = (area, code) => request({ export const showPapervehicleView = (area, code, qty) => request({
url:'api/pda/stockingivt/showPapervehicleView', url:'api/pda/stockingivt/showPapervehicleView',
data: { data: {
product_area: area, product_area: area,
material_code: code, material_code: code,
material_qty: qty
} }
}) })
// 管芯备货-备货 // 管芯备货-备货