diff --git a/common/style/layout.styl b/common/style/layout.styl index db7c483..994cb79 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -360,6 +360,21 @@ uni-button:after { .slide_new table tr.checked td:last-child { border-right: 1rpx solid #6798ef; } +.slide table { + table-layout: auto; + width: 100%; +} +.slide table th:first-child, .slide table td:first-child { + box-shadow: none; +} +.slide table td { + line-height: 28rpx; + padding: 6rpx 20rpx; + white-space: normal; +} +.mini-btn { + padding: 0 20rpx !important; +} /** 提交栏 **/ .submitbar { diff --git a/main.js b/main.js index 1abc647..0315621 100644 --- a/main.js +++ b/main.js @@ -25,6 +25,12 @@ Vue.directive('enterNumber', { } }); +Vue.filter('findByValue', (array, value) => { + if (!Array.isArray(array)) return '' + const item = array.find(item => item.value === value) + return item ? item.text : '' +}); + import store from '@/vuex/store.js' const app = new Vue({ diff --git a/manifest.json b/manifest.json index dd5906a..0b22a02 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "海亮铜箔", "appid" : "__UNI__3A002CD", "description" : "海亮铜箔二期手持系统", - "versionName" : "1.1.9", - "versionCode" : 119, + "versionName" : "1.2.0", + "versionCode" : 120, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/SecondPhase/slitting/CallAxisSeq.vue b/pages/SecondPhase/slitting/CallAxisSeq.vue index ef50d83..0913e74 100644 --- a/pages/SecondPhase/slitting/CallAxisSeq.vue +++ b/pages/SecondPhase/slitting/CallAxisSeq.vue @@ -73,7 +73,7 @@ async _showManualView () { let res = await showManualView() if (res) { - this.dataList = [...res.data] + this.dataList = [...res] } } } diff --git a/pages/SecondPhase/slitting/CallShaft.vue b/pages/SecondPhase/slitting/CallShaft.vue index 5617db3..21235c0 100644 --- a/pages/SecondPhase/slitting/CallShaft.vue +++ b/pages/SecondPhase/slitting/CallShaft.vue @@ -265,7 +265,7 @@ async _showManualView () { let res = await showManualView() if (res) { - this.dataList = [...res.data] + this.dataList = [...res] } } } diff --git a/pages/SecondPhase/slitting/SlittingCutting2.vue b/pages/SecondPhase/slitting/SlittingCutting2.vue index 3e69c4a..371f5df 100644 --- a/pages/SecondPhase/slitting/SlittingCutting2.vue +++ b/pages/SecondPhase/slitting/SlittingCutting2.vue @@ -16,31 +16,52 @@ + + 子卷号 - + - 添加 + + + + + 轴位置 + + + + + {{item.text}} + + + + + + + 添加 + - + - 子卷号 - 操作 + 子卷号 + 轴位置 + 操作 - {{e}} - 删除 + {{e.container_name}} + {{ options1 | findByValue(e.site)}} + 删除 @@ -71,6 +92,9 @@ index: '', options2: [], index2: '', + options1: [{value: '1', text: '上轴'}, {value: '2', text: '下轴'}], + index1: '1', + current: 0, val1: '', dataList: [], disabled: false @@ -103,6 +127,9 @@ selectChange (e) { this.index = e }, + radioChange (e) { + this.index1 = e.detail.value + }, handleAdd () { if (!this.val1.trim()) { return @@ -111,7 +138,7 @@ if (index !== -1) { this.dataList.splice(index, 1) } - this.dataList.push(this.val1) + this.dataList.push({container_name: this.val1, site: this.index1}) this.val1 = '' }, handleDelete (index) { @@ -145,10 +172,4 @@ } } } - - - \ No newline at end of file + \ No newline at end of file