From c0fe59c6cf05c22a6507c8e34d7f51550acfec10 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期四, 09 十一月 2023 17:52:20 +0800
Subject: [PATCH] 首检巡检
---
pages/inspection/inspectionInfo.vue | 287 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 204 insertions(+), 83 deletions(-)
diff --git a/pages/inspection/inspectionInfo.vue b/pages/inspection/inspectionInfo.vue
index 5d02df2..8510821 100644
--- a/pages/inspection/inspectionInfo.vue
+++ b/pages/inspection/inspectionInfo.vue
@@ -2,62 +2,72 @@
<view>
<view>
<uni-card>
- <u-row customStyle="margin-bottom: 10px">
- <u-col span="2">
- <label>妫�楠屽崟鍙�:</label>
- </u-col>
- <u-col span="4">
- <label>{{item.TASK_NO}}</label>
- </u-col>
- </u-row>
- <u-row customStyle="margin-bottom: 10px">
- <u-col span="2">
- <label>鏈哄彴鍙�:</label>
- </u-col>
- <u-col span="4">
- <label>{{item.MACHINE_NO}}</label>
- </u-col>
- </u-row>
- <u-row customStyle="margin-bottom: 10px">
- <u-col span="2">
- <label>宸ュ簭鍚嶇О:</label>
- </u-col>
- <u-col span="4">
- <label>{{item.PROC_NAME}}</label>
- </u-col>
- </u-row>
- <u-row customStyle="margin-bottom: 10px">
- <u-col span="2">
- <label>浜у搧鍚嶇О:</label>
- </u-col>
- <u-col span="4">
- <label>{{item.ITEM_NAME}}</label>
- </u-col>
- </u-row>
- <u-row customStyle="margin-bottom: 10px">
- <u-col span="2">
- <label>浜у搧缂栧彿:</label>
- </u-col>
- <u-col span="4">
- <label>{{item.ITEM_NO}}</label>
- </u-col>
- </u-row>
- <u-row customStyle="margin-bottom: 10px">
- <u-col span="2">
- <label>妫�楠屽憳:</label>
- </u-col>
- <u-col span="4">
- <label>{{name}}</label>
- </u-col>
- </u-row>
- <u-row customStyle="margin-bottom: 10px">
- <u-col span="2">
- <label>妫�楠岀被鍨�</label>
- </u-col>
- <u-col span="4">
- <label>{{item.REMEKE}}</label>
- </u-col>
- </u-row>
+ <view :class="new Date().getTime()-new Date(item.BEGIN_TIME).getTime()>7200000?'red':''">
+ <u-row customStyle="margin-bottom: 10px">
+ <u-col span="2">
+ <label>妫�楠屽崟鍙�:</label>
+ </u-col>
+ <u-col span="4">
+ <label>{{item.TASK_NO}}</label>
+ </u-col>
+ </u-row>
+ <u-row customStyle="margin-bottom: 10px">
+ <u-col span="2">
+ <label>鏈哄彴鍙�:</label>
+ </u-col>
+ <u-col span="4">
+ <label>{{item.MACHINE_NO}}</label>
+ </u-col>
+ </u-row>
+ <u-row customStyle="margin-bottom: 10px" v-if="item.PROC_NAME">
+ <u-col span="2">
+ <label>宸ュ簭鍚嶇О:</label>
+ </u-col>
+ <u-col span="4">
+ <label>{{item.PROC_NAME}}</label>
+ </u-col>
+ </u-row>
+ <u-row customStyle="margin-bottom: 10px">
+ <u-col span="2">
+ <label>浜у搧鍚嶇О:</label>
+ </u-col>
+ <u-col span="4">
+ <label>{{item.ITEM_NO}} | {{item.ITEM_NAME}}</label>
+ </u-col>
+ </u-row>
+ <u-row customStyle="margin-bottom: 10px">
+ <u-col span="2">
+ <label>鍥惧彿棰滆壊:</label>
+ </u-col>
+ <u-col>
+ <label>{{item.ENGINEERING_NO}} / {{item.COLOR_NAME}}</label>
+ </u-col>
+ </u-row>
+ <u-row customStyle="margin-bottom: 10px">
+ <u-col span="2">
+ <label>瑙勬牸鏉愯川:</label>
+ </u-col>
+ <u-col>
+ <label>{{item.MODEL}} / {{item.MATERIAL}}</label>
+ </u-col>
+ </u-row>
+ <u-row customStyle="margin-bottom: 10px">
+ <u-col span="2">
+ <label>妫�楠屽憳:</label>
+ </u-col>
+ <u-col span="4">
+ <label>{{name}}</label>
+ </u-col>
+ </u-row>
+ <u-row customStyle="margin-bottom: 10px">
+ <u-col span="2">
+ <label>妫�楠岀被鍨�</label>
+ </u-col>
+ <u-col span="4">
+ <label>{{item.FTYPE}}</label>
+ </u-col>
+ </u-row>
+ </view>
</uni-card>
</view>
@@ -65,17 +75,19 @@
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" style="margin-left: 5px;margin-right: 5px;">
<!-- 琛ㄥご琛� -->
<uni-tr>
- <uni-th align="center" width="80">妫�楠岄」鐩�</uni-th>
- <uni-th align="left" width="100">妫�楠屽伐鍏�</uni-th>
- <uni-th align="left" width="180">澶囨敞</uni-th>
- <uni-th align="left" width="30">妫�楠屾暟閲�</uni-th>
- <uni-th align="left" width="80">涓婇檺鍊�</uni-th>
- <uni-th align="left" width="80">涓嬮檺鍊�</uni-th>
- <uni-th align="left" width="100">妫�楠屽��</uni-th>
- <uni-th align="left" width="80">妫�楠岀粨鏋�</uni-th>
+ <uni-th align="center" width="60">妫�楠岄」鐩�</uni-th>
+ <uni-th align="center" width="80">妫�楠屽伐鍏�</uni-th>
+ <uni-th align="center" width="140">瑙勬牸</uni-th>
+ <uni-th align="center" width="40">妫�楠屾暟閲�</uni-th>
+ <uni-th align="center" width="60">涓婇檺鍊�</uni-th>
+ <uni-th align="center" width="60">涓嬮檺鍊�</uni-th>
+ <uni-th align="center" width="80">妫�楠屽��</uni-th>
+ <uni-th align="center" width="75">妫�楠岀粨鏋�</uni-th>
+ <uni-th align="center" width="80">涓嶈壇鍘熷洜</uni-th>
+ <uni-th align="center" width="80">澶囨敞</uni-th>
</uni-tr>
<!-- 琛ㄦ牸鏁版嵁琛� -->
- <uni-tr v-for="item in table">
+ <uni-tr v-for="(item,index) in table">
<uni-td>{{item.CHECK_ITEM}}</uni-td>
<uni-td>{{item.CHECK_TOOL}}</uni-td>
<uni-td>{{item.SPECIFICATION}}</uni-td>
@@ -89,29 +101,52 @@
</uni-td>
<uni-td>
<u-tag
- v-if="item.UP_ALLOW && item.VALUE <= item.UP_ALLOW && item.VALUE >= item.DOWN_ALLOW || !item.UP_ALLOW && item.VALUE == '鍚堟牸'"
+ v-if="item.UP_ALLOW && (item.VALUE <= item.UP_ALLOW && item.VALUE >= item.DOWN_ALLOW) || !item.UP_ALLOW && item.VALUE == '鍚堟牸'"
text="鍚堟牸" type="success"></u-tag>
<u-tag
v-if="item.UP_ALLOW && (item.VALUE > item.UP_ALLOW || item.VALUE < item.DOWN_ALLOW) || !item.UP_ALLOW && item.VALUE == '涓嶅悎鏍�'"
text="涓嶅悎鏍�" type="error"></u-tag>
</uni-td>
+ <uni-td>
+ <view class="content" @click="useOutClickSide">
+ <easy-select ref="easySelect" size="medium" :value="item.BAD_REASON" @selectOne="selectOne($event,index)"></easy-select>
+ </view>
+ </uni-td>
+ <uni-td>
+ <u--textarea height="40px" v-model="item.MEMO" placeholder="璇疯緭鍏ュ唴瀹�"></u--textarea>
+ </uni-td>
</uni-tr>
</uni-table>
</view>
- <u-button text="鎻愪氦" type="primary" style="position: absolute;bottom:0;" @click="submit()"></u-button>
+ <view style="margin-top: 10px;">
+ <u-row style="margin-bottom: 5px;">
+ <u--text type="info" text="澶囨敞"></u--text>
+ </u-row>
+ <u-row>
+ <u--textarea v-model="remeke" placeholder="璇疯緭鍏ュ唴瀹�"></u--textarea>
+ </u-row>
+ </view>
+ <u-button text="鎻愪氦" type="primary" style="margin-top: 10px;" @click="submit()"></u-button>
+ <u-toast ref="uToast" />
</view>
</template>
<script>
import {
- getInspectionInfo, saveInspectionInfo
+ getInspectionInfo,
+ saveInspectionInfo
} from '../../api/inspection';
+ import {
+ baseUrl
+ } from '../../config.js'
export default {
data() {
return {
item: {},
table: [],
- name:''
+ name: '',
+ remeke: '',
+ show: false
}
},
onLoad(option) {
@@ -120,26 +155,65 @@
this.getInspection(item.CHECK_NO)
this.name = uni.getStorageSync('userInfo').username
},
+ onNavigationBarButtonTap(e) {
+ let that = this
+ uni.chooseImage({
+ count: 1,
+ sizeType: ['original', 'compressed'],
+ sourceType: ['camera'],
+ success: chooseImage => {
+ const tempFilePaths = chooseImage.tempFilePaths;
+ uni.uploadFile({
+ url: 'http://183.249.77.50:8008' + '/hkFile/upload?mid=' + that.item.CHECK_NO +
+ '&username=' + uni.getStorageSync('userInfo').code,
+ filePath: tempFilePaths[0],
+ name: 'file',
+ success: (uploadFileRes) => {
+ console.log(uploadFileRes.data);
+
+ },
+ fail: (res) => {
+ console.log(res)
+ }
+ });
+ }
+ })
+ },
methods: {
getInspection(chenkNo) {
getInspectionInfo(chenkNo).then(res => {
- // this.table = res.data
for (let item of res.data) {
- for (let i = 0; i < parseInt(item.CHECK_NUM); i++) {
- let insert = JSON.parse(JSON.stringify(item))
-
- insert.CHECK_ITEM = insert.CHECK_ITEM + '-' + i
- if (!insert.UP_ALLOW) {
- insert.VALUE = '鍚堟牸'
- } else {
- insert.VALUE = 0
- }
- this.table.push(insert)
+ // for (let i = 0; i < parseInt(item.CHECK_NUM); i++) {
+ // let insert = JSON.parse(JSON.stringify(item))
+
+ // insert.CHECK_ITEM = insert.CHECK_ITEM + '-' + i
+ // if (!insert.UP_ALLOW) {
+ // insert.VALUE = '鍚堟牸'
+ // } else {
+ // insert.VALUE = null
+ // }
+ // this.table.push(insert)
+ // }
+ if (!item.UP_ALLOW) {
+ item.VALUE = '鍚堟牸'
+ } else {
+ item.VALUE = null
}
+
+ this.table.push(item)
}
+ console.log(this.table)
})
},
+ selectOne(options,index) {
+ this.table[index].BAD_REASON = options.label
+ console.log(options.label);
+ },
+ useOutClickSide() {
+ this.$refs.easySelect.hideOptions && this.$refs.easySelect.hideOptions()
+ },
changeSwitch(item) {
+ console.log(item)
if (item.VALUE == '鍚堟牸') {
item.VALUE = '涓嶅悎鏍�'
} else {
@@ -147,9 +221,53 @@
}
},
submit() {
- saveInspectionInfo(this.item.CHECK_NO,this.table).then(res => {
- console.log(res)
- })
+ if(this.table.length==0){
+ this.$refs.uToast.show({
+ message: "鎻愪氦澶辫触锛岃缁存姢妫�楠岄」鐩�",
+ type: 'error'
+ })
+ return
+ }else{
+ if(this.check()) {
+ saveInspectionInfo(this.item.CHECK_NO, this.table, this.remeke).then(res => {
+ if(!res.result) {
+ this.$refs.uToast.show({
+ message: res.msg,
+ type: 'error'
+ })
+ return
+ }else{
+ // this.$refs.uToast.show({
+ // message: "鎻愪氦鎴愬姛",
+ // type: 'success'
+ // })
+ let pages=getCurrentPages();
+ let beforePage=pages[pages.length-2];
+ uni.navigateBack({
+ delta: 1, //杩斿洖鐨勯〉闈㈡暟锛屽鏋滀负1琛ㄧず杩斿洖涓婁竴椤�
+ success: (event)=> {
+ console.log('鎻愪氦鎴愬姛');
+ beforePage.$vm.reload()
+ }
+ });
+ }
+ })
+ return
+ }
+ this.$refs.uToast.show({
+ message: '鏈夋楠岄」鐩湭褰曞叆瀹屾暣娴嬭瘯缁撴灉锛�',
+ type: 'error'
+ })
+ return
+ }
+ },
+ check() {
+ for(let item of this.table) {
+ if(item.VALUE === null) {
+ return false
+ }
+ }
+ return true
}
}
}
@@ -180,4 +298,7 @@
.text {
font-size: x-large;
}
+ .red{
+ color: red;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3