From a89fe32c353040bbb95d7519cf7bafc4b5934f10 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 06 九月 2023 09:54:14 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue | 11
minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue | 248 +++++++++++++---------
minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue | 299 +++++++++++++++++++--------
minipro_standard/pages/index/index.vue | 40 +--
minipro_standard/common/config.js | 4
minipro_standard/util/utils.js | 19 +
minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue | 9
7 files changed, 405 insertions(+), 225 deletions(-)
diff --git a/minipro_standard/common/config.js b/minipro_standard/common/config.js
index 062a83a..fced58f 100644
--- a/minipro_standard/common/config.js
+++ b/minipro_standard/common/config.js
@@ -1,8 +1,8 @@
module.exports = {
// baseUrl: 'http://106.14.20.42/test_hfznzz/',
// baseUrl: 'https://hefei.dtkey.cn/test_hfznzz/',
- // baseUrl: 'http://192.168.0.15:10021',
- baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
+ baseUrl: 'http://192.168.0.15:10021',
+ // baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
phoneRegular: /^1[3456789]\d{9}$/,
mailboxRegular: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
positiveInteger: /^[0-9]*[1-9][0-9]*$/,
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 2c7dd0c..97d5592 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -21,10 +21,9 @@
</view>
</view>
</u-sticky>
- <scroll-view v-if="projectList.length" :style="windowHeight - (statusbarHeight + navHeight + 120) + 'px'"
- scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
- refresher-background="lightgreen" @refresherpulling="scrolltolower" @refresherrefresh="scrolltoupper"
- @refresherrestore="onRestore" @refresherabort="onAbort">
+ <scroll-view v-if="projectList.length" scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered"
+ :refresher-threshold="100" @refresherpulling="scrolltolower" @refresherrefresh="scrolltoupper"
+ >
<view v-for="(item, index) in projectList" :key="index">
<view class="box_list">
<view class="box_list_item" @click="jump(item)">
@@ -182,13 +181,6 @@
})
},
- onRestore() {
- this.triggered = 'restore'; // 闇�瑕侀噸缃�
- console.log("onRestore");
- },
- onAbort() {
- console.log("onAbort");
- },
scrolltolower() {
this.page.page = 1
this.loadData()
@@ -203,15 +195,15 @@
this.scrolltolower()
},
jump(item) {
- if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 璺宠浆鍑哄簱(杞簱鍗�)
- uni.navigateTo({
- url: 'pages/OutOperation/OutOperation',
+ if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 璺宠浆鍑哄簱(杞簱鍗�)
+ uni.navigateTo({
+ url: 'pages/OutOperation/OutOperation',
query: {
id: item.objId,
dbid: item.id,
type: 7
- }
- })
+ }
+ })
// router.push({
// name: 'issueOperation',
// query: {
@@ -243,14 +235,14 @@
// }
// })
return
- }
- uni.navigateTo({
- url: '/pages/InOperation/InOperation',
- query: {
- id: item.objId,
- dbid: item.id,
- type: 7
- }
+ }
+ uni.navigateTo({
+ url: '/pages/InOperation/InOperation',
+ query: {
+ id: item.objId,
+ dbid: item.id,
+ type: 7
+ }
})
// router.push({
// name: 'warehousing',
diff --git a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue b/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
index 35ea422..50dc001 100644
--- a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
+++ b/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
@@ -180,8 +180,18 @@
</div>
<div class="details_dj" v-if="typeView === 1">
- <div class="details_dj_list">
- <u-swipe-action>
+ <div class="details_dj_list">
+ <scroll-view scroll-y="true" refresher-enabled="true" @scrolltolower="getLists">
+ <u-swipe-action v-for="(item, index) in djData" :key="index">
+ <u-swipe-action-item :options="options" @click="dele(item.id)">
+ <div class="details_dj_list_item">
+ <span>{{ item.attrName }}锛歿{ item.val }}</span>
+ <span>{{ item.userName }} {{ item.createTime }}</span>
+ </div>
+ </u-swipe-action-item>
+ </u-swipe-action>
+ </scroll-view>
+ <!-- <u-swipe-action>
<u-swipe-action-item v-for="(item, index) in djData" :key="index" :options="options"
@click="dele(item.id)">
<div class="details_dj_list_item">
@@ -189,7 +199,7 @@
<span>{{ item.userName }} {{ item.createTime }}</span>
</div>
</u-swipe-action-item>
- </u-swipe-action>
+ </u-swipe-action> -->
</div>
</div>
<!-- v-if="info.status === 2 || info.procedureNeedcheck === 1" -->
@@ -234,23 +244,41 @@
<script>
import workOrderInfo from '@/components/workOrderInfo.vue'
import {
+ getBarcodeContent,
queryById,
+ getOrocessRecord,
+ deleteCT,
+ updateById,
+ comfirmDone,
+ comfirmDoneStandard,
+ getListByCondition,
+ allForStandard,
+ pageDJ,
+ deletedj,
+ dealWorkorderRecordStandard,
+ getWorkorderRecordListStandard,
createMaterial,
createMaterialStandard
- } from '@/util/api/WorkOrderAPI'
+ } from '@/util/api/WorkOrderAPI'
+ import {
+ categoryExtList,
+ queryOne,
+ queryList
+ } from '@/util/api/PlanningAPI'
+ import { REGULAR } from '@/util/utils'
export default {
components: {
workOrderInfo
},
data() {
- return {
+ return {
+ workorderId: '',
cate: [{
name: '鐢熶骇'
},
{
name: '鐐规'
- }
- ],
+ }],
form: {
time: '',
efective: [],
@@ -264,35 +292,14 @@
TimeShow: false,
badShow: false,
typeView: 0,
- feedingData: [{
- id: 0,
- materialName: '澧欎綋鐮�',
- procedureName: '鍘嬪埗',
- qualityType: 1,
- locationName: 'CP-01',
- batch: '20230713',
- num: 2,
- maxNum: 10,
- unitAttribute: 1,
- unitName: '鍧�'
- }],
+ feedingData: [],
options: [{
text: '鍒犻櫎',
style: {
backgroundColor: 'red',
}
}],
- arrType: [{
- name: '璁℃椂',
- type: 1,
- salary: 1000,
- },
- {
- name: '璁′欢',
- type: 0,
- salary: 100
- },
- ],
+ arrType: [],
// 浜у嚭鍚堟牸/涓嶈壇
produceFrom: {
qualifiedId: '',
@@ -300,18 +307,22 @@
undesirableId: '',
undesirable: 5 // 涓嶈壇
},
- djData: [{
- attrName: '鍑烘按鏃堕棿',
- val: '2022-05-28 16:3',
- userName: '寮犱笁 ',
- createTime: '2022-05-28 16:32:'
- }],
- cateList: [{
- active: false,
- name: '姣涘埡',
- num: 0
- }]
+ djData: [],
+ cateList: [],
+ finished: true,
};
+ },
+ onLoad(obj) {
+ this.workorderId = obj.id
+ this.queryByIds()
+ this.getOrocessRecords()
+ this.getData()
+ uni.$on('spotAdd', () => {
+ if (this.typeView == 1) {
+ this.pages.page = 1
+ this.pageDJs()
+ }
+ })
},
computed: {
expectedSalary() {
@@ -354,22 +365,35 @@
}
}
},
- onLoad(obj) {
- this.workorderId = obj.id
- queryById(this.workorderId)
- .then(res => {
+ methods: {
+ getData() {
+ categoryExtList({
+ cateType: "3"
+ }).then(res => {
if (res.code === 200) {
- this.info = res.data
- this.deviceId = res.data.pgmodel.id
+ res.data.forEach(item => {
+ item.active = false
+ item.num = ''
+ })
+ this.cateList = res.data
}
})
- },
- methods: {
- click() {
-
},
clickIten(index) {
- this.typeView = index
+ this.typeView = index
+ if (this.typeView == 1) {
+ this.pages.page = 1
+ this.finished = true
+ this.pageDJs()
+ }
+ },
+ getLists() {
+ if (!this.finished) {
+ return
+ }
+ this.finished = false
+ this.pages.page += 1
+ this.pageDJs()
},
timeConfirm({
value
@@ -394,69 +418,166 @@
if (type === 'T') {
if (unitAttribute == 0 && num != '') {
if (!REGULAR.positiveInteger.test(num)) {
- obj.num = obj.ynum
- Toast({
- message: '鍙兘杈撳叆姝ｆ暣鏁�'
- })
+ obj.num = obj.ynum
+ uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁�')
return
}
}
if (unitAttribute == 1 && num != '') {
- if (!REGULAR.number.test(num)) {
- Toast({
- message: '鍙兘杈撳叆姝ｆ暣鏁版垨灏忔暟锛堟渶澶氬洓浣嶏級'
- })
+ if (!REGULAR.number.test(num)) {
+ uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁版垨灏忔暟锛堟渶澶氬洓浣嶏級')
+
obj.num = obj.ynum
return
}
}
if (num > maxNum) {
- obj.num = obj.ynum
- Toast.fail({
- message: '瓒呭嚭宸ヨ鎬绘暟'
- })
+ obj.num = obj.ynum
+ uni.$u.toast('瓒呭嚭宸ヨ鎬绘暟')
+
return
}
} else if (type === 'C' && num > info.value.planNum) {
- obj.num = obj.ynum
- Toast.fail({
- message: '浜у嚭鏁伴噺涓嶈兘瓒呰繃璁″垝鏁伴噺'
- })
+ obj.num = obj.ynum
+ uni.$u.toast('浜у嚭鏁伴噺涓嶈兘瓒呰繃璁″垝鏁伴噺')
+
return
}
- // updateById({ id, num }).then(res => {
- // if (res.code === 200 && type === 'T') {
- // getOrocessRecords()
- // } else if (res.code === 200 && type === 'C') {
- // // getOrocessRecordCC()
- // }
- // })
+
},
clickPerformanceType(item, index) {
this.form.index = index
this.form.type = item.type
},
- submit() {},
- jumpdj() {},
- pageDJs() {},
+ submit() {
+
+ },
+ jumpdj() {
+ uni.navigateTo({
+ url: `/pages_adjust/pages/spotCheck/spotCheck?id=${this.workorderId}`
+ })
+ },
+ pageDJs() {
+ pageDJ({
+ capacity: this.pages.capacity,
+ page: this.pages.page,
+ model: {
+ workorderId: this.workorderId
+ }
+ }).then(res => {
+ let {data} = res
+ if (data.page == 1) {
+ this.djData = []
+ }
+ this.djData.push(...data.records)
+ // loading.value = false
+ }).catch(err => {
+ // loading.value = false
+ // finished.value = true
+ })
+ .finally(() => {
+ this.finished = true
+ })
+ },
dele(id) {
- // deletedj(id)
- // .then(res => {
- // if (res.code === 200) {
- // djData.value = []
- // finished.value = false
- // page.page = 1
- // djData.value = []
- // pageDJs()
- // }
- // })
+ deletedj(id)
+ .then(res => {
+ if (res.code === 200) {
+ this.finished = false
+ this.pages.page = 1
+ this.pageDJs()
+ }
+ })
},
confirm() {
- // console.log('confirm');
+ let isOpen = false
+ this.cateList.forEach((item, index) => {
+ if (item.active) {
+ isOpen = true
+ }
+ })
+ if (!isOpen) {
+ uni.showToast({
+ title: '璇烽�夋嫨涓嶈壇椤�',
+ duration: 2000,
+ icon: 'none'
+ })
+ return
+ }
+ let arr = []
+ let total = 0
+ let name = ''
+ this.cateList.forEach((item, index) => {
+ if (item.active) {
+ if (item.num <= 0) {
+ uni.showToast({
+ title: '涓嶈壇鏁伴噺蹇呴』澶т簬0',
+ duration: 2000,
+ icon: 'none'
+ })
+ return
+ }
+ total = total += item.num
+ arr.push(item)
+ name += item.name + item.num + '锛�'
+ }
+ })
+ if (total != Number(this.produceFrom.undesirable)) {
+ uni.showToast({
+ title: '涓嶈壇鏁板繀椤荤瓑浜庝骇鍑轰笉鑹暟',
+ duration: 2000,
+ icon: 'none'
+ })
+ return
+ }
+ this.form.defective = arr
+ this.form.defectiveName = name
this.badShow = false
},
changeChecked(i) {
this.cateList[i].active = !this.cateList[i].active
+ },
+ queryByIds() {
+ queryById(this.workorderId)
+ .then(res => {
+ this.info = res.data
+ queryList({
+ deleted: 0,
+ departId: res.data.factoryId,
+ materialId: res.data.materialId,
+ procedureId: res.data.procedureId
+ }).then(result => {
+ if (result.code === 200) {
+ if (result.data && result.data.length > 0) {
+ result.data.forEach((item, index) => {
+ item.name = item.type == 0 ? '璁′欢' : '璁℃椂'
+ item.id = item.type
+ item.active = index == 0
+ })
+ this.arrType = result.data
+ } else {
+ this.arrType = []
+ }
+ }
+ })
+ })
+ },
+ getOrocessRecords() {
+ this.feedingData = []
+ allForStandard({
+ workorderId: this.workorderId,
+ type: 0
+ }).then(res => {
+ if (res.code === 200) {
+ this.feedingData = res.data
+ }
+ })
+ },
+ jumpTL() {
+ uni.navigateTo({
+ // url: ''
+ url: `/pages_adjust/pages/manualFeed/manualFeed?id=${this.workorderId}`
+ })
}
}
}
diff --git a/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue b/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue
index ea8d89a..d798f56 100644
--- a/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue
+++ b/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue
@@ -33,8 +33,8 @@
<div class="tl_list_item" v-else-if="item.type === 0">
<div class="tl_list_item_label">灞炴�у��</div>
<div class="tl_list_item_go">
- <u-radio-group v-model="item.num" placement="row">
- <u-radio v-for="(item1, i) in item.data" :key="i" activeColor="#4275FC" :label="item1">
+ <u-radio-group v-model="item.num" placement="row" @change="radioSelect">
+ <u-radio v-for="(item1, i) in item.data" :key="i" activeColor="#4275FC" :name="item1" :label="item1">
</u-radio>
</u-radio-group>
<!-- <van-radio-group v-model="item.num" direction="horizontal">
@@ -265,12 +265,16 @@
return
}
this.formList.splice(index, 1)
+ },
+ radioSelect(v) {
+ console.log(v);
},
submit() {
let isOpen = true
let attrList = []
- this.formList.forEach(item => {
+ this.formList.forEach(item => {
+ console.log('-------', item);
if (item.type === 1) {
if (item.attribute === '' || item.num.length === 0) {
isOpen = false
@@ -303,6 +307,7 @@
id: this.workOrderId
}).then(res => {
if (res.code === 200) {
+ uni.$emit('spotAdd')
uni.$u.toast('鍒涘缓鎴愬姛')
setTimeout(() => {
uni.navigateBack()
diff --git a/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue b/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue
index 8999981..32d93bc 100644
--- a/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue
@@ -97,13 +97,8 @@
<script>
import Search from '@/components/Search.vue'
import LabelSelection from '@/components/LabelSelection.vue'
- import {
- orderTyepToStr
- } from '@/util/constData.js'
- import {
- getBoundList,
- pageCount
- } from "@/util/api/materialStorage";
+ import { getBoundList, pageCount } from "@/util/api/materialStorage";
+ import { orderTyepToStr } from '@/util/constData.js'
export default {
components: {
Search,
diff --git a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
index a3859e1..192b5f4 100644
--- a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
+++ b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
@@ -172,21 +172,20 @@
</div>
</div>
</div>
-
</div>
<div class="details_dj" v-if="typeView === 1">
- <div class="details_dj_list">
-
- <u-swipe-action>
- <u-swipe-action-item v-for="(item, index) in djData" :key="index" :options="options"
- @click="dele(item.id)">
- <div class="details_dj_list_item">
- <span>{{ item.attrName }}锛歿{ item.val }}</span>
- <span>{{ item.userName }} {{ item.createTime }}</span>
- </div>
- </u-swipe-action-item>
- </u-swipe-action>
+ <div class="details_dj_list">
+ <scroll-view scroll-y="true" refresher-enabled="true" @scrolltolower="getLists">
+ <u-swipe-action v-for="(item, index) in djData" :key="index">
+ <u-swipe-action-item :options="options" @click="dele(item.id)">
+ <div class="details_dj_list_item">
+ <span>{{ item.attrName }}锛歿{ item.val }}</span>
+ <span>{{ item.userName }} {{ item.createTime }}</span>
+ </div>
+ </u-swipe-action-item>
+ </u-swipe-action>
+ </scroll-view>
</div>
</div>
<!-- v-if="info.status === 2 || info.procedureNeedcheck === 1" -->
@@ -248,7 +247,8 @@
categoryExtList,
queryOne,
queryList
- } from '@/util/api/PlanningAPI'
+ } from '@/util/api/PlanningAPI'
+ import { REGULAR } from '@/util/utils'
export default {
components: {
workOrderInfo
@@ -264,7 +264,7 @@
],
form: {
time: '',
- efective: [],
+ defective: [],
defectiveName: '',
durationName: '0灏忔椂0鍒嗛挓',
duration: 0,
@@ -276,37 +276,14 @@
typeView: 0,
workorderId: '',
info: {},
- feedingData: [
- // {
- // id: 0,
- // materialName: '澧欎綋鐮�',
- // procedureName: '鍘嬪埗',
- // qualityType: 1,
- // locationName: 'CP-01',
- // batch: '20230713',
- // num: 2,
- // maxNum: 10,
- // unitAttribute: 1,
- // unitName: '鍧�'
- // },
- ],
+ feedingData: [],
options: [{
text: '鍒犻櫎',
style: {
backgroundColor: 'red',
}
}],
- arrType: [{
- name: '璁℃椂',
- type: 1,
- salary: 1000,
- },
- {
- name: '璁′欢',
- type: 0,
- salary: 100
- },
- ],
+ arrType: [],
// 浜у嚭鍚堟牸/涓嶈壇
produceFrom: {
qualifiedId: '',
@@ -314,23 +291,14 @@
undesirableId: '',
undesirable: '' // 涓嶈壇
},
- djData: [{
- attrName: '鍑烘按鏃堕棿',
- val: '2022-05-28 16:3',
- userName: '寮犱笁 ',
- createTime: '2022-05-28 16:32:'
- }],
- cateList: [
- // {
- // active: false,
- // name: '姣涘埡',
- // num: 0
- // },
- ],
- pages: {
- capacity: 10,
- page: 1,
- total: 0
+ triggered: false,
+ finished: true,
+ djData: [],
+ cateList: [],
+ pages: {
+ capacity: 10,
+ page: 1,
+ total: 0
}
};
},
@@ -338,7 +306,13 @@
this.workorderId = obj.id
this.queryByIds()
this.getOrocessRecords()
- this.getData()
+ this.getData()
+ uni.$on('spotAdd', () => {
+ if (this.typeView == 1) {
+ this.pages.page = 1
+ this.pageDJs()
+ }
+ })
},
computed: {
expectedSalary() {
@@ -359,10 +333,10 @@
return (Number(h) * (this.arrType[this.form.index].salary / 10 / 10)).toFixed(2) || 0
}
},
- complianceRate() {
- if (this.arrType.length === 0) return 0;
- if (!this.produceFrom.qualified && !this.produceFrom.undesirable) return 0;
- if (!this.form.duration) return 0;
+ complianceRate() {
+ if (this.arrType.length === 0) return 0;
+ if (!this.produceFrom.qualified && !this.produceFrom.undesirable) return 0;
+ if (!this.form.duration) return 0;
if (!this.arrType[this.form.index].num) return 0;
// 鎸変欢璁＄畻
// if (infoBox.value.type == 0) {
@@ -373,9 +347,9 @@
return ((Number(a) / Number(b)) * 100).toFixed(2)
// let total = (Number(from.qualified) + Number(from.undesirable)) / ((from.duration * 60 * 60) * infoBox.value.num / )
// return total * infoBox.value.salary;
- } else {
+ } else {
let a = (this.produceFrom.qualified / (this.form.duration / 3600)).toFixed(2)
- let b = (this.arrType[this.form.index].num / (this.arrType[this.form.index].times / 3600)).toFixed(2)
+ let b = (this.arrType[this.form.index].num / (this.arrType[this.form.index].times / 3600)).toFixed(2)
return ((Number(a) / Number(b)) * 100).toFixed(2)
// return Number(from.qualified) * infoBox.value.salary;
}
@@ -436,6 +410,10 @@
},
clickIten(index) {
this.typeView = index
+ if (this.typeView == 1) {
+ this.pages.page = 1
+ this.pageDJs()
+ }
},
timeConfirm({
value
@@ -499,10 +477,14 @@
// })
},
changeCC(downType, num, recordId) {
- if (!num) return
+ if (!num) return
console.log(Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable))
- if ((Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable)) > this.info.planNum) {
- uni.showToast({ title:'浜у嚭鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺', duration: 2000, icon:'none' })
+ if ((Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable)) > this.info.planNum) {
+ uni.showToast({
+ title: '浜у嚭鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺',
+ duration: 2000,
+ icon: 'none'
+ })
return
}
if (num >= 0) {
@@ -520,52 +502,116 @@
this.produceFrom.qualified = 0
} else {
this.produceFrom.undesirable = 0
- }
- uni.showToast({ title:'浜у嚭鏁伴噺涓嶈兘灏忎簬', duration: 2000, icon:'none' })
+ }
+ uni.showToast({
+ title: '浜у嚭鏁伴噺涓嶈兘灏忎簬',
+ duration: 2000,
+ icon: 'none'
+ })
}
},
clickPerformanceType(item, index) {
this.form.index = index
this.form.type = item.type
},
- submit() {},
- jumpdj() {
- uni.navigateTo({
- url: `/pages_adjust/pages/spotCheck/spotCheck?id=${this.workorderId}`
- })
+ submit() {
+ let createUnqualifiedDTOList = this.form.defective.map((item) => {
+ return {
+ categoryId: item.id,
+ unQualifiedNum: item.num
+ }
+ })
+ let createWorkorderRecordDTO = {
+ workorderId: this.workorderId,
+ duration: this.form.duration ? this.form.duration : 0,
+ qualifiedNum: this.produceFrom.qualified ? this.produceFrom.qualified : 0,
+ unQualifiedNum: this.produceFrom.undesirable ? this.produceFrom.undesirable : 0
+ }
+ // id: route.query.id
+ comfirmDoneStandard({
+ createUnqualifiedDTOList,
+ createWorkorderRecordDTO
+ }).then(res => {
+ if (res.code === 200) {
+ uni.$u.toast('鎶ュ伐鎴愬姛')
+ setTimeout(() => {
+ uni.navigateBack({ data: 2})
+ }, 2000)
+ }
+ })
},
- pageDJs() {},
+ jumpdj() {
+ uni.navigateTo({
+ url: `/pages_adjust/pages/spotCheck/spotCheck?id=${this.workorderId}`
+ })
+ },
+ getLists() {
+ if (!this.finished) {
+ return
+ }
+ this.finished = false
+ this.pages.page += 1
+ this.pageDJs()
+ },
+ pageDJs() {
+
+ pageDJ({
+ capacity: this.pages.capacity,
+ page: this.pages.page,
+ model: {
+ workorderId: this.workorderId
+ }
+ }).then(res => {
+ let {data} = res
+ if (data.page == 1) {
+ this.djData = []
+ }
+ this.djData.push(...data.records)
+ // loading.value = false
+ }).catch(err => {
+ // loading.value = false
+ // finished.value = true
+ })
+ .finally(() => {
+ this.finished = true
+ })
+ },
dele(id) {
- // deletedj(id)
- // .then(res => {
- // if (res.code === 200) {
- // djData.value = []
- // finished.value = false
- // page.page = 1
- // djData.value = []
- // pageDJs()
- // }
- // })
+ deletedj(id)
+ .then(res => {
+ if (res.code === 200) {
+ this.finished = true
+ this.pages.page = 1
+ this.pageDJs()
+ }
+ })
},
confirm() {
- console.log('confirm', this.cateList);
let isOpen = false
this.cateList.forEach((item, index) => {
if (item.active) {
isOpen = true
}
})
- if (!isOpen) {
- uni.showToast({ title:'璇烽�夋嫨涓嶈壇椤�', duration: 2000, icon:'none' })
- return
+ if (!isOpen) {
+ uni.showToast({
+ title: '璇烽�夋嫨涓嶈壇椤�',
+ duration: 2000,
+ icon: 'none'
+ })
+ return
}
let arr = []
let total = 0
let name = ''
this.cateList.forEach((item, index) => {
if (item.active) {
- if (item.num <= 0) {
- uni.showToast({ title:'涓嶈壇鏁伴噺蹇呴』澶т簬0', duration: 2000, icon:'none' })
+ if (item.num <= 0) {
+ uni.showToast({
+ title: '涓嶈壇鏁伴噺蹇呴』澶т簬0',
+ duration: 2000,
+ icon: 'none'
+ })
return
}
total = total += item.num
@@ -573,9 +619,13 @@
name += item.name + item.num + '锛�'
}
})
- if (total != Number(this.produceFrom.undesirable)) {
- uni.showToast({ title:'涓嶈壇鏁板繀椤荤瓑浜庝骇鍑轰笉鑹暟', duration: 2000, icon:'none' })
- return
+ if (total != Number(this.produceFrom.undesirable)) {
+ uni.showToast({
+ title: '涓嶈壇鏁板繀椤荤瓑浜庝骇鍑轰笉鑹暟',
+ duration: 2000,
+ icon: 'none'
+ })
+ return
}
this.form.defective = arr
this.form.defectiveName = name
@@ -583,12 +633,12 @@
},
changeChecked(i) {
this.cateList[i].active = !this.cateList[i].active
- },
- jumpTL() {
- uni.navigateTo({
- // url: ''
- url: `/pages_adjust/pages/manualFeed/manualFeed?id=${this.workorderId}`
- })
+ },
+ jumpTL() {
+ uni.navigateTo({
+ // url: ''
+ url: `/pages_adjust/pages/manualFeed/manualFeed?id=${this.workorderId}`
+ })
}
}
}
diff --git a/minipro_standard/util/utils.js b/minipro_standard/util/utils.js
index db2d308..f30d0dc 100644
--- a/minipro_standard/util/utils.js
+++ b/minipro_standard/util/utils.js
@@ -42,4 +42,21 @@
return [year, Sign, month , Sign, day, ' ', hour , ':', minute, ':', '00' ].join('');
}
-export { gsdate, setTime, setTimeO }
+/***
+ * phoneRegular: 鎵嬫満鍙烽獙璇�
+ * mailboxRegular: 閭楠岃瘉
+ * positiveInteger: 姝ｆ暣鏁�
+ * decimal: 灏忔暟锛堝彧鏀寔鍥涗綅灏忔暟锛�
+ * positiveIntegerDecimal: 姝ｆ暣鏁板皬鏁帮紙鏈�澶氬洓浣嶅皬鏁帮級
+ * number锛氭暟瀛楁渶澶氫繚鐣欏洓浣嶅皬鏁�
+ */
+const REGULAR = {
+ phoneRegular: /^1[3456789]\d{9}$/,
+ mailboxRegular: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
+ positiveInteger: /^[0-9]*[1-9][0-9]*$/,
+ decimal: /^0$|^[1-9]\d{0,15}$|^[1-9]\d{0,15}\.{1}\d{1,4}$|^0\.{1}\d{1,4}$/g,
+ positiveIntegerDecimal: /^([1-9][0-9]*|0)(\.[0-9]?[1-9][1-9][1-9])?$/,
+ number: /^\d+(?:\.\d{1,4})?$/
+}
+
+export { gsdate, setTime, setTimeO, REGULAR }
--
Gitblit v1.9.3